Merge "Merge Android Pie into master" am: cdcd3719b4
am: e63c7c5a77
Change-Id: Ia04d61f8023e9598934a6cb66a9bdf95376af93b
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ec6a402..ca1e8a4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -24,7 +24,7 @@
<string name="notification_sound_default" msgid="6541609166469990135">"الصوت التلقائي للإشعارات"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"الصوت التلقائي للتنبيه"</string>
<string name="root_images" msgid="5861633549189045666">"الصور"</string>
- <string name="root_videos" msgid="8792703517064649453">"الفيديوهات"</string>
+ <string name="root_videos" msgid="8792703517064649453">"مقاطع الفيديو"</string>
<string name="root_audio" msgid="3505830755201326018">"الصوت"</string>
<string name="sound_name_awaken" msgid="5266892392848526147">"إيقاظ"</string>
<string name="sound_name_bounce" msgid="8771447635446665231">"ارتداد"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1588eb8..6fa3d45 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,7 +22,7 @@
<string name="artist_label" msgid="8105600993099120273">"Artista"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Tono de llamada predeterminado"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"Sonido de notificación predeterminado"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Sonido de alarma pred."</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"Sonido de alarma predeterminado"</string>
<string name="root_images" msgid="5861633549189045666">"Imágenes"</string>
<string name="root_videos" msgid="8792703517064649453">"Vídeos"</string>
<string name="root_audio" msgid="3505830755201326018">"Audio"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f1785bb..f018e2d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -22,7 +22,7 @@
<string name="artist_label" msgid="8105600993099120273">"Artiste"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Sonnerie par défaut"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"Son de notification par défaut"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Son de l\'alarme par défaut"</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"Son par défaut pour l\'alarme"</string>
<string name="root_images" msgid="5861633549189045666">"Images"</string>
<string name="root_videos" msgid="8792703517064649453">"Vidéos"</string>
<string name="root_audio" msgid="3505830755201326018">"Audio"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0ef4bc5..339ee5b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Stockage multimédia"</string>
<string name="artist_label" msgid="8105600993099120273">"Artiste"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Sonnerie par défaut"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Son notif. par défaut"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Son de notification par défaut"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Son de l\'alarme par défaut"</string>
<string name="root_images" msgid="5861633549189045666">"Images"</string>
<string name="root_videos" msgid="8792703517064649453">"Vidéos"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 60e357f..e2c6b75 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -22,7 +22,7 @@
<string name="artist_label" msgid="8105600993099120273">"કલાકાર"</string>
<string name="ringtone_default" msgid="1744846699922263043">"ડિફોલ્ટ રિંગટોન"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"ડિફૉલ્ટ એલાર્મ સાઉન્ડ"</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"ડિફોલ્ટ એલાર્મ ધ્વનિ"</string>
<string name="root_images" msgid="5861633549189045666">"છબીઓ"</string>
<string name="root_videos" msgid="8792703517064649453">"વિડિઓઝ"</string>
<string name="root_audio" msgid="3505830755201326018">"ઑડિઓ"</string>
@@ -36,7 +36,7 @@
<string name="sound_name_sway" msgid="348448316663085643">"Sway"</string>
<string name="sound_name_wag" msgid="2730733083078126563">"Wag"</string>
<string name="add_ringtone_text" msgid="8077717303037760418">"રિંગટોન ઉમેરો"</string>
- <string name="delete_ringtone_text" msgid="2963662097583300181">"ડિલીટ કરો"</string>
+ <string name="delete_ringtone_text" msgid="2963662097583300181">"કાઢી નાખો"</string>
<string name="unable_to_add_ringtone" msgid="6256097521165711269">"કસ્ટમ રિંગટોન ઉમેરવામાં અસમર્થ"</string>
<string name="unable_to_delete_ringtone" msgid="2258180073859253495">"કસ્ટમ રિંગટોન કાઢી નાખવામાં અસમર્થ"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9d9d918..0b33f6b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -22,7 +22,7 @@
<string name="artist_label" msgid="8105600993099120273">"אמן"</string>
<string name="ringtone_default" msgid="1744846699922263043">"רינגטון ברירת מחדל"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"צליל ברירת המחדל לתזכורת"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"צליל לשעון מעורר"</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"צליל ברירת המחדל להתראה"</string>
<string name="root_images" msgid="5861633549189045666">"תמונות"</string>
<string name="root_videos" msgid="8792703517064649453">"סרטונים"</string>
<string name="root_audio" msgid="3505830755201326018">"אודיו"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 64ab7e0..3ff4341 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Медиа санах ой"</string>
<string name="artist_label" msgid="8105600993099120273">"Уран бүтээлч"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Үндсэн хонхны ая"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Мэдэгдлийн өгөгдмөл ая"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Мэдэгдлийн үндсэн ая"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Сэрүүлгийн өгөгдмөл дуу"</string>
<string name="root_images" msgid="5861633549189045666">"Зураг"</string>
<string name="root_videos" msgid="8792703517064649453">"Бичлэг"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 99421c3..bf6888b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="uid_label" msgid="8421971615411294156">"मीडिया"</string>
- <string name="storage_description" msgid="4081716890357580107">"स्थानिक स्टोरेज"</string>
- <string name="app_label" msgid="9035307001052716210">"मीडिया स्टोरेज"</string>
+ <string name="storage_description" msgid="4081716890357580107">"स्थानिक संचय"</string>
+ <string name="app_label" msgid="9035307001052716210">"मीडिया संचय"</string>
<string name="artist_label" msgid="8105600993099120273">"कलाकार"</string>
<string name="ringtone_default" msgid="1744846699922263043">"डीफॉल्ट रिंगटोन"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"डीफॉल्ट सूचना ध्वनी"</string>
@@ -37,6 +37,6 @@
<string name="sound_name_wag" msgid="2730733083078126563">"वॉग"</string>
<string name="add_ringtone_text" msgid="8077717303037760418">"रिंगटोन जोडा"</string>
<string name="delete_ringtone_text" msgid="2963662097583300181">"हटवा"</string>
- <string name="unable_to_add_ringtone" msgid="6256097521165711269">"कस्टम रिंगटोन जोडण्यात अक्षम"</string>
- <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"कस्टम रिंगटोन हटविण्यात अक्षम"</string>
+ <string name="unable_to_add_ringtone" msgid="6256097521165711269">"सानुकूल रिंगटोन जोडण्यात अक्षम"</string>
+ <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"सानुकूल रिंगटोन हटविण्यात अक्षम"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9835eda..e53c849 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Armazenamento de multimédia"</string>
<string name="artist_label" msgid="8105600993099120273">"Artista"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Toque predefinido"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Som notif. predefinido"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Som de notificação predefinido"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Som de alarme predefinido"</string>
<string name="root_images" msgid="5861633549189045666">"Imagens"</string>
<string name="root_videos" msgid="8792703517064649453">"Vídeos"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a2b6ae2..805930a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,9 +20,9 @@
<string name="storage_description" msgid="4081716890357580107">"Hifadhi ya ndani"</string>
<string name="app_label" msgid="9035307001052716210">"Hifadhi ya Maudhui"</string>
<string name="artist_label" msgid="8105600993099120273">"Msanii"</string>
- <string name="ringtone_default" msgid="1744846699922263043">"Mlio chaguomsingi wa simu"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Sauti chaguomsingi ya arifa"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Sauti chaguomsingi ya kengele"</string>
+ <string name="ringtone_default" msgid="1744846699922263043">"Mlio chaguo-msingi wa simu"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Sauti chaguo-msingi ya arifa"</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"Sauti chaguo-msingi ya kengele"</string>
<string name="root_images" msgid="5861633549189045666">"Picha"</string>
<string name="root_videos" msgid="8792703517064649453">"Video"</string>
<string name="root_audio" msgid="3505830755201326018">"Sauti"</string>
