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

---
 .../status_bar_ongoing_event_progress_bar.xml      |  6 +-
 res/values-de-rDE/strings.xml                      | 40 ---------
 res/values-de/strings.xml                          | 19 +++++
 res/values-en-rGB/strings.xml                      | 40 ---------
 res/values-es-rUS/strings.xml                      | 40 ---------
 res/values-fr-rFR/strings.xml                      | 40 ---------
 res/values-it-rIT/strings.xml                      | 40 ---------
 res/values-ja/strings.xml                          | 19 +++++
 res/values-zh-rTW/strings.xml                      | 40 ---------
 res/values/strings.xml                             | 99 ++++++++++++++++------
 10 files changed, 113 insertions(+), 270 deletions(-)
 delete mode 100644 res/values-de-rDE/strings.xml
 create mode 100644 res/values-de/strings.xml
 delete mode 100644 res/values-en-rGB/strings.xml
 delete mode 100644 res/values-es-rUS/strings.xml
 delete mode 100644 res/values-fr-rFR/strings.xml
 delete mode 100644 res/values-it-rIT/strings.xml
 create mode 100644 res/values-ja/strings.xml
 delete mode 100644 res/values-zh-rTW/strings.xml

(limited to 'res')

diff --git a/res/layout/status_bar_ongoing_event_progress_bar.xml b/res/layout/status_bar_ongoing_event_progress_bar.xml
index c0cdcbf1..d81c42ba 100644
--- a/res/layout/status_bar_ongoing_event_progress_bar.xml
+++ b/res/layout/status_bar_ongoing_event_progress_bar.xml
@@ -30,7 +30,7 @@
         android:orientation="horizontal"
         >
         
-        <LinearLayout android:id="@+id/app"
+        <LinearLayout
             android:layout_width="40dp"
             android:layout_height="fill_parent"
             android:orientation="vertical"
@@ -55,14 +55,14 @@
                 />
         </LinearLayout>
 
-        <RelativeLayout android:id="@+id/app"
+        <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:orientation="vertical"
             android:focusable="true"
             android:clickable="true"
             >
