Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/providers/DownloadProvider into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

6 files changed, 12 insertions, 12 deletions

diff --git a/ui/res/values-es-rUS/strings.xml b/ui/res/values-es-rUS/strings.xml
index cd040690..197eba27 100644
--- a/ui/res/values-es-rUS/strings.xml
+++ b/ui/res/values-es-rUS/strings.xml
@@ -46,5 +46,5 @@
     <string name="deselect_all" msgid="6348198946254776764">"Desmarcar todas"</string>
     <string name="select_all" msgid="634074918366265804">"Seleccionar todas"</string>
     <string name="selected_count" msgid="2101564570019753277">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
-    <string name="download_share_dialog" msgid="3355867339806448955">"Compartir"</string>
+    <string name="download_share_dialog" msgid="3355867339806448955">"Compartir mediante"</string>
 </resources>
diff --git a/ui/res/values-fa/strings.xml b/ui/res/values-fa/strings.xml
index 6234f3c6..eeb855ef 100644
--- a/ui/res/values-fa/strings.xml
+++ b/ui/res/values-fa/strings.xml
@@ -17,11 +17,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="3070921713463294774">"دانلودها"</string>
-    <string name="download_title_sorted_by_date" msgid="5898014492155434221">"دانلودها - مرتب شده براساس تاریخ"</string>
-    <string name="download_title_sorted_by_size" msgid="1417193166677094813">"دانلودها - مرتب شده براساس اندازه"</string>
+    <string name="download_title_sorted_by_date" msgid="5898014492155434221">"دانلودها - مرتب شده بر اساس تاریخ"</string>
+    <string name="download_title_sorted_by_size" msgid="1417193166677094813">"دانلودها - مرتب شده بر اساس اندازه"</string>
     <string name="no_downloads" msgid="1029667411186146836">"خیر دانلودها."</string>
     <string name="missing_title" msgid="830115697868833773">"‏&lt;ناشناس&gt;"</string>
-    <string name="button_sort_by_size" msgid="7331549713691146251">"براساس اندازه مرتب شود"</string>
+    <string name="button_sort_by_size" msgid="7331549713691146251">"بر اساس اندازه مرتب شود"</string>
     <string name="button_sort_by_date" msgid="8800842892684101528">"ترتیب براساس تاریخ"</string>
     <string name="download_queued" msgid="104973307780629904">"در صف"</string>
     <string name="download_running" msgid="4656462962155580641">"در حال انجام"</string>
@@ -45,6 +45,6 @@
     <string name="retry_download" msgid="7617100787922717912">"امتحان مجدد"</string>
     <string name="deselect_all" msgid="6348198946254776764">"لغو انتخاب همه"</string>
     <string name="select_all" msgid="634074918366265804">"انتخاب همه"</string>
-    <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد از <xliff:g id="TOTAL">%2$d</xliff:g> انتخاب شده"</string>
+    <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد انتخاب شده از <xliff:g id="TOTAL">%2$d</xliff:g> مورد"</string>
     <string name="download_share_dialog" msgid="3355867339806448955">"اشتراک‌گذاری از طریق"</string>
 </resources>
diff --git a/ui/res/values-kk-rKZ/strings.xml b/ui/res/values-kk-rKZ/strings.xml
index 061d127d..5987713f 100644
--- a/ui/res/values-kk-rKZ/strings.xml
+++ b/ui/res/values-kk-rKZ/strings.xml
@@ -46,5 +46,5 @@
     <string name="deselect_all" msgid="6348198946254776764">"Барлығының таңдауын алыңыз"</string>
     <string name="select_all" msgid="634074918366265804">"Барлығын таңдау"</string>
     <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="NUMBER">%1$d</xliff:g> таңдалды, барлығы <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="download_share_dialog" msgid="3355867339806448955">"Бөлісу"</string>
+    <string name="download_share_dialog" msgid="3355867339806448955">"Бөлісу қолданбасы"</string>
 </resources>
