From 1fbad9cfa532f13f6cf03f542febf2e4689edec5 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 17 Dec 2008 18:06:03 -0800
Subject: Code drop from //branches/cupcake/...@124589

---
 res/values/strings.xml | 99 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 27 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 657c92eb..3a8fa076 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,59 +15,104 @@
 -->
 
 <resources>
-    <!-- Used beneath the progress bar to indicate content downloaded -->
-    <string name="download_running">Downloading </string>
-    <!-- Used beneath the progress bar to indicate download about to start -->
-    <string name="download_pending">Starting download\u2026</string>
-    <!-- Used beneath the progress bar to indicate download has not started yet and is waiting for network -->
-    <string name="download_pending_network">Waiting for network\u2026</string>
-    <!-- Used beneath the progress bar to indicate download has started but is paused and is waiting for network -->
-    <string name="download_running_paused">Waiting for network\u2026 </string>
-    <!-- Title to show when the UI doesn't yet know the content that is being downloaded -->
-    <string name="download_unknown_title">&lt;Untitled&gt;</string>
-    
+    <!-- This is the short description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to the Download Manager by
+        applications that initiate downloads. -->
     <string name="permlab_downloadManager">Access download manager.</string>
+    <!-- This is the long description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to the Download Manager by
+        applications that initiate downloads. -->
     <string name="permdesc_downloadManager">Allows the application to
         access the download manager and to use it to download files.
         Malicious applications can use this to disrupt downloads and access
         private information.</string>
 
-    <string name="permlab_downloadData">Access download data.</string>
-    <string name="permdesc_downloadData">Allows the application to
-        access information about all downloads in the download manager.
-        Malicious applications can use this to severely disrupt downloads
-        and access private information.</string>
+    <!-- This is the short description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to some advanced (and
+        dangerous) features from the Download Manager that are needed by
+        system applications but aren't necessary for regular applications
+        that just initiate plain downloads. -->
+    <string name="permlab_downloadManagerAdvanced">Advanced download
+        manager functions.</string>
+    <!-- This is the long description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to some advanced (and
+        dangerous) features from the Download Manager that are needed by
+        system applications but aren't necessary for regular applications
+        that just initiate plain downloads. -->
+    <string name="permdesc_downloadManagerAdvanced">Allows the application to
+        access the download manager's advanced functions.
+        Malicious applications can use this to disrupt downloads and access
+        private information.</string>
 
+    <!-- This is the short description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to the Download Manager's
+        private storage area. -->
     <string name="permlab_cacheFilesystem">Use system cache.</string>
+    <!-- This is the long description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission controls access to the Download Manager's
+        private storage area. -->
     <string name="permdesc_cacheFilesystem">Allows the application
         to directly access, modify and delete the system cache. Malicious
         applications can use this to severely disrupt downloads and
         other applications, and to access private data.</string>
 
-    <string name="permlab_downloadOtaUpdate">Download OTA update.</string>
-    <string name="permdesc_downloadOtaUpdate">Allows the application
-        to specify that it wants to download files in the internal
-        cache with the filename that is reserved for OTA updates.
-        Malicious applications can use this to prevent OTA updates from
-        getting downloaded.</string>
-
     <string name="permlab_downloadCompletedIntent">Send download
         notifications.</string>
+    <!-- This is the long description of a permission associated with the
+        Android Download Manager. It is displayed as part of the description
+        of any application that was granted that permission.
+        This specific permission allows an application to tell other
+        applications that their downloads have completed. -->
     <string name="permdesc_downloadCompletedIntent">Allows the application
         to send notifications about completed downloads. Malicious applications
         can use this to confuse other applications that download
         files.</string>
 
-    <!-- used to separate filenames in the download notifications -->
+    <!-- This is the title that is used when displaying the notification
+    for a download that doesn't have a title associated with it. -->
+    <string name="download_unknown_title">&lt;Untitled&gt;</string>
+
+    <!-- When there are multiple simultaneous outstanding downloads from a
+        single application, they are displayed as a single notification,
+        and the expanded notification view displays the first two download
+        names separated with this string, i.e. "[title], [title]"
+        or "[title], [title] and [n] more". This is the comma + space
+        that separates the first two titles, and it's used both when there
+        are exactly two and more than two titles. -->
     <string name="notification_filename_separator">", "</string>
 
-    <!-- used to list that there are more than 2 files in a notification -->
+    <!-- When there are three or more simultaneous outstanding downloads from a
+        single application, they are displayed as a single notification,
+        and the expanded notification view uses this string to indicate
+        downloads beyond the first two, i.e. "[title], [title] and [n] more".
+        This is the " and [n] more" part, including the leading space, and it's
+        used regardless of the number of additional downloads. -->
     <string name="notification_filename_extras">" and %d more"</string>
 
-    <!-- information line shown in the notifications for completed downloads -->
+    <!-- When a download completes, a notification is displayed, and this
+        string is used to indicate that the download successfully completed.
+        Note that such a download could have been initiated by a variety of
+        applications, including (but not limited to) the browser, an email
+        application, a content marketplace. -->
     <string name="notification_download_complete">Download complete</string>
 
-    <!-- information line shown in the notifications for failed downloads -->
+    <!-- When a download completes, a notification is displayed, and this
+        string is used to indicate that the download failed.
+        Note that such a download could have been initiated by a variety of
+        applications, including (but not limited to) the browser, an email
+        application, a content marketplace. -->
     <string name="notification_download_failed">Download unsuccessful</string>
 
 
-- 
cgit v1.2.3