-            <LinearLayout android:id="@+id/notification"
+            <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
deleted file mode 100644
index e4954d80..00000000
--- a/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">Herunterladen wird gestartet\u2026</string>
-  <string name="download_pending_network">Warten auf Netzwerk\u2026</string>
-  <string name="download_running">Herunterladen läuft </string>
-  <string name="download_running_paused">Warten auf Netzwerk\u2026 </string>
-  <string name="download_unknown_title">&lt;ohne Titel&gt;</string>
-  <string name="notification_download_complete">Herunterladen abgeschlossen</string>
-  <string name="notification_download_failed">Herunterladen nicht erfolgreich</string>
-  <string name="notification_filename_extras">" und %d mehr"</string>
-  <string name="notification_filename_separator">", "</string>
-  <string name="permdesc_cacheFilesystem">Ermöglicht einer Anwendung 
-        direkt auf den System-Cache-Speicher zuzugreifen und ihn zu ändern und zu löschen. Schädliche 
-        Anwendungen können dies nutzen, um Herunterladen und
-        andere Anwendungen ernsthaft zu stören und auf private Daten zuzugreifen.</string>
-  <string name="permdesc_downloadCompletedIntent">Ermöglicht einer Anwendung
-        Benachrichtigungen über abgeschlossenes Herunterladen zu senden. Schädliche Anwendungen können dies nutzen,
-        um andere Anwendungen zu stören,
-        die Dateien herunterladen.</string>
-  <string name="permdesc_downloadData">Ermöglicht einer Anwendung
-        auf Informationen über alles Herunterladen im Download-Manager zuzugreifen.
-        Schädliche Anwendungen können dies nutzen, um Herunterladen ernsthaft zu stören
-        und auf private Daten zuzugreifen.</string>
-  <string name="permdesc_downloadManager">Ermöglicht einer Anwendung
-        auf den Download-Manager zuzugreifen und ihn zum Herunterladen von Dateien zu verwenden.
-        Schädliche Anwendungen können dies nutzen, um Herunterladen zu stören und auf
-        private Daten zuzugreifen.</string>
-  <string name="permdesc_downloadOtaUpdate">Ermöglicht einer Anwendung
-        festzulegen, dass sie Dateien in den internen
-        Cache-Speicher mit dem Dateinamen herunterlädt, der für OTA-Updates reserviert ist.
-        Schädliche Anwendungen können dies nutzen, um das Herunterladen von OTA-Updates
-        zu verhindern.</string>
-  <string name="permlab_cacheFilesystem">Systemcache verwenden.</string>
-  <string name="permlab_downloadCompletedIntent">Herunterladen-Benachrichtigungen
-        senden.</string>
-  <string name="permlab_downloadData">Auf heruntergeladene Daten zugreifen.</string>
-  <string name="permlab_downloadManager">Auf Download-Manager zugreifen.</string>
-  <string name="permlab_downloadOtaUpdate">OTA-Update herunterladen.</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 00000000..a8f0dd2a
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="permlab_downloadManager">"Auf Download-Manager zugreifen"</string>
+    <string name="permdesc_downloadManager">"Ermöglicht der Anwendung den Zugriff auf den Download-Manager zum Herunterladen von Dateien. Diese Funktion kann von bösartigen Anwendungen dazu verwendet werden, Ladevorgänge zu unterbrechen und auf private Daten zuzugreifen."</string>
+    <!-- no translation found for permlab_downloadManagerAdvanced (7103642833308809655) -->
+    <skip />
+    <!-- no translation found for permdesc_downloadManagerAdvanced (8761177317775872287) -->
+    <skip />
+    <string name="permlab_cacheFilesystem">"Systemcache verwenden"</string>
+    <string name="permdesc_cacheFilesystem">"Ermöglicht es der Anwendung, direkt auf den Systemcache zuzugreifen und diesen zu ändern oder zu löschen. Diese Funktion kann von bösartigen Anwendungen dazu verwendet werden, Ladevorgänge und andere Anwendungen schwerwiegend zu stören sowie auf private Daten zuzugreifen."</string>
+    <string name="permlab_downloadCompletedIntent">"Benachrichtigungen zu Ladevorgängen senden"</string>
+    <string name="permdesc_downloadCompletedIntent">"Ermöglicht es der Anwendung, Benachrichtigungen zu abgeschlossenen Ladevorgängen zu senden. Diese Funktion kann von bösartigen Anwendungen dazu verwendet werden, den Ladevorgang anderer Anwendungen zu stören."</string>
+    <string name="download_unknown_title">"&lt;Unbenannt&gt;"</string>
+    <string name="notification_filename_separator">","</string>
+    <string name="notification_filename_extras">"und %d weitere"</string>
+    <string name="notification_download_complete">"Ladevorgang abgeschlossen"</string>
+    <string name="notification_download_failed">"Fehler beim Ladevorgang"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index ffdaf047..00000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">Starting download\u2026</string>
-  <string name="download_pending_network">Waiting for network\u2026</string>
-  <string name="download_running">Downloading </string>
-  <string name="download_running_paused">Waiting for network\u2026 </string>
-  <string name="download_unknown_title">&lt;Untitled&gt;</string>
-  <string name="notification_download_complete">Download complete</string>
-  <string name="notification_download_failed">Download unsuccessful</string>
-  <string name="notification_filename_extras">" and %d more"</string>
-  <string name="notification_filename_separator">", "</string>
-  <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="permdesc_downloadCompletedIntent">Allows the application
-        to send notifications about completed downloads. Malicious applications
-        can use this to confuse other applications that download
-        files.</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>
-  <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="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_cacheFilesystem">Use system cache.</string>
-  <string name="permlab_downloadCompletedIntent">Send download
-        notifications.</string>
-  <string name="permlab_downloadData">Access download data.</string>
-  <string name="permlab_downloadManager">Access download manager.</string>
-  <string name="permlab_downloadOtaUpdate">Download OTA update.</string>
-</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index 7453e8a5..00000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">Iniciando descarga\u2026</string>
-  <string name="download_pending_network">Esperando red\u2026</string>
-  <string name="download_running">Descargando </string>
-  <string name="download_running_paused">Esperando red\u2026 </string>
-  <string name="download_unknown_title">&lt;Sin título&gt;</string>
-  <string name="notification_download_complete">Descarga completa</string>
-  <string name="notification_download_failed">Error en la descarga</string>
-  <string name="notification_filename_extras">" y %d más"</string>
-  <string name="notification_filename_separator">", "</string>
-  <string name="permdesc_cacheFilesystem">Permite a la aplicación
-        acceder directamente, modificar y eliminar la caché del sistema. Las aplicaciones
-        maliciosas pueden utilizar esta función para dañar las descargas y
-        otras aplicaciones, o para acceder a datos privados.</string>
-  <string name="permdesc_downloadCompletedIntent">Permite a la aplicación
-        enviar notificaciones sobre las descargas realizadas. Las aplicaciones maliciosas
-        pueden utilizar esta función para confundir a otras aplicaciones que descargan
-        archivos.</string>
-  <string name="permdesc_downloadData">Permite a la aplicación
-        acceder a información sobre todas las descargas en el administrador de descargas.
-        Las aplicaciones maliciosas  pueden utilizar esta función para alterar gravemente las descargas
-        y acceder a información privada.</string>
-  <string name="permdesc_downloadManager">Permite a la aplicación
-        acceder al administrador de descargas y utilizarlo para descargar archivos.
-        Las aplicaciones maliciosas pueden utilizar esta función para alterar las descargas y acceder
-        a información privada.</string>
-  <string name="permdesc_downloadOtaUpdate">Permite a la aplicación
-       especificar que desea descargar archivos en la caché
-        interna con el nombre de archivo reservado para las actualizaciones OTA.
-        Las aplicaciones maliciosas puede utilizar esta función para evitar que las actualizaciones OTA
-        se descarguen.</string>
-  <string name="permlab_cacheFilesystem">Uso de la caché del sistema.</string>
-  <string name="permlab_downloadCompletedIntent">Enviar notificaciones de
-        descarga.</string>
-  <string name="permlab_downloadData">Acceso a datos de descarga. </string>
-  <string name="permlab_downloadManager">Acceso al administrador de descargas. </string>
-  <string name="permlab_downloadOtaUpdate">Descargar actualización de OTA.</string>
-</resources>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 30c4e62d..00000000
--- a/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">Début du téléchargement\u2026</string>
-  <string name="download_pending_network">Attente du réseau\u2026</string>
-  <string name="download_running">Téléchargement en cours </string>
-  <string name="download_running_paused">Attente du réseau\u2026 </string>
-  <string name="download_unknown_title">&lt;Sans titre&gt;</string>
-  <string name="notification_download_complete">Téléchargement terminé</string>
-  <string name="notification_download_failed">Échec du téléchargement</string>
-  <string name="notification_filename_extras">" et %d en plus"</string>
-  <string name="notification_filename_separator">", "</string>
-  <string name="permdesc_cacheFilesystem">Permet à l\'application
-        de directement accéder, modifier et supprimer la cache système.
-        Les applications malicieuses peuvent utiliser cela pour désorganiser
-        sérieusement les téléchargements et les autres applications, et pour accéder aux données privées.</string>
-  <string name="permdesc_downloadCompletedIntent">Permet à l\'application
-        d\'envoyer des notifications sur les téléchargements terminés. Les applications
-        malicieuses peuvent utiliser cela pour tromper les autres
-        applications qui téléchargent des fichiers.</string>
-  <string name="permdesc_downloadData">Permet à l\'application
-        d\'accéder aux informations de téléchargement dans le gestionnaire de
-        téléchargements. Les applications malicieuses peuvent utiliser cela
-        pour désorganiser sérieusement les téléchargements et accéder aux informations privées.</string>
-  <string name="permdesc_downloadManager">Permet à l\'application
-        d\'accéder au gestionnaire de téléchargements et de l\'utiliser pour.
-        télécharger les fichiers. Les applications malicieuses peuvent utiliser cela
-        pour désorganiser les téléchargements et accéder aux informations privées.</string>
-  <string name="permdesc_downloadOtaUpdate">Permet à l\'application
-        de spécifier qu\'elle veut télécharger des fichiers dans la
-        cache interne avec le nom de fichier réservé aux mises à
-        jour OTA. Les applications malicieuses peuvent utiliser cela pour
-        empêcher aux mises à jour OTA d\'être téléchargées.</string>
-  <string name="permlab_cacheFilesystem">Utilisez la cache système.</string>
-  <string name="permlab_downloadCompletedIntent">Envoyez les notifications
-        de téléchargement.</string>
-  <string name="permlab_downloadData">Accédez aux données de téléchargement.</string>
-  <string name="permlab_downloadManager">Accédez au gestionnaire de téléchargement.</string>
-  <string name="permlab_downloadOtaUpdate">Téléchargez la mise à jour OTA.</string>
-</resources>
diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml
deleted file mode 100644
index c19c0bb3..00000000
--- a/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">Avvio del download in corso\u2026</string>
-  <string name="download_pending_network">In attesa della rete\u2026</string>
-  <string name="download_running">Download in corso </string>
-  <string name="download_running_paused">In attesa della rete\u2026 </string>
-  <string name="download_unknown_title">&lt;Senza titolo&gt;</string>
-  <string name="notification_download_complete">Download completato</string>
-  <string name="notification_download_failed">Download non riuscito</string>
-  <string name="notification_filename_extras">" e ulteriore %d"</string>
-  <string name="notification_filename_separator">", "</string>
-  <string name="permdesc_cacheFilesystem">Consente all'applicazione di
-       accedere direttamente, modificare ed eliminare la cache del sistema. Le applicazioni
-        dannose possono utilizzare questa autorizzazione per interrompere i download e le altre applicazioni
-        e accedere ai dati privati.</string>
-  <string name="permdesc_downloadCompletedIntent">Consente all'applicazione
-        di inviare le notifiche sui download completati. Le applicazioni nocive
-        possono utilizzare questa autorizzazione per confondere le applicazioni che scaricano i
-        file.</string>
-  <string name="permdesc_downloadData">Consente all'applicazione di
-        accedere alle informazioni sui download nel gestore download.
-        Le applicazioni nocive possono utilizzare questa autorizzazione per interrompere i download
-        e accedere alle informazioni private.</string>
-  <string name="permdesc_downloadManager">Consente all'applicazione di
-        accedere al gestore download e utilizzarlo per scaricare i file.
-        Le applicazioni dannose possono utilizzare questa autorizzazione per interrompere i download e accedere alle
-        informazioni private.</string>
-  <string name="permdesc_downloadOtaUpdate">Consente all'applicazione
-        di specificare che desidera scaricare i file nella cache interna
-        con il nome file riservato agli aggiornamenti OTA.
-        Le applicazioni nocive possono utilizzare questa autorizzazione per impedire lo scaricamento di aggiornamenti
-         OTA.</string>
-  <string name="permlab_cacheFilesystem">Utilizzare la cache del sistema.</string>
-  <string name="permlab_downloadCompletedIntent">Inviare le notifiche sul
-        download.</string>
-  <string name="permlab_downloadData">Accedere ai dati del download.</string>
-  <string name="permlab_downloadManager">Accedere al gestore download.</string>
-  <string name="permlab_downloadOtaUpdate">Scaricare l'aggiornamento OTA.</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 00000000..0494e18f
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="permlab_downloadManager">"ダウンロードマネージャーにアクセスします。"</string>
+    <string name="permdesc_downloadManager">"アプリケーションでダウンロードマネージャーにアクセスしてファイルをダウンロードできるようにします。悪意のあるアプリケーションではこれを利用して、ダウンロードに深刻な影響を与えたり、個人データにアクセスしたりできます。"</string>
+    <!-- no translation found for permlab_downloadManagerAdvanced (7103642833308809655) -->
+    <skip />
+    <!-- no translation found for permdesc_downloadManagerAdvanced (8761177317775872287) -->
+    <skip />
+    <string name="permlab_cacheFilesystem">"システムキャッシュを使用します。"</string>
+    <string name="permdesc_cacheFilesystem">"アプリケーションでシステムキャッシュを直接アクセス、変更、削除できるようにします。悪意のあるアプリケーションではこれを利用して、ダウンロードや他のアプリケーションに深刻な影響を与えたり、個人データにアクセスしたりできます。"</string>
+    <string name="permlab_downloadCompletedIntent">"ダウンロード通知を送信します。"</string>
+    <string name="permdesc_downloadCompletedIntent">"ダウンロード完了の通知をアプリケーションから送信できるようにします。悪意のあるアプリケーションではこの通知を利用して、ファイルをダウンロードする他のアプリケーションの処理を妨害できます。"</string>
+    <string name="download_unknown_title">"&lt;無題&gt;"</string>
+    <string name="notification_filename_separator">"、"</string>
+    <string name="notification_filename_extras">"他%d件"</string>
+    <string name="notification_download_complete">"ダウンロード完了"</string>
+    <string name="notification_download_failed">"ダウンロードに失敗しました"</string>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index c34475bb..00000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="download_pending">正在開始下載\u2026</string>
-  <string name="download_pending_network">正在等待網路\u2026</string>
-  <string name="download_running">正在下載 </string>
-  <string name="download_running_paused">正在等待網路\u2026 </string>
-  <string name="download_unknown_title">&lt;未命名&gt;</string>
-  <string name="notification_download_complete">下載完成</string>
-  <string name="notification_download_failed">下載失敗</string>
-  <string name="notification_filename_extras">" 還有 %d"</string>
-  <string name="notification_filename_separator">"， "</string>
-  <string name="permdesc_cacheFilesystem">允許應用程式
-        直接存取、修改及刪除系統快取。惡意的
-        應用程式可能會利用此方式嚴重干擾下載和
-        其它應用程式，及存取私人資料。</string>
-  <string name="permdesc_downloadCompletedIntent">允許應用程式
-        傳送完成下載的通知。惡意的應用程式
-        可能會利用此方式混淆下載
-        檔案的其它應用程式。</string>
-  <string name="permdesc_downloadData">允許應用程式
-        存取下載管理員中所有下載的存取資訊。
-        惡意的應用程式可能會利用此方式嚴重干擾下載，
-        及存取私人資訊。</string>
-  <string name="permdesc_downloadManager">允許應用程式
-        存取下載管理員並使用其下載檔案。
-        惡意的應用程式可能會利用此方式來干擾下載，及存取
-        私人資訊。</string>
-  <string name="permdesc_downloadOtaUpdate">允許應用程式
-        指定其想要下載內部快取中含有 OTA
-        更新專用之檔名的檔案。
-        惡意的應用程式可能會利用此方式來阻止
-        下載 OTA 更新。</string>
-  <string name="permlab_cacheFilesystem">使用系統快取。</string>
-  <string name="permlab_downloadCompletedIntent">傳送下載
-        通知。</string>
-  <string name="permlab_downloadData">存取下載資料。</string>
-  <string name="permlab_downloadManager">存取下載管理員。</string>
-  <string name="permlab_downloadOtaUpdate">下載 OTA 更新。</string>
-</resources>
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