diff --git a/ui/res/values-nl/strings.xml b/ui/res/values-nl/strings.xml
index 47d063c7..2f07dff8 100644
--- a/ui/res/values-nl/strings.xml
+++ b/ui/res/values-nl/strings.xml
@@ -28,7 +28,7 @@
     <string name="download_success" msgid="7006048006543495236">"Voltooid"</string>
     <string name="download_error" msgid="8081329546008568251">"Mislukt"</string>
     <string name="dialog_title_not_available" msgid="5746317632356158515">"Kan niet downloaden"</string>
-    <string name="dialog_failed_body" msgid="587545111677064427">"Wil je het bestand later opnieuw proberen te downloaden of uit de wachtrij verwijderen?"</string>
+    <string name="dialog_failed_body" msgid="587545111677064427">"Wilt u het bestand later opnieuw proberen te downloaden of uit de wachtrij verwijderen?"</string>
     <string name="dialog_title_queued_body" msgid="6760681913815015219">"Bestand in wachtrij"</string>
     <string name="dialog_queued_body" msgid="708552801635572720">"Dit bestand staat in de wachtrij voor later downloaden, dus het bestand is nog niet beschikbaar."</string>
     <string name="dialog_file_missing_body" msgid="3223012612774276284">"Kan het gedownloade bestand niet vinden."</string>
diff --git a/ui/res/values-tl/strings.xml b/ui/res/values-tl/strings.xml
index 90f9584e..9d54a427 100644
--- a/ui/res/values-tl/strings.xml
+++ b/ui/res/values-tl/strings.xml
@@ -21,8 +21,8 @@
     <string name="download_title_sorted_by_size" msgid="1417193166677094813">"Mga download - Inuri-uri ayon sa laki"</string>
     <string name="no_downloads" msgid="1029667411186146836">"Walang mga pag-download."</string>
     <string name="missing_title" msgid="830115697868833773">"&lt;Hindi Kilala&gt;"</string>
-    <string name="button_sort_by_size" msgid="7331549713691146251">"Uriin ayon sa laki"</string>
-    <string name="button_sort_by_date" msgid="8800842892684101528">"Uriin ayon sa petsa"</string>
+    <string name="button_sort_by_size" msgid="7331549713691146251">"Pag-uri-uriin sa laki"</string>
+    <string name="button_sort_by_date" msgid="8800842892684101528">"Pag-uri-uriin sa petsa"</string>
     <string name="download_queued" msgid="104973307780629904">"Naka-queue"</string>
     <string name="download_running" msgid="4656462962155580641">"Isinasagawa"</string>
     <string name="download_success" msgid="7006048006543495236">"Kumpleto"</string>
diff --git a/ui/res/values-uz-rUZ/strings.xml b/ui/res/values-uz-rUZ/strings.xml
index 10930124..11add3f9 100644
--- a/ui/res/values-uz-rUZ/strings.xml
+++ b/ui/res/values-uz-rUZ/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3070921713463294774">"Yuklanishlar"</string>
+    <string name="app_label" msgid="3070921713463294774">"Yuklab olishlar"</string>
     <string name="download_title_sorted_by_date" msgid="5898014492155434221">"Yuklab olishlar - Sana bo‘yicha saralan."</string>
     <string name="download_title_sorted_by_size" msgid="1417193166677094813">"Yuklab olishlar - Hajm bo‘yicha saralan."</string>
     <string name="no_downloads" msgid="1029667411186146836">"Yuklab olishlar yo‘q."</string>
@@ -45,6 +45,6 @@
     <string name="retry_download" msgid="7617100787922717912">"Qayta urinish"</string>
     <string name="deselect_all" msgid="6348198946254776764">"Belgilashlarni bekor qil."</string>
     <string name="select_all" msgid="634074918366265804">"Barchasini belgilash"</string>
-    <string name="selected_count" msgid="2101564570019753277">"Tanlandi: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="download_share_dialog" msgid="3355867339806448955">"Ulashish usuli"</string>
+    <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="TOTAL">%2$d</xliff:g>dan <xliff:g id="NUMBER">%1$d</xliff:g>ta belgilandi"</string>
+    <string name="download_share_dialog" msgid="3355867339806448955">"Bu orqali ulashish:"</string>
 </resources>