diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:28:19 +0000 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:28:19 +0000 |
commit | 1958bec7cd1cd58a0ee83fcd837ff19c226d6470 (patch) | |
tree | e6bfd4d91dcfeb5d9dd1ce9adccafa3ac4574145 | |
parent | 05775ecc734a8fa1de16692962b5ee2808332b7e (diff) | |
parent | 1de359e31359f9aa6c500b378082e9d6e37d94b3 (diff) | |
download | android_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.tar.gz android_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.tar.bz2 android_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.zip |
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1
Android 5.1.0 release 1
80 files changed, 131 insertions, 224 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index a8984e37..7480a0af 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Waglys"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Kanselleer"</string> <string name="button_start_now" msgid="792123674007840864">"Begin nou"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 leêr laai tans af"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> leêrs laai tans af"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"In waglys"</string> <string name="download_running" msgid="3925050393361158266">"Besig"</string> <string name="download_error" msgid="5144180777324573236">"Onsuksesvol"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Tans aan die gang, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Nog besig, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index fd5a94f9..1e44fe97 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"ወረፋ"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ይቅር"</string> <string name="button_start_now" msgid="792123674007840864">"አሁን ጀምር"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ፋይል በማውረድ ላይ"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ፋይሎች በማውረድ ላይ"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"ወረፋ ይዟል"</string> <string name="download_running" msgid="3925050393361158266">"በሂደት ላይ"</string> <string name="download_error" msgid="5144180777324573236">"ስኬታማ ያልሆነ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"በሂደት ላይ፣ <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"በሂደት ላይ፣ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 229ba23e..0cbb1133 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"قائمة انتظار"</string> <string name="button_cancel_download" msgid="2430166148737975604">"إلغاء"</string> <string name="button_start_now" msgid="792123674007840864">"البدء الآن"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"جارٍ تنزيل ملف واحد"</item> <item quantity="other" msgid="9087228371320573153">"جارٍ تنزيل <xliff:g id="NUMBER">%d</xliff:g> من الملفات"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"في قائمة الانتظار"</string> <string name="download_running" msgid="3925050393361158266">"قيد التقدم"</string> <string name="download_error" msgid="5144180777324573236">"أخفق الاتصال بالشبكة"</string> - <string name="download_running_percent" msgid="4529799113107391817">"قيد التقدم، <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"قيد التقدّم، <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 03416817..e2ea52fd 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Опашка"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Отказ"</string> <string name="button_start_now" msgid="792123674007840864">"Стартиране сега"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 файл се изтегля"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> файла се изтеглят"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"На опашка"</string> <string name="download_running" msgid="3925050393361158266">"В ход"</string> <string name="download_error" msgid="5144180777324573236">"Неуспешно"</string> - <string name="download_running_percent" msgid="4529799113107391817">"В ход – <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"В ход: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 93ba42ed..3396cc38 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"সারি"</string> <string name="button_cancel_download" msgid="2430166148737975604">"বাতিল করুন"</string> <string name="button_start_now" msgid="792123674007840864">"এখন শুরু করুন"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"১টি ফাইল ডাউনলোড হচ্ছে"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g>টি ফাইল ডাউনলোড হচ্ছে"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"সারিবদ্ধ"</string> <string name="download_running" msgid="3925050393361158266">"প্রগতিতে রয়েছে"</string> <string name="download_error" msgid="5144180777324573236">"অসফল"</string> - <string name="download_running_percent" msgid="4529799113107391817">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g> প্রগতিতে রয়েছে"</string> + <string name="download_running_percent" msgid="4305080769167320204">"প্রগতিতে রয়েছে, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 4d95aa83..848ed227 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Cua"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancel·la"</string> <string name="button_start_now" msgid="792123674007840864">"Inicia ara"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"S\'està baixant 1 fitxer"</item> <item quantity="other" msgid="9087228371320573153">"S\'estan baixant <xliff:g id="NUMBER">%d</xliff:g> fitxers"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"En cua"</string> <string name="download_running" msgid="3925050393361158266">"En curs"</string> <string name="download_error" msgid="5144180777324573236">"Incorrecte"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En curs, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En curs, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 4d358ce0..2de55029 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Fronta"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Zrušit"</string> <string name="button_start_now" msgid="792123674007840864">"Spustit"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Stahuje se 1 soubor"</item> <item quantity="other" msgid="9087228371320573153">"Stahované soubory: <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Ve frontě"</string> <string name="download_running" msgid="3925050393361158266">"Probíhá"</string> <string name="download_error" msgid="5144180777324573236">"Neúspěšné"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Probíhá (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Probíhá, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 59280730..1f202044 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Kø"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Annuller"</string> <string name="button_start_now" msgid="792123674007840864">"Begynd nu"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fil downloades"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> filer downloades"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"I kø"</string> <string name="download_running" msgid="3925050393361158266">"I gang"</string> <string name="download_error" msgid="5144180777324573236">"Mislykkedes"</string> - <string name="download_running_percent" msgid="4529799113107391817">"I gang, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"I gang, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 5fa35c11..2119672f 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Warteschlange"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Abbrechen"</string> <string name="button_start_now" msgid="792123674007840864">"Jetzt starten"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 Datei wird heruntergeladen..."</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> Dateien werden heruntergeladen..."</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"In der Warteschlange"</string> <string name="download_running" msgid="3925050393361158266">"In Bearbeitung"</string> <string name="download_error" msgid="5144180777324573236">"Nicht erfolgreich"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Läuft, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Wird heruntergeladen: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index ba745681..dc780925 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Ουρά"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Ακύρωση"</string> <string name="button_start_now" msgid="792123674007840864">"Έναρξη τώρα"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Γίνεται λήψη 1 αρχείου"</item> <item quantity="other" msgid="9087228371320573153">"Γίνεται λήψη <xliff:g id="NUMBER">%d</xliff:g> αρχείων"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Σε ουρά"</string> <string name="download_running" msgid="3925050393361158266">"Σε εξέλιξη"</string> <string name="download_error" msgid="5144180777324573236">"Ανεπιτυχής"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Σε εξέλιξη, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Σε εξέλιξη, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 26fede38..ce6b3435 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Queue"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancel"</string> <string name="button_start_now" msgid="792123674007840864">"Start now"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 file downloading"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> files downloading"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Queued"</string> <string name="download_running" msgid="3925050393361158266">"In progress"</string> <string name="download_error" msgid="5144180777324573236">"Unsuccessful"</string> - <string name="download_running_percent" msgid="4529799113107391817">"In progress, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"In progress, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 26fede38..ce6b3435 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Queue"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancel"</string> <string name="button_start_now" msgid="792123674007840864">"Start now"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 file downloading"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> files downloading"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Queued"</string> <string name="download_running" msgid="3925050393361158266">"In progress"</string> <string name="download_error" msgid="5144180777324573236">"Unsuccessful"</string> - <string name="download_running_percent" msgid="4529799113107391817">"In progress, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"In progress, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9abcb6d7..32c76e70 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Cola"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancelar"</string> <string name="button_start_now" msgid="792123674007840864">"Comenzar ahora"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Descargando 1 archivo"</item> <item quantity="other" msgid="9087228371320573153">"Descargando <xliff:g id="NUMBER">%d</xliff:g> archivos"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Pendiente"</string> <string name="download_running" msgid="3925050393361158266">"En curso"</string> <string name="download_error" msgid="5144180777324573236">"Error"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En curso, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En curso (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 8ab2eeb7..241950e0 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Poner en cola"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancelar"</string> <string name="button_start_now" msgid="792123674007840864">"Empezar ahora"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Descargando 1 archivo"</item> <item quantity="other" msgid="9087228371320573153">"Descargando <xliff:g id="NUMBER">%d</xliff:g> archivos"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"En cola"</string> <string name="download_running" msgid="3925050393361158266">"En curso"</string> <string name="download_error" msgid="5144180777324573236">"No se ha completado"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En curso (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En curso (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 16b97b62..f494749b 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Järjekord"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Tühista"</string> <string name="button_start_now" msgid="792123674007840864">"Alusta nüüd"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 faili allalaadimine"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> faili allalaadimine"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Järjekorras"</string> <string name="download_running" msgid="3925050393361158266">"Töötlemisel"</string> <string name="download_error" msgid="5144180777324573236">"Ebaõnnestus"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Edenemine: <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Pooleli, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index c1f92ec9..5a9aa232 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Ezarri ilaran"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Utzi"</string> <string name="button_start_now" msgid="792123674007840864">"Hasi"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="PERCENT">%%</xliff:g> <xliff:g id="NUMBER">%d</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fitxategi deskargatzen"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> fitxategi deskargatzen"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Ilaran ezarri da"</string> <string name="download_running" msgid="3925050393361158266">"Abian"</string> <string name="download_error" msgid="5144180777324573236">"Ezin izan da deskargatu"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Abian, <xliff:g id="PERCENT">%%</xliff:g> <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Abian, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 2586832d..bfce4380 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"صف"</string> <string name="button_cancel_download" msgid="2430166148737975604">"لغو"</string> <string name="button_start_now" msgid="792123674007840864">"اکنون شروع"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"۱ فایل در حال دانلود"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> فایل در حال دانلود"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"در صف"</string> <string name="download_running" msgid="3925050393361158266">"در حال انجام"</string> <string name="download_error" msgid="5144180777324573236">"ناموفق"</string> - <string name="download_running_percent" msgid="4529799113107391817">"در حال انجام، <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"در حال انجام، <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 6bc88074..7c14a1cc 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Jono"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Peruuta"</string> <string name="button_start_now" msgid="792123674007840864">"Aloita nyt"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 tiedostoa ladataan"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> tiedostoa ladataan"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Jonossa"</string> <string name="download_running" msgid="3925050393361158266">"Kesken"</string> <string name="download_error" msgid="5144180777324573236">"Epäonnistui"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Käynnissä, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Käynnissä, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 3ccab1a8..5688944a 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"File d\'attente"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Annuler"</string> <string name="button_start_now" msgid="792123674007840864">"Commencer maintenant"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Téléchargement d\'un fichier"</item> <item quantity="other" msgid="9087228371320573153">"Téléchargement de <xliff:g id="NUMBER">%d</xliff:g> fichiers"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Placé en file d\'attente"</string> <string name="download_running" msgid="3925050393361158266">"En cours de traitement"</string> <string name="download_error" msgid="5144180777324573236">"Échec"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En cours : <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En cours : <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3a1dfb36..a75cb0f1 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"File d\'attente"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Annuler"</string> <string name="button_start_now" msgid="792123674007840864">"Commencer"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Téléchargement d\'un fichier"</item> <item quantity="other" msgid="9087228371320573153">"Téléchargement de <xliff:g id="NUMBER">%d</xliff:g> fichiers"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Placé en file d\'attente"</string> <string name="download_running" msgid="3925050393361158266">"En cours"</string> <string name="download_error" msgid="5144180777324573236">"Échec"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En cours (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En cours, <xliff:g id="PERCENTAGE">%s</xliff:g>…"</string> </resources> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index d44fadb4..81b84a84 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Cola"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancelar"</string> <string name="button_start_now" msgid="792123674007840864">"Iniciar agora"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Descargando 1 ficheiro"</item> <item quantity="other" msgid="9087228371320573153">"Descargando <xliff:g id="NUMBER">%d</xliff:g> ficheiros"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Na cola"</string> <string name="download_running" msgid="3925050393361158266">"En curso"</string> <string name="download_error" msgid="5144180777324573236">"Incorrecta"</string> - <string name="download_running_percent" msgid="4529799113107391817">"En curso, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"En curso (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 11a3a8f6..aae6e0e3 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"कतार"</string> <string name="button_cancel_download" msgid="2430166148737975604">"रहने दें"</string> <string name="button_start_now" msgid="792123674007840864">"अब प्रारंभ करें"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 फ़ाइल डाउनलोड हो रही है"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> फ़ाइलें डाउनलोड हो रही हैं"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"कतारबद्ध"</string> <string name="download_running" msgid="3925050393361158266">"जारी है"</string> <string name="download_error" msgid="5144180777324573236">"असफल"</string> - <string name="download_running_percent" msgid="4529799113107391817">"प्रगति में, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"चल रहा है, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 48bec502..1b34e7d2 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Red čekanja"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Odustani"</string> <string name="button_start_now" msgid="792123674007840864">"Započni sad"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Preuzimanje 1 datoteke"</item> <item quantity="other" msgid="9087228371320573153">"Preuzimanje datoteka (<xliff:g id="NUMBER">%d</xliff:g>)"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Na čekanju"</string> <string name="download_running" msgid="3925050393361158266">"U tijeku"</string> <string name="download_error" msgid="5144180777324573236">"Neuspješno"</string> - <string name="download_running_percent" msgid="4529799113107391817">"U tijeku, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"U tijeku, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a627faad..0b53aa3d 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Várólista"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Mégse"</string> <string name="button_start_now" msgid="792123674007840864">"Indítás most"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fájl letöltése folyamatban"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> fájl letöltése folyamatban"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Várólistán"</string> <string name="download_running" msgid="3925050393361158266">"Folyamatban"</string> <string name="download_error" msgid="5144180777324573236">"Sikertelen"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Folyamatban: <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Folyamatban, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 05a5001d..25d97b26 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Հերթականություն"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Չեղարկել"</string> <string name="button_start_now" msgid="792123674007840864">"Մեկնարկել հիմա"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ֆայլ ներբեռնվում է"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ֆայլ ներբեռնվում է"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Հերթագրված է"</string> <string name="download_running" msgid="3925050393361158266">"Ընթացքի մեջ է"</string> <string name="download_error" msgid="5144180777324573236">"Չի կատարվել"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Ընթացքում է՝ <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Ընթացքի մեջ է` <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 71a69d3d..04b27147 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Antrean"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Batal"</string> <string name="button_start_now" msgid="792123674007840864">"Mulai sekarang"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Mengunduh 1 file"</item> <item quantity="other" msgid="9087228371320573153">"Mengunduh <xliff:g id="NUMBER">%d</xliff:g> file"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Diantrekan"</string> <string name="download_running" msgid="3925050393361158266">"Sedang berlangsung"</string> <string name="download_error" msgid="5144180777324573236">"Gagal"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Dalam proses, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Sedang berlangsung, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index 229d5bd4..52abf190 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Setja í biðröð"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Hætta við"</string> <string name="button_start_now" msgid="792123674007840864">"Hefja núna"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Verið að sækja 1 skrá"</item> <item quantity="other" msgid="9087228371320573153">"Verið að sækja <xliff:g id="NUMBER">%d</xliff:g> skrár"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Í biðröð"</string> <string name="download_running" msgid="3925050393361158266">"Í gangi"</string> <string name="download_error" msgid="5144180777324573236">"Mistókst"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Í gangi, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Í gangi, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index f53b7da5..15b39360 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Metti in coda"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Annulla"</string> <string name="button_start_now" msgid="792123674007840864">"Avvia adesso"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 file in download"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> file in download"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"In coda"</string> <string name="download_running" msgid="3925050393361158266">"In corso"</string> <string name="download_error" msgid="5144180777324573236">"Operazione non riuscita"</string> - <string name="download_running_percent" msgid="4529799113107391817">"In corso, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"In corso: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index a5914be7..7126c0dd 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"תור"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ביטול"</string> <string name="button_start_now" msgid="792123674007840864">"התחל כעת"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"מתבצעת הורדה של קובץ אחד"</item> <item quantity="other" msgid="9087228371320573153">"מתבצעת הורדה של <xliff:g id="NUMBER">%d</xliff:g> קבצים"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"בתור"</string> <string name="download_running" msgid="3925050393361158266">"מתבצע"</string> <string name="download_error" msgid="5144180777324573236">"נכשל"</string> - <string name="download_running_percent" msgid="4529799113107391817">"מתבצע, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"מתבצע, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index b8f5809e..58980b91 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"キューに登録"</string> <string name="button_cancel_download" msgid="2430166148737975604">"キャンセル"</string> <string name="button_start_now" msgid="792123674007840864">"今すぐ開始"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1ファイルをダウンロード中"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g>ファイルをダウンロード中"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"キューに追加済み"</string> <string name="download_running" msgid="3925050393361158266">"処理中"</string> <string name="download_error" msgid="5144180777324573236">"失敗しました"</string> - <string name="download_running_percent" msgid="4529799113107391817">"処理中(<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="download_running_percent" msgid="4305080769167320204">"処理中(<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 8da7b31b..2d96122c 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"რიგი"</string> <string name="button_cancel_download" msgid="2430166148737975604">"გაუქმება"</string> <string name="button_start_now" msgid="792123674007840864">"დაწყება ახლავე"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ფაილი იტვირთება"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ფაილი იტვირთება"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"რიგშია"</string> <string name="download_running" msgid="3925050393361158266">"მიმდინარეობს"</string> <string name="download_error" msgid="5144180777324573236">"ვერ განხორციელდა"</string> - <string name="download_running_percent" msgid="4529799113107391817">"მიმდინარეობს, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"მიმდინარეობს, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 8952466e..1c6bff9d 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Кезек"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Бас тарту"</string> <string name="button_start_now" msgid="792123674007840864">"Қазір бастау"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 файл жүктелуде"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> файл жүктелуде"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Кезекте"</string> <string name="download_running" msgid="3925050393361158266">"Жүктелуде"</string> <string name="download_error" msgid="5144180777324573236">"Сәтсіз"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Жүктелуде, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Орындалуда, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index bdb2b789..8af36d26 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"ជួរ"</string> <string name="button_cancel_download" msgid="2430166148737975604">"បោះបង់"</string> <string name="button_start_now" msgid="792123674007840864">"ចាប់ផ្ដើមឥឡូវ"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"កំពុងទាញយកឯកសារ ១"</item> <item quantity="other" msgid="9087228371320573153">"កំពុងទាញយកឯកសារ <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"បានដាក់ក្នុងជួរ"</string> <string name="download_running" msgid="3925050393361158266">"កំពុងដំណើរការ"</string> <string name="download_error" msgid="5144180777324573236">"បានបរាជ័យ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"កំពុងដំណើរការ, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"កំពុងដំណើរការ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 62d033b7..0434e792 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"ಸರದಿ"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ರದ್ದುಮಾಡು"</string> <string name="button_start_now" msgid="792123674007840864">"ಈಗ ಪ್ರಾರಂಭಿಸಿ"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ಫೈಲ್ ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ಫೈಲ್ಗಳು ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿವೆ"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"ಸರದಿಯಲ್ಲಿರಿಸಲಾಗಿದೆ"</string> <string name="download_running" msgid="3925050393361158266">"ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string> <string name="download_error" msgid="5144180777324573236">"ವಿಫಲಗೊಂಡಿದೆ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"ಪ್ರಗತಿಯಲ್ಲಿದೆ, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"ಪ್ರಗತಿಯಲ್ಲಿದೆ, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 2e2a4263..ce4e0619 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"대기열"</string> <string name="button_cancel_download" msgid="2430166148737975604">"취소"</string> <string name="button_start_now" msgid="792123674007840864">"지금 시작"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1개의 파일 다운로드 중"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g>개의 파일 다운로드 중"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"대기 중"</string> <string name="download_running" msgid="3925050393361158266">"진행 중"</string> <string name="download_error" msgid="5144180777324573236">"실패"</string> - <string name="download_running_percent" msgid="4529799113107391817">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g> 진행 중"</string> + <string name="download_running_percent" msgid="4305080769167320204">"다운로드 진행률 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index a325b5dd..f7ca3f59 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Кезекке тургузуу"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Айнуу"</string> <string name="button_start_now" msgid="792123674007840864">"Азыр баштоо"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 файл жүктөлүүдө"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> файл жүктөлүүдө"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Кезекте"</string> <string name="download_running" msgid="3925050393361158266">"Жүктөлүүдө"</string> <string name="download_error" msgid="5144180777324573236">"Ийгиликсиз"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Жүктөлүүдө, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Аткарылууда, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index c5d87f9c..7671a68b 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"ຄິວ"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ຍົກເລີກ"</string> <string name="button_start_now" msgid="792123674007840864">"ເລີ່ມດຽວນີ້"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"ກຳລັງດາວໂຫລດ 1 ໄຟລ໌"</item> <item quantity="other" msgid="9087228371320573153">"ກຳລັງດາວໂຫລດ <xliff:g id="NUMBER">%d</xliff:g> ໄຟລ໌"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"ເຂົ້າຄິວແລ້ວ"</string> <string name="download_running" msgid="3925050393361158266">"ກຳລັງດຳເນີນການ"</string> <string name="download_error" msgid="5144180777324573236">"ບໍ່ສຳເລັດ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"ກຳລັງດຳເນີນການ, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"ກຳລັງດຳເນີນການ, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index dd3dd6fb..1c5cd864 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Eilė"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Atšaukti"</string> <string name="button_start_now" msgid="792123674007840864">"Pradėti dabar"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Atsisiunčiama failų: 1"</item> <item quantity="other" msgid="9087228371320573153">"Atsisiunčiama failų: <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Laukia eilėje"</string> <string name="download_running" msgid="3925050393361158266">"Vykdoma"</string> <string name="download_error" msgid="5144180777324573236">"Nesėkminga"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Vykdoma, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Procesas vyksta, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index c3276712..8a4cfd60 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Rinda"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Atcelt"</string> <string name="button_start_now" msgid="792123674007840864">"Sākt tūlīt"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Notiek 1 faila lejupielāde"</item> <item quantity="other" msgid="9087228371320573153">"Notiek <xliff:g id="NUMBER">%d</xliff:g> failu lejupielāde"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Ievietots rindā"</string> <string name="download_running" msgid="3925050393361158266">"Notiek lejupielāde"</string> <string name="download_error" msgid="5144180777324573236">"Neizdevās"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Norise: <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Notiek (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 32fdc9b5..d1f06641 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Ред на чекање"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Откажи"</string> <string name="button_start_now" msgid="792123674007840864">"Започни сега"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 датотека се презема"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> датотеки се преземаат"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Чека на ред"</string> <string name="download_running" msgid="3925050393361158266">"Во тек"</string> <string name="download_error" msgid="5144180777324573236">"Неуспешно"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Во тек, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Во тек, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index c9414231..3a32023a 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"ക്യൂ"</string> <string name="button_cancel_download" msgid="2430166148737975604">"റദ്ദാക്കുക"</string> <string name="button_start_now" msgid="792123674007840864">"ഇപ്പോൾ ആരംഭിക്കുക"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"ഒരു ഫയൽ ഡൗൺലോഡുചെയ്യുന്നു"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ഫയലുകൾ ഡൗൺലോഡുചെയ്യുന്നു"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"ക്യൂവിലാണ്"</string> <string name="download_running" msgid="3925050393361158266">"പുരോഗമിക്കുന്നു"</string> <string name="download_error" msgid="5144180777324573236">"പരാജയപ്പെട്ടു"</string> - <string name="download_running_percent" msgid="4529799113107391817">"പുരോഗതിയിലാണ്, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"പുരോഗതിയിലാണ്, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 268b699d..ce238370 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Хүлээх"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Цуцлах"</string> <string name="button_start_now" msgid="792123674007840864">"Одоо эхлүүлэх"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 файл татаж байна"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> файл татаж байна"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Хүлээлгэнд"</string> <string name="download_running" msgid="3925050393361158266">"Үргэлжилж байгаа"</string> <string name="download_error" msgid="5144180777324573236">"Амжилтгүй"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Татаж байна, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Үргэлжилж байгаа, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index b0c86746..fae68d03 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -35,16 +35,15 @@ <string name="download_unknown_title" msgid="7015124071247271585">"<अशीर्षकांकित>"</string> <string name="notification_download_complete" msgid="5443563299253103667">"डाउनलोड पूर्ण."</string> <string name="notification_download_failed" msgid="8612136111952014978">"डाउनलोड अयशस्वी."</string> - <string name="notification_need_wifi_for_size" msgid="2556172885154833575">"डाउनलोड आकारामानास Wi-Fi आवश्यक असते."</string> + <string name="notification_need_wifi_for_size" msgid="2556172885154833575">"डाउनलोड आकारामानास वाय-फाय आवश्यक असते."</string> <string name="notification_paused_in_background" msgid="4328508073283591772">"पार्श्वभूमीत विराम दिला."</string> <string name="wifi_required_title" msgid="1995971416871498179">"ऑपरेटर नेटवर्कसाठी डाउनलोड खूप मोठे आहे"</string> - <string name="wifi_required_body" msgid="3067694630143784449">"आपण हे <xliff:g id="SIZE">%s </xliff:g> डाउनलोड पूर्ण करण्यासाठी Wi-Fi चा वापर करणे आवश्यक आहे. पुढील वेळी आपण Wi-Fi ला कनेक्ट होता तेव्हा हे डाउनलोड प्रारंभ करण्यासाठी \n\n स्पर्श करा <xliff:g id="QUEUE_TEXT">%s </xliff:g>."</string> + <string name="wifi_required_body" msgid="3067694630143784449">"आपण हे <xliff:g id="SIZE">%s </xliff:g> डाउनलोड पूर्ण करण्यासाठी वाय-फाय चा वापर करणे आवश्यक आहे. पुढील वेळी आपण वाय-फाय ला कनेक्ट होता तेव्हा हे डाउनलोड प्रारंभ करण्यासाठी \n\n स्पर्श करा <xliff:g id="QUEUE_TEXT">%s </xliff:g>."</string> <string name="wifi_recommended_title" msgid="7441589306734687400">"नंतर डाउनलोड करा साठी रांग लावायची?"</string> - <string name="wifi_recommended_body" msgid="1314735166699936073">"हे <xliff:g id="SIZE">%s </xliff:g> डाउनलोड प्रारंभ करण्याने आपले बॅटरी आयुष्य कमी होऊ शकते आणि/किंवा त्याचा परिणाम आपल्या मोबाईल डेटा कनेक्शनचा अत्याधिक वापर करण्यात होऊ शकतो, ज्यामुळे आपल्या मोबाईल डेटा योजनेवर आधारित आपल्या मोबाईल ऑपरेटरद्वारे शुल्क आकारले जाऊ शकते.पुढील वेळी आपण Wi-Fi नेटवर्कशी कनेक्ट होता तेव्हा हे डाउनलोड प्रारंभ करण्यासाठी \n\n स्पर्श करा <xliff:g id="QUEUE_TEXT">%s</xliff:g>"</string> + <string name="wifi_recommended_body" msgid="1314735166699936073">"हे <xliff:g id="SIZE">%s </xliff:g> डाउनलोड प्रारंभ करण्याने आपले बॅटरी आयुष्य कमी होऊ शकते आणि/किंवा त्याचा परिणाम आपल्या मोबाईल डेटा कनेक्शनचा अत्याधिक वापर करण्यात होऊ शकतो, ज्यामुळे आपल्या मोबाईल डेटा योजनेवर आधारित आपल्या मोबाईल ऑपरेटरद्वारे शुल्क आकारले जाऊ शकते.पुढील वेळी आपण वाय-फाय नेटवर्कशी कनेक्ट होता तेव्हा हे डाउनलोड प्रारंभ करण्यासाठी \n\n स्पर्श करा <xliff:g id="QUEUE_TEXT">%s</xliff:g>"</string> <string name="button_queue_for_wifi" msgid="422576726189179221">"रांग"</string> <string name="button_cancel_download" msgid="2430166148737975604">"रद्द करा"</string> <string name="button_start_now" msgid="792123674007840864">"आता प्रारंभ करा"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 फाइल डाउनलोड होत आहे"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> फायली डाउनलोड होत आहेत"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"रांगेत लावलेला"</string> <string name="download_running" msgid="3925050393361158266">"प्रगतीपथावर"</string> <string name="download_error" msgid="5144180777324573236">"अयशस्वी"</string> - <string name="download_running_percent" msgid="4529799113107391817">"प्रगतीपथावर, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"प्रगतीपथावर, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 6832ee50..67887d5e 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Baris gilir"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Batal"</string> <string name="button_start_now" msgid="792123674007840864">"Mulakan sekarang"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fail sedang dimuat turun"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> fail sedang dimuat turun"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Dibaris gilir"</string> <string name="download_running" msgid="3925050393361158266">"Sedang berlangsung"</string> <string name="download_error" msgid="5144180777324573236">"Tidak berjaya"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Sedang berjalan, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Sedang berjalan, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index a1def90c..3d21b43d 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"တန်းစီရန်"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ထားတော့"</string> <string name="button_start_now" msgid="792123674007840864">"ယခုအချိန်မှစတင်ပါ"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"ဖိုင် ၁ ခု ဒေါင်းလုပ်ပြုလုပ်နေသည်"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ဖိုင် ဒေါင်းလုပ်ပြုလုပ်နေသည်"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"တန်းစီထားပြီး"</string> <string name="download_running" msgid="3925050393361158266">"ပြုလုပ်နေဆဲ"</string> <string name="download_error" msgid="5144180777324573236">"မအောင်မြင်ပါ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"ပြုလုပ်နေဆဲ <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"လုပ်ဆောင်နေဆဲ၊ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 5faf89ea..3570bb30 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Kø"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Avbryt"</string> <string name="button_start_now" msgid="792123674007840864">"Start nå"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fil lastes ned"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> filer lastes ned"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"I kø"</string> <string name="download_running" msgid="3925050393361158266">"Pågår"</string> <string name="download_error" msgid="5144180777324573236">"Mislyktes"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Pågår – <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Pågår – <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index d15d2d87..2b275af2 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"लाम"</string> <string name="button_cancel_download" msgid="2430166148737975604">"रद्द गर्नुहोस्"</string> <string name="button_start_now" msgid="792123674007840864">"अहिले सुरु गर्नुहोस्"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"१ फाइल डाउनलोड हुँदै"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> फाइलहरू डाउनलोड हुँदै"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"लाममा राखियो"</string> <string name="download_running" msgid="3925050393361158266">"प्रगतिमा"</string> <string name="download_error" msgid="5144180777324573236">"असफल"</string> - <string name="download_running_percent" msgid="4529799113107391817">"प्रगतिमा, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"प्रगति हुँदै, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 9a4d19dc..fca35f10 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Wachtrij"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Annuleren"</string> <string name="button_start_now" msgid="792123674007840864">"Nu starten"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Er wordt 1 bestand gedownload"</item> <item quantity="other" msgid="9087228371320573153">"Er worden <xliff:g id="NUMBER">%d</xliff:g> bestanden gedownload"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"In wachtrij"</string> <string name="download_running" msgid="3925050393361158266">"In uitvoering"</string> <string name="download_error" msgid="5144180777324573236">"Mislukt"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Bezig: <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Wordt uitgevoerd, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index cc57448e..7b99b010 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Dodaj do kolejki"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Anuluj"</string> <string name="button_start_now" msgid="792123674007840864">"Rozpocznij teraz"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Pobieram 1 plik"</item> <item quantity="other" msgid="9087228371320573153">"Pobieram <xliff:g id="NUMBER">%d</xliff:g> pliki(ów)"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"W kolejce"</string> <string name="download_running" msgid="3925050393361158266">"W toku"</string> <string name="download_error" msgid="5144180777324573236">"Niepowodzenie"</string> - <string name="download_running_percent" msgid="4529799113107391817">"W toku, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"W toku, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 1bd74bb5..0568d07a 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Fila"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancelar"</string> <string name="button_start_now" msgid="792123674007840864">"Começar agora"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ficheiro a ser transferido"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ficheiros a serem transferidos"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Em fila"</string> <string name="download_running" msgid="3925050393361158266">"Em curso"</string> <string name="download_error" msgid="5144180777324573236">"Sem êxito"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Em curso, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Em curso, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 27302af8..f8e2e0a9 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Fila"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Cancelar"</string> <string name="button_start_now" msgid="792123674007840864">"Iniciar agora"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Fazendo download de 1 arquivo"</item> <item quantity="other" msgid="9087228371320573153">"Fazendo download de <xliff:g id="NUMBER">%d</xliff:g> arquivos"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Na fila"</string> <string name="download_running" msgid="3925050393361158266">"Em andamento"</string> <string name="download_error" msgid="5144180777324573236">"Falha"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Em andamento, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Em andamento, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index a6798289..2aea611f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Listă de aşteptare"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Anulaţi"</string> <string name="button_start_now" msgid="792123674007840864">"Începeţi acum"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Se descarcă un fişier"</item> <item quantity="other" msgid="9087228371320573153">"Se descarcă <xliff:g id="NUMBER">%d</xliff:g> (de) fişiere"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"În coadă"</string> <string name="download_running" msgid="3925050393361158266">"În desfășurare"</string> <string name="download_error" msgid="5144180777324573236">"Nereușit"</string> - <string name="download_running_percent" msgid="4529799113107391817">"În curs, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"În curs, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 81e99ecf..7f05810b 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Добавить в очередь"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Отмена"</string> <string name="button_start_now" msgid="792123674007840864">"Запустить"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Загрузка 1 файла…"</item> <item quantity="other" msgid="9087228371320573153">"Загрузка <xliff:g id="NUMBER">%d</xliff:g> файлов…"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"В очереди"</string> <string name="download_running" msgid="3925050393361158266">"Загружается"</string> <string name="download_error" msgid="5144180777324573236">"Сбой"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Скачано <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Скачано <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index bbe85277..ed52bf87 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"පෝලිම"</string> <string name="button_cancel_download" msgid="2430166148737975604">"අවලංගු කරන්න"</string> <string name="button_start_now" msgid="792123674007840864">"දැන් අරඹන්න"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"ගොනු 1 ක් බාගත වෙමින්"</item> <item quantity="other" msgid="9087228371320573153">"ගොනු <xliff:g id="NUMBER">%d</xliff:g> බාගත වෙමින්"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"පෙළ ගසන ලදි"</string> <string name="download_running" msgid="3925050393361158266">"ක්රියාවේ පවතී"</string> <string name="download_error" msgid="5144180777324573236">"අසාර්ථකයි"</string> - <string name="download_running_percent" msgid="4529799113107391817">"ක්රියාවේ පවතී, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"වෙමින් පවතී, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 1410605b..a1690a0d 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Zoznam"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Zrušiť"</string> <string name="button_start_now" msgid="792123674007840864">"Spustiť"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Sťahuje sa 1 súbor"</item> <item quantity="other" msgid="9087228371320573153">"Počet sťahovaných súborov: <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"V poradí"</string> <string name="download_running" msgid="3925050393361158266">"Prebieha"</string> <string name="download_error" msgid="5144180777324573236">"Neúspešné"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Prebieha (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Prebieha, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 21329261..24c00b78 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Čakalna vrsta"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Prekliči"</string> <string name="button_start_now" msgid="792123674007840864">"Začni zdaj"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Poteka prenos 1 datoteke"</item> <item quantity="other" msgid="9087228371320573153">"Poteka prenos toliko datotek: <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"V čakalni vrsti"</string> <string name="download_running" msgid="3925050393361158266">"Poteka"</string> <string name="download_error" msgid="5144180777324573236">"Neuspešno"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Poteka – <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Poteka – <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 5585ce3e..e7515d34 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Ред"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Откажи"</string> <string name="button_start_now" msgid="792123674007840864">"Започни одмах"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Преузима се 1 датотека"</item> <item quantity="other" msgid="9087228371320573153">"Преузимају се датотеке (<xliff:g id="NUMBER">%d</xliff:g>)"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Стављено је на чекање"</string> <string name="download_running" msgid="3925050393361158266">"У току је"</string> <string name="download_error" msgid="5144180777324573236">"Није успело"</string> - <string name="download_running_percent" msgid="4529799113107391817">"У току је, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"У току, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 80407303..b5ccc18b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Kö"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Avbryt"</string> <string name="button_start_now" msgid="792123674007840864">"Starta nu"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 fil hämtas"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> filer hämtas"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"I kö"</string> <string name="download_running" msgid="3925050393361158266">"Pågår"</string> <string name="download_error" msgid="5144180777324573236">"Misslyckades"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Hämtningen pågår: <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Pågår, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 0ccbd6a8..f977b9bd 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Foleni"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Ghairi"</string> <string name="button_start_now" msgid="792123674007840864">"Anza sasa"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Faili 1 inapakua"</item> <item quantity="other" msgid="9087228371320573153">"Faili <xliff:g id="NUMBER">%d</xliff:g> zinapakua"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Zilizowekwa kwenye foleni"</string> <string name="download_running" msgid="3925050393361158266">"Unaendelea"</string> <string name="download_error" msgid="5144180777324573236">"Haijafanikiwa"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Inaendelea, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Inaendelea, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index de1eb488..1cf6ad4c 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"வரிசை"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ரத்துசெய்"</string> <string name="button_start_now" msgid="792123674007840864">"இப்போது தொடங்கு"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 கோப்புப் பதிவிறக்கப்படுகிறது"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> கோப்புகள் பதிவிறக்கப்படுகின்றன"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"வரிசைப்படுத்தப்பட்டது"</string> <string name="download_running" msgid="3925050393361158266">"செயலிலுள்ளது"</string> <string name="download_error" msgid="5144180777324573236">"தோல்வி"</string> - <string name="download_running_percent" msgid="4529799113107391817">"செயலிலுள்ளது, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"செயலில், <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 548f4357..bc23ce70 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"క్రమవరుసలో ఉంచు"</string> <string name="button_cancel_download" msgid="2430166148737975604">"రద్దు చేయి"</string> <string name="button_start_now" msgid="792123674007840864">"ఇప్పుడే ప్రారంభించు"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ఫైల్ను డౌన్లోడ్ చేస్తోంది"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ఫైల్లను డౌన్లోడ్ చేస్తోంది"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"క్రమవరుసలో ఉంచబడింది"</string> <string name="download_running" msgid="3925050393361158266">"ప్రోగ్రెస్లో ఉంది"</string> <string name="download_error" msgid="5144180777324573236">"విఫలమైంది"</string> - <string name="download_running_percent" msgid="4529799113107391817">"ప్రోగ్రెస్లో ఉంది, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"ప్రోగ్రెస్లో ఉంది, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index cc71672b..aa0f7bfd 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"คิว"</string> <string name="button_cancel_download" msgid="2430166148737975604">"ยกเลิก"</string> <string name="button_start_now" msgid="792123674007840864">"เริ่มต้นเดี๋ยวนี้"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"กำลังดาวน์โหลด 1 ไฟล์"</item> <item quantity="other" msgid="9087228371320573153">"กำลังดาวน์โหลด <xliff:g id="NUMBER">%d</xliff:g> ไฟล์"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"อยู่ในคิว"</string> <string name="download_running" msgid="3925050393361158266">"กำลังดำเนินการ"</string> <string name="download_error" msgid="5144180777324573236">"ไม่สำเร็จ"</string> - <string name="download_running_percent" msgid="4529799113107391817">"กำลังดำเนินการ <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"กำลังดำเนินการ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index ddf6b21d..418ad741 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Queue"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Kanselahin"</string> <string name="button_start_now" msgid="792123674007840864">"Magsimula ngayon"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 file ang dina-download"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> (na) file ang dina-download"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Naka-queue"</string> <string name="download_running" msgid="3925050393361158266">"Isinasagawa"</string> <string name="download_error" msgid="5144180777324573236">"Hindi matagumpay"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Kasalukuyang nagaganap, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Isinasagawa, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 3b8c6a14..f309c143 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Kuyruğa al"</string> <string name="button_cancel_download" msgid="2430166148737975604">"İptal"</string> <string name="button_start_now" msgid="792123674007840864">"Şimdi başlat"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="PERCENT">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 dosya indiriliyor"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> dosya indiriliyor"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Sıraya alındı"</string> <string name="download_running" msgid="3925050393361158266">"Devam ediyor"</string> <string name="download_error" msgid="5144180777324573236">"Başarısız"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Devam ediyor, <xliff:g id="PERCENT">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Devam ediyor, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 10eeea6e..c0ee3924 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"У чергу"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Скасувати"</string> <string name="button_start_now" msgid="792123674007840864">"Почати зараз"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Завантажується 1 файл"</item> <item quantity="other" msgid="9087228371320573153">"Завантажуються файли: <xliff:g id="NUMBER">%d</xliff:g>"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"У черзі"</string> <string name="download_running" msgid="3925050393361158266">"Виконується"</string> <string name="download_error" msgid="5144180777324573236">"Помилка"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Виконується, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Завантаження триває, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index a7942269..4483f1ea 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"قطار"</string> <string name="button_cancel_download" msgid="2430166148737975604">"منسوخ کریں"</string> <string name="button_start_now" msgid="792123674007840864">"ابھی شروع کریں"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 فائل ڈاؤن لوڈ ہو رہی ہے"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> فائلیں ڈاؤن لوڈ ہو رہی ہیں"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"قطار بند"</string> <string name="download_running" msgid="3925050393361158266">"پیشرفت میں ہے"</string> <string name="download_error" msgid="5144180777324573236">"ناکام"</string> - <string name="download_running_percent" msgid="4529799113107391817">"پیشرفت میں، <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"جاری، <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 70b9d978..8d693b13 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Navbat"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Bekor qilish"</string> <string name="button_start_now" msgid="792123674007840864">"Hozir boshlash"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ta fayl yuklab olinmoqda"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> ta fayl yuklab olinmoqda"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Navbatga qo‘shildi"</string> <string name="download_running" msgid="3925050393361158266">"Yuklab olinmoqda"</string> <string name="download_error" msgid="5144180777324573236">"Muvaffaqiyatsiz"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Yuklab olinmoqda, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Davom etmoqda, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 2067acea..74dda92a 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Hàng đợi"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Hủy"</string> <string name="button_start_now" msgid="792123674007840864">"Bắt đầu ngay bây giờ"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"Đang tải xuống 1 tệp"</item> <item quantity="other" msgid="9087228371320573153">"Đang tải xuống <xliff:g id="NUMBER">%d</xliff:g> tệp"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Đã xếp hàng"</string> <string name="download_running" msgid="3925050393361158266">"Đang thực hiện"</string> <string name="download_error" msgid="5144180777324573236">"Không thành công"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Đang tải xuống, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Đang tải xuống, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index af4e3789..ac29b3e9 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"排队"</string> <string name="button_cancel_download" msgid="2430166148737975604">"取消"</string> <string name="button_start_now" msgid="792123674007840864">"立即开始"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"正在下载 1 个文件"</item> <item quantity="other" msgid="9087228371320573153">"正在下载 <xliff:g id="NUMBER">%d</xliff:g> 个文件"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"已加入队列"</string> <string name="download_running" msgid="3925050393361158266">"正在下载"</string> <string name="download_error" msgid="5144180777324573236">"失败"</string> - <string name="download_running_percent" msgid="4529799113107391817">"正在下载:<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"下载中:<xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 7a0b89c8..41c9c09d 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"加入下載佇列"</string> <string name="button_cancel_download" msgid="2430166148737975604">"取消"</string> <string name="button_start_now" msgid="792123674007840864">"立即開始"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"正在下載 1 個檔案"</item> <item quantity="other" msgid="9087228371320573153">"正在下載 <xliff:g id="NUMBER">%d</xliff:g> 個檔案"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"已加入序列"</string> <string name="download_running" msgid="3925050393361158266">"進行中"</string> <string name="download_error" msgid="5144180777324573236">"不成功"</string> - <string name="download_running_percent" msgid="4529799113107391817">"進行中,已完成 <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"下載中,<xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 8a180b3d..baebd625 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"佇列"</string> <string name="button_cancel_download" msgid="2430166148737975604">"取消"</string> <string name="button_start_now" msgid="792123674007840864">"立即開始"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"正在下載 1 個檔案"</item> <item quantity="other" msgid="9087228371320573153">"正在下載 <xliff:g id="NUMBER">%d</xliff:g> 個檔案"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"已加入佇列"</string> <string name="download_running" msgid="3925050393361158266">"進行中"</string> <string name="download_error" msgid="5144180777324573236">"失敗"</string> - <string name="download_running_percent" msgid="4529799113107391817">"處理中,已完成 <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"下載中 (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 7584bf3a..fac86eb7 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -44,7 +44,6 @@ <string name="button_queue_for_wifi" msgid="422576726189179221">"Umugqa"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Khansela"</string> <string name="button_start_now" msgid="792123674007840864">"Qala manje"</string> - <string name="download_percent" msgid="6889426633242976698">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <plurals name="notif_summary_active"> <item quantity="one" msgid="8475775855911967027">"1 ifayela elilandwayo"</item> <item quantity="other" msgid="9087228371320573153">"<xliff:g id="NUMBER">%d</xliff:g> amafayela alandwayo"</item> @@ -59,5 +58,5 @@ <string name="download_queued" msgid="3302638231377947451">"Kusemugqeni"</string> <string name="download_running" msgid="3925050393361158266">"kuyaqhubeka"</string> <string name="download_error" msgid="5144180777324573236">"Akuphumelelanga"</string> - <string name="download_running_percent" msgid="4529799113107391817">"Iyaqhubeka, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="download_running_percent" msgid="4305080769167320204">"Iyaqhubeka, <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index c5712194..5ebb97db 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -190,9 +190,6 @@ [CHAR LIMIT=25] --> <string name="button_start_now">Start now</string> - <!-- Short representation of download progress percentage. [CHAR LIMIT=8] --> - <string name="download_percent"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> - <!-- Title summarizing active downloads. [CHAR LIMIT=32] --> <plurals name="notif_summary_active"> <item quantity="one">1 file downloading</item> @@ -227,6 +224,6 @@ <string name="download_error">Unsuccessful</string> <!-- Representation of download progress percentage when running. [CHAR LIMIT=24] --> - <string name="download_running_percent">In progress, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> + <string name="download_running_percent">In progress, <xliff:g id="percentage" example="50%">%s</xliff:g></string> </resources> diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java index 0fb5a583..3af97463 100644 --- a/src/com/android/providers/downloads/DownloadNotifier.java +++ b/src/com/android/providers/downloads/DownloadNotifier.java @@ -43,6 +43,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import java.text.NumberFormat; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -221,8 +222,8 @@ public class DownloadNotifier { } if (total > 0) { - final int percent = (int) ((current * 100) / total); - percentText = res.getString(R.string.download_percent, percent); + percentText = + NumberFormat.getPercentInstance().format((double) current / total); if (speed > 0) { final long remainingMillis = ((total - current) * 1000) / speed; @@ -248,6 +249,7 @@ public class DownloadNotifier { speedAsSizeText = Formatter.formatFileSize(mContext, speed); } + final int percent = (int) ((current * 100) / total); builder.setProgress(100, percent, false); } else { builder.setProgress(100, 0, true); diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index 78b3c430..80d78551 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -42,6 +42,7 @@ import libcore.io.IoUtils; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.text.NumberFormat; /** * Presents a {@link DocumentsContract} view of {@link DownloadManager} @@ -321,7 +322,8 @@ public class DownloadStorageProvider extends DocumentsProvider { final long progress = cursor.getLong(cursor.getColumnIndexOrThrow( DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)); if (size != null) { - final long percent = progress * 100 / size; + String percent = + NumberFormat.getPercentInstance().format((double) progress / size); summary = getContext().getString(R.string.download_running_percent, percent); } else { summary = getContext().getString(R.string.download_running); diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index aa0190bf..c75e4193 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -17,6 +17,7 @@ package com.android.providers.downloads; import static android.provider.Downloads.Impl.STATUS_BAD_REQUEST; +import static android.provider.Downloads.Impl.STATUS_CANCELED; import static android.provider.Downloads.Impl.STATUS_CANNOT_RESUME; import static android.provider.Downloads.Impl.STATUS_FILE_ERROR; import static android.provider.Downloads.Impl.STATUS_HTTP_DATA_ERROR; @@ -143,10 +144,7 @@ public class DownloadThread implements Runnable { mETag = info.mETag; } - /** - * Push update of current delta values to provider. - */ - public void writeToDatabase() { + private ContentValues buildContentValues() { final ContentValues values = new ContentValues(); values.put(Downloads.Impl.COLUMN_URI, mUri); @@ -162,7 +160,26 @@ public class DownloadThread implements Runnable { values.put(Downloads.Impl.COLUMN_LAST_MODIFICATION, mSystemFacade.currentTimeMillis()); values.put(Downloads.Impl.COLUMN_ERROR_MSG, mErrorMsg); - mContext.getContentResolver().update(mInfo.getAllDownloadsUri(), values, null, null); + return values; + } + + /** + * Blindly push update of current delta values to provider. + */ + public void writeToDatabase() { + mContext.getContentResolver().update(mInfo.getAllDownloadsUri(), buildContentValues(), + null, null); + } + + /** + * Push update of current delta values to provider, asserting strongly + * that we haven't been paused or deleted. + */ + public void writeToDatabaseOrThrow() throws StopRequestException { + if (mContext.getContentResolver().update(mInfo.getAllDownloadsUri(), + buildContentValues(), Downloads.Impl.COLUMN_DELETED + " == '0'", null) == 0) { + throw new StopRequestException(STATUS_CANCELED, "Download deleted or missing!"); + } } } @@ -422,12 +439,16 @@ public class DownloadThread implements Runnable { */ private void transferData(HttpURLConnection conn) throws StopRequestException { - // To detect when we're really finished, we either need a length or - // chunked encoding. + // To detect when we're really finished, we either need a length, closed + // connection, or chunked encoding. final boolean hasLength = mInfoDelta.mTotalBytes != -1; - final String transferEncoding = conn.getHeaderField("Transfer-Encoding"); - final boolean isChunked = "chunked".equalsIgnoreCase(transferEncoding); - if (!hasLength && !isChunked) { + final boolean isConnectionClose = "close".equalsIgnoreCase( + conn.getHeaderField("Connection")); + final boolean isEncodingChunked = "chunked".equalsIgnoreCase( + conn.getHeaderField("Transfer-Encoding")); + + final boolean finishKnown = hasLength || isConnectionClose || isEncodingChunked; + if (!finishKnown) { throw new StopRequestException( STATUS_CANNOT_RESUME, "can't know size of download, giving up"); } @@ -666,7 +687,7 @@ public class DownloadThread implements Runnable { /** * Report download progress through the database if necessary. */ - private void updateProgress(FileDescriptor outFd) throws IOException { + private void updateProgress(FileDescriptor outFd) throws IOException, StopRequestException { final long now = SystemClock.elapsedRealtime(); final long currentBytes = mInfoDelta.mCurrentBytes; @@ -697,7 +718,7 @@ public class DownloadThread implements Runnable { // so we can always resume based on latest database information. outFd.sync(); - mInfoDelta.writeToDatabase(); + mInfoDelta.writeToDatabaseOrThrow(); mLastUpdateBytes = currentBytes; mLastUpdateTime = now; @@ -736,7 +757,7 @@ public class DownloadThread implements Runnable { mInfoDelta.mETag = conn.getHeaderField("ETag"); - mInfoDelta.writeToDatabase(); + mInfoDelta.writeToDatabaseOrThrow(); // Check connectivity again now that we know the total size checkConnectivity(); @@ -775,6 +796,10 @@ public class DownloadThread implements Runnable { // easily resume partial downloads. conn.setRequestProperty("Accept-Encoding", "identity"); + // Defeat connection reuse, since otherwise servers may continue + // streaming large downloads after cancelled. + conn.setRequestProperty("Connection", "close"); + if (resuming) { if (mInfoDelta.mETag != null) { conn.addRequestProperty("If-Match", mInfoDelta.mETag); @@ -834,6 +859,7 @@ public class DownloadThread implements Runnable { case STATUS_HTTP_DATA_ERROR: case HTTP_UNAVAILABLE: case HTTP_INTERNAL_ERROR: + case STATUS_FILE_ERROR: return true; default: return false; diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index eb071395..0aa49c0a 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -214,7 +214,7 @@ public class Helpers { // The VFAT file system is assumed as target for downloads. // Replace invalid characters according to the specifications of VFAT. - filename = replaceInvalidVfatCharacters(filename); + filename = FileUtils.buildValidFatFilename(filename); return filename; } @@ -665,53 +665,4 @@ public class Helpers { (c >= '0' && c <= '9'); } } - - /** - * Replace invalid filename characters according to - * specifications of the VFAT. - * @note Package-private due to testing. - */ - private static String replaceInvalidVfatCharacters(String filename) { - final char START_CTRLCODE = 0x00; - final char END_CTRLCODE = 0x1f; - final char QUOTEDBL = 0x22; - final char ASTERISK = 0x2A; - final char SLASH = 0x2F; - final char COLON = 0x3A; - final char LESS = 0x3C; - final char GREATER = 0x3E; - final char QUESTION = 0x3F; - final char BACKSLASH = 0x5C; - final char BAR = 0x7C; - final char DEL = 0x7F; - final char UNDERSCORE = 0x5F; - - StringBuffer sb = new StringBuffer(); - char ch; - boolean isRepetition = false; - for (int i = 0; i < filename.length(); i++) { - ch = filename.charAt(i); - if ((START_CTRLCODE <= ch && - ch <= END_CTRLCODE) || - ch == QUOTEDBL || - ch == ASTERISK || - ch == SLASH || - ch == COLON || - ch == LESS || - ch == GREATER || - ch == QUESTION || - ch == BACKSLASH || - ch == BAR || - ch == DEL){ - if (!isRepetition) { - sb.append(UNDERSCORE); - isRepetition = true; - } - } else { - sb.append(ch); - isRepetition = false; - } - } - return sb.toString(); - } } diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index d7b389c5..d1048b02 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -61,6 +61,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @LargeTest @@ -239,7 +240,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { return buildResponse(HTTP_OK, STRING_1K) .setHeader("Content-length", contentLength) .setHeader("Etag", ETAG) - .setBytesPerSecond(1024); + .throttleBody(1024, 1, TimeUnit.SECONDS); } public void testFiltering() throws Exception { diff --git a/ui/res/values-hi/strings.xml b/ui/res/values-hi/strings.xml index d33f40c4..4761bd34 100644 --- a/ui/res/values-hi/strings.xml +++ b/ui/res/values-hi/strings.xml @@ -28,12 +28,12 @@ <string name="download_success" msgid="7006048006543495236">"पूर्ण"</string> <string name="download_error" msgid="8081329546008568251">"विफल"</string> <string name="dialog_title_not_available" msgid="5746317632356158515">"डाउनलोड नहीं किया जा सका"</string> - <string name="dialog_failed_body" msgid="587545111677064427">"क्या आप बाद में फ़ाइल डाउनलोड करने का फिर से प्रयास करना चाहते हैं या उसे कतार से हटाना चाहते हैं?"</string> + <string name="dialog_failed_body" msgid="587545111677064427">"क्या आप बाद में फ़ाइल डाउनलोड करने का पुनः प्रयास करना चाहते हैं या उसे कतार से हटाना चाहते हैं?"</string> <string name="dialog_title_queued_body" msgid="6760681913815015219">"फ़ाइल कतार में"</string> <string name="dialog_queued_body" msgid="708552801635572720">"यह फ़ाइल भविष्य के डाउनलोड के लिए कतारबद्ध है इसलिए अभी उपलब्ध नहीं है."</string> <string name="dialog_file_missing_body" msgid="3223012612774276284">"डाउनलोड की गई फ़ाइल नहीं मिल रही."</string> - <string name="dialog_insufficient_space_on_external" msgid="8692452156251449195">"डाउनलोड पूर्ण नहीं हो सकता. बाह्य मेमोरी पर पर्याप्त स्थान नहीं है."</string> - <string name="dialog_insufficient_space_on_cache" msgid="6313630206163908994">"डाउनलोड पूर्ण नहीं हो सकता. आंतरिक डाउनलोड मेमोरी में पर्याप्त स्थान नहीं है."</string> + <string name="dialog_insufficient_space_on_external" msgid="8692452156251449195">"डाउनलोड पूर्ण नहीं हो सकता. बाह्य संग्रहण पर पर्याप्त स्थान नहीं है."</string> + <string name="dialog_insufficient_space_on_cache" msgid="6313630206163908994">"डाउनलोड पूर्ण नहीं हो सकता. आंतरिक डाउनलोड संग्रहण में पर्याप्त स्थान नहीं है."</string> <string name="dialog_cannot_resume" msgid="8664509751358983543">"डाउनलोड बाधित हो गया था और इसे फिर से शुरू नहीं किया जा सकता."</string> <string name="dialog_file_already_exists" msgid="8308563940663449590">"डाउनलोड नहीं कर सकता. गंतव्य फ़ाइल पहले से मौजूद है."</string> <string name="dialog_media_not_found" msgid="4468088418758018765">"डाउनलोड नहीं किया जा सकता. बाह्य मीडिया उपलब्ध नहीं है."</string> @@ -41,9 +41,9 @@ <string name="remove_download" msgid="6372920256257247857">"निकालें"</string> <string name="delete_download" msgid="76629022653866471">"हटाएं"</string> <string name="keep_queued_download" msgid="5144882786014818569">"रखें"</string> - <string name="cancel_running_download" msgid="5232704030969221112">"रहने दें"</string> + <string name="cancel_running_download" msgid="5232704030969221112">"रद्द करें"</string> <string name="retry_download" msgid="7617100787922717912">"पुन: प्रयास करें"</string> - <string name="deselect_all" msgid="6348198946254776764">"कुछ भी ना चुनें"</string> + <string name="deselect_all" msgid="6348198946254776764">"सभी का चयन रद्द करें"</string> <string name="select_all" msgid="634074918366265804">"सभी चुनें"</string> <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string> <string name="download_share_dialog" msgid="3355867339806448955">"इसके द्वारा साझा करें"</string> diff --git a/ui/res/values-my-rMM/strings.xml b/ui/res/values-my-rMM/strings.xml index f2483e8e..999c57e3 100644 --- a/ui/res/values-my-rMM/strings.xml +++ b/ui/res/values-my-rMM/strings.xml @@ -41,7 +41,7 @@ <string name="remove_download" msgid="6372920256257247857">"ဖယ်ရှားရန်"</string> <string name="delete_download" msgid="76629022653866471">"ဖျက်ပစ်ရန်"</string> <string name="keep_queued_download" msgid="5144882786014818569">"သိမ်းထားပါ"</string> - <string name="cancel_running_download" msgid="5232704030969221112">"ထားတော့"</string> + <string name="cancel_running_download" msgid="5232704030969221112">"ပယ်ဖျက်သည်"</string> <string name="retry_download" msgid="7617100787922717912">"ပြန်ကြိုးစားပါ"</string> <string name="deselect_all" msgid="6348198946254776764">"ဘာကိုမှ မရွေးပါ"</string> <string name="select_all" msgid="634074918366265804">"အားလုံးရွေးချယ်ရန်"</string> |