DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I062313ad6a7efd65ffdd90b1912030d39fc1c43e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a957ca0..98d295c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
         package="com.android.providers.media"
         android:sharedUserId="android.media"
         android:sharedUserLabel="@string/uid_label"
-        android:versionCode="900">
+        android:versionCode="1000">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -18,7 +18,8 @@
     <application android:process="android.process.media"
                  android:label="@string/app_label"
                  android:allowBackup="false"
-                 android:supportsRtl="true">
+                 android:supportsRtl="true"
+                 android:usesCleartextTraffic="true">
         <provider android:name="MediaProvider" android:authorities="media"
                 android:multiprocess="false" android:exported="true">
             <grant-uri-permission android:pathPrefix="/external/" />
diff --git a/OWNERS b/OWNERS
index 7f4b137..f6fbe68 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
-deckard@android.com
 marcone@google.com
-zhangjerry@google.com
+jsharkey@android.com
diff --git a/res/layout-watch/add_ringtone_item.xml b/res/layout-watch/add_new_sound_item.xml
similarity index 96%
rename from res/layout-watch/add_ringtone_item.xml
rename to res/layout-watch/add_new_sound_item.xml
index aef30e3..6f91d77 100644
--- a/res/layout-watch/add_ringtone_item.xml
+++ b/res/layout-watch/add_new_sound_item.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/add_ringtone_text"
+        android:text="@null"
         android:textColor="?android:attr/colorAccent"
         android:gravity="center_vertical"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
diff --git a/res/layout/add_ringtone_item.xml b/res/layout/add_new_sound_item.xml
similarity index 94%
rename from res/layout/add_ringtone_item.xml
rename to res/layout/add_new_sound_item.xml
index aea1a2b..14421c9 100644
--- a/res/layout/add_ringtone_item.xml
+++ b/res/layout/add_new_sound_item.xml
@@ -32,11 +32,11 @@
         android:src="@drawable/ic_add" />
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/add_ringtone_text"
+        android:id="@+id/add_new_sound_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:text="@string/add_ringtone_text"
+        android:text="@null"
         android:textColor="?android:attr/colorAccent"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:maxLines="3"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cdfb908..7c965c2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Slinger"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Swaai"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Voeg luitoon by"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Vee uit"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Kan nie gepasmaakte luitoon byvoeg nie"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Kan nie gepasmaakte luitoon uitvee nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8460f36..9a4d410 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"ተወዛወዝ"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"አወዛውዝ"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"የጥሪ ቅላጼ አክል"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ec6a402..8c3b96d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"تأرجُح"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"اهتزاز"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"إضافة نغمة رنين"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index bab716b..6747c3a 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -16,25 +16,43 @@
 
 <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>
+    <!-- no translation found for uid_label (8421971615411294156) -->
+    <skip />
     <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>
-    <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>
-    <string name="sound_name_awaken" msgid="5266892392848526147">"জাগি উঠাৰ ধ্বনি"</string>
-    <string name="sound_name_bounce" msgid="8771447635446665231">"বাউঞ্চ ধ্বনি"</string>
-    <string name="sound_name_drip" msgid="1744684469020662152">"ড্ৰিপ ধ্বনি"</string>
-    <string name="sound_name_gallop" msgid="2664454314532060876">"গেল\'প ধ্বনি"</string>
-    <string name="sound_name_nudge" msgid="5445751598250698244">"নাজ ধ্বনি"</string>
-    <string name="sound_name_orbit" msgid="4623457897813255481">"অৰবিট ধ্বনি"</string>
-    <string name="sound_name_rise" msgid="2200258555031675806">"ৰাইজ ধ্বনি"</string>
-    <string name="sound_name_sway" msgid="348448316663085643">"শ্ব\'ৱে ধ্বনি"</string>
-    <string name="sound_name_wag" msgid="2730733083078126563">"ৱাগ ধ্বনি"</string>
+    <!-- no translation found for app_label (9035307001052716210) -->
+    <skip />
+    <!-- no translation found for artist_label (8105600993099120273) -->
+    <skip />
+    <!-- no translation found for ringtone_default (1744846699922263043) -->
+    <skip />
+    <!-- no translation found for notification_sound_default (6541609166469990135) -->
+    <skip />
+    <!-- no translation found for alarm_sound_default (5488847775252870314) -->
+    <skip />
+    <!-- no translation found for root_images (5861633549189045666) -->
+    <skip />
+    <!-- no translation found for root_videos (8792703517064649453) -->
+    <skip />
+    <!-- no translation found for root_audio (3505830755201326018) -->
+    <skip />
+    <!-- no translation found for sound_name_awaken (5266892392848526147) -->
+    <skip />
+    <!-- no translation found for sound_name_bounce (8771447635446665231) -->
+    <skip />
+    <!-- no translation found for sound_name_drip (1744684469020662152) -->
+    <skip />
+    <!-- no translation found for sound_name_gallop (2664454314532060876) -->
+    <skip />
+    <!-- no translation found for sound_name_nudge (5445751598250698244) -->
+    <skip />
+    <!-- no translation found for sound_name_orbit (4623457897813255481) -->
+    <skip />
+    <!-- no translation found for sound_name_rise (2200258555031675806) -->
+    <skip />
+    <!-- no translation found for sound_name_sway (348448316663085643) -->
+    <skip />
+    <!-- no translation found for sound_name_wag (2730733083078126563) -->
+    <skip />
     <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>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 27795d7..fd73189 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Yellənmə"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Fırlatma"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Zəng səsi daxil edin"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Silin"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Fərdi zəng səsi əlavə etmək mümkün deyil"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Fərdi zəng səsini silmək mümkün deyil"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0a11304..3328943 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"njihanje"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"mahanje"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Dodaj melodiju zvona"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Izbriši"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Dodavanje prilagođene melodije zvona nije uspelo"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Brisanje prilagođene melodije zvona nije uspelo"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d4f802a..b717932 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Гайданне"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Маханне"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Дадаць рынгтон"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 90e0231..09e532f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Люлеене"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Поклащане"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Добавяне на мелодия"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index a4524a7..89fd7d3 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"দোলা"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"ওয়াগ"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"রিংটোন যোগ করুন"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index cd99f9b..3220f65 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Njihanje"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Klaćenje"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Dodaj melodiju zvona"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Izbriši"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nije moguće dodati prilagođenu melodiju zvona"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nije moguće izbrisati prilagođenu melodiju zvona"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 628b67d..ee0ba48 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -36,6 +36,10 @@
     <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">"Afegeix un so de trucada"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Suprimeix"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"No es pot afegir el so de trucada personalitzat"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"No es pot suprimir el so de trucada personalitzat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 68389f4..ba243f4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Rozhoupání"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Pochod"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Přidat vyzváněcí tón"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Smazat"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Vlastní vyzváněcí tón se nepodařilo přidat"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Vlastní vyzváněcí tón se nepodařilo smazat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 336f229..9a91a11 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,6 +36,10 @@
     <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">"Tilføj ringetone"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Slet"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Den tilpassede ringetone kunne ikke tilføjes"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Den tilpassede ringetone kunne ikke slettes"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5fbd904..7d9220d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,6 +36,10 @@
     <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">"Klingelton hinzufügen"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Löschen"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Benutzerdefinierter Klingelton konnte nicht hinzugefügt werden"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Benutzerdefinierter Klingelton konnte nicht gelöscht werden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2a0e141..401fa82 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Χαλάρωση"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Κούνημα"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Προσθήκη ήχου κλήσης"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f6104c8..2130e17 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -36,6 +36,8 @@
     <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">"Add ringtone"</string>
+    <string name="add_alarm_text" msgid="2440919366091720815">"Add alarm"</string>
+    <string name="add_notification_text" msgid="5013822215567515665">"Add notification"</string>
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Delete"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Unable to add customised ringtone"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Unable to delete customised ringtone"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f6104c8..2130e17 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -36,6 +36,8 @@
     <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">"Add ringtone"</string>
+    <string name="add_alarm_text" msgid="2440919366091720815">"Add alarm"</string>
+    <string name="add_notification_text" msgid="5013822215567515665">"Add notification"</string>
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Delete"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Unable to add customised ringtone"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Unable to delete customised ringtone"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f6104c8..2130e17 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -36,6 +36,8 @@
     <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">"Add ringtone"</string>
+    <string name="add_alarm_text" msgid="2440919366091720815">"Add alarm"</string>
+    <string name="add_notification_text" msgid="5013822215567515665">"Add notification"</string>
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Delete"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Unable to add customised ringtone"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Unable to delete customised ringtone"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0586775..404af56 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -36,6 +36,10 @@
     <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">"Agregar tono"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Borrar"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"No se puede agregar el tono personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"No se puede borrar el tono personalizado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1588eb8..c953e4c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,6 +36,10 @@
     <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">"Añadir tono de llamada"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Eliminar"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"No se ha podido añadir un tono de llamada personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"No se ha podido eliminar un tono de llamada personalizado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5e2b984..ff7af92 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Kõigutus"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Raputus"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Lisa helin"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Kustuta"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Kohandatud helinat ei õnnestu lisada"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Kohandatud helinat ei õnnestu kustutada"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 2e8033c..8dc23f3 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Kulunka"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Mugimendua"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Gehitu tonua"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Ezabatu"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Ezin da gehitu tonu pertsonalizatua"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Ezin da ezabatu tonu pertsonalizatua"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 69ac9ef..4b9eb11 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,6 +36,8 @@
     <string name="sound_name_sway" msgid="348448316663085643">"نوسان"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"تکان"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"افزودن آهنگ زنگ"</string>
+    <string name="add_alarm_text" msgid="2440919366091720815">"افزودن زنگ ساعت"</string>
+    <string name="add_notification_text" msgid="5013822215567515665">"افزودن اعلان"</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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 62f76ff..9e39635 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Keinunta"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Heilutus"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Lisää soittoääni"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Poista"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Muokatun soittoäänen lisääminen epäonnistui."</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Muokatun soittoäänen poistaminen epäonnistui."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f1785bb..2ef5436 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Balancement"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Remuer"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Ajouter une sonnerie"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Supprimer"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Impossible d\'ajouter une sonnerie personnalisée"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Impossible de supprimer la sonnerie personnalisée"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0ef4bc5..3e7b761 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,6 +36,10 @@
     <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">"Ajouter une sonnerie"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Supprimer"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Impossible d\'ajouter une sonnerie personnalisée"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Impossible de supprimer la sonnerie personnalisée"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index eb52aed..9d1bb15 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Oscilar"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Axitar"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Engadir ton de chamada"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Eliminar"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Non se pode engadir un ton de chamada personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Non se pode eliminar un ton de chamada personalizado"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 60e357f..eef87bf 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c932c75..bc98eec 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"स्वे"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"वैग"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"रिंगटोन जोड़ेंं"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5c7e85e..48ee7ad 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Lelujanje"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Mahanje"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Dodaj melodiju zvona"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Izbriši"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Dodavanje prilagođene melodije zvona nije moguće"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Brisanje prilagođene melodije zvona nije moguće"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b47d643..79bf959 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -36,6 +36,10 @@
     <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">"Csengőhang hozzáadása"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Törlés"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nem sikerült hozzáadni az egyéni csengőhangot"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nem sikerült törölni az egyéni csengőhangot"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e9374a9..3c2a653 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7d3d07d..028e55e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,6 +36,10 @@
     <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">"Tambahkan nada dering"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Hapus"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Tidak dapat menambahkan nada dering khusus"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Tidak dapat menghapus nada dering khusus"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e54a772..a162791 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Sveifla"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Vagg"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Bæta hringitóni við"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Eyða"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Get ekki bætt sérsniðnum hringitóni við"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Get ekki eytt sérsniðnum hringitóni"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 77c2028..f2d4ac2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,6 +36,10 @@
     <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">"Aggiungi suoneria"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Elimina"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Impossibile aggiungere suoneria personalizzata"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Impossibile eliminare suoneria personalizzata"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9d9d918..0c5ee51 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/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>
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"התנודדות"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"כשכוש"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"רינגטון חדש"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bb74988..1b281f7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 7973ed5..81bb1a2 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1865a16..934b240 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Тербелу"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Шайқау"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Рингтон енгізу"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3e1d801..6be17d7 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"យោល"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"គ្រវី"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"បន្ថែម​សំឡេង​រោទ៍"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index bd26e3c..cccaf27 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"ಸ್ವೇ"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"ವಾಗ್"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"ರಿಂಗ್‌ಟೋನ್ ಸೇರಿಸಿ"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f76e711..f7ccffc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"천천히 흔들리는 소리"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"개가 꼬리를 흔드는 소리"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"벨소리 추가"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 0146713..f7db762 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d497471..3218a67 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"​ລຶບ"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Unable to add custom ringtone"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Unable to delete custom ringtone"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0daa997..6100b06 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -36,6 +36,8 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Supimas"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Mostai"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Pridėti skambėjimo toną"</string>
+    <string name="add_alarm_text" msgid="2440919366091720815">"Pridėti signalą"</string>
+    <string name="add_notification_text" msgid="5013822215567515665">"Pridėti pranešimą"</string>
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Ištrinti"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nepavyksta pridėti tinkinto skambėjimo tono"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nepavyksta ištrinti tinkinto skambėjimo tono"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6582b3d..c98d536 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -36,6 +36,10 @@
     <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">"Pievienot zvana signālu"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Dzēst"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nevar pievienot pielāgotu zvana signālu"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nevar izdzēst pielāgotu zvana signālu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index bbdbde5..ecbde9b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Бранување"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Нишање"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Додај мелодија"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 473df67..c0fe7a9 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"സ്വേ"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"വാഗ്"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"റിംഗ്‌ടോൺ ചേർക്കുക"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 64ab7e0..c44070e 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 99421c3..4bbb0a5 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"स्वे"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"वॉग"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"रिंगटोन जोडा"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 11e2af5..51c6808 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Lenggok"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Goyang"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Tambah nada dering"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Padam"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Tidak dapat menambah nada dering tersuai"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Tidak dapat memadamkan nada dering tersuai"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1626ace..a2c43a9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"ပုခက်လွှဲသံ"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"လှုပ်ခါသံ"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"ဖုန်းမြည်သံကို ထည့်ရန်"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8e7eeaf..be9cb48 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Svai"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Logre"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Legg til ringelyd"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Slett"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Kan ikke legge til egendefinert ringelyd"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Kan ikke slette egendefinert ringelyd"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 856f3ef..e331b86 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 043c577..8ebdf8e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,6 +36,10 @@
     <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">"Beltoon toevoegen"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Verwijderen"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Toevoegen van aangepaste beltoon is mislukt"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Verwijderen van aangepaste beltoon is mislukt"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index 3ba7dfb..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="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="root_images" msgid="5861633549189045666">"ଇମେଜ୍‌"</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>
-    <string name="sound_name_drip" msgid="1744684469020662152">"ଡ୍ରିପ୍"</string>
-    <string name="sound_name_gallop" msgid="2664454314532060876">"ଗେଲପ୍‍"</string>
-    <string name="sound_name_nudge" msgid="5445751598250698244">"ନଜ୍‍"</string>
-    <string name="sound_name_orbit" msgid="4623457897813255481">"ଅରବିଟ୍‍"</string>
-    <string name="sound_name_rise" msgid="2200258555031675806">"ରାଇଜ୍‍"</string>
-    <string name="sound_name_sway" msgid="348448316663085643">"ସ୍ୱେ"</string>
-    <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>
-</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8cceb37..814a897 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"ਸਵੇਅ"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"ਵੈਗ"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"ਰਿੰਗਟੋਨ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 68aee64..e5e8fde 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Kołysanie"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Machanie"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Dodaj dzwonek"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Usuń"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nie można dodać dzwonka niestandardowego"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nie można usunąć dzwonka niestandardowego"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6ce0021..8f0bb96 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -36,6 +36,10 @@
     <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">"Adicionar toque"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Excluir"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Não foi possível adicionar o toque personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Não foi possível excluir o toque personalizado"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9835eda..1cbff50 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Balançar"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Abanar"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Adicionar toque"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Eliminar"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Não foi possível adicionar o toque personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Não foi possível eliminar o toque personalizado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6ce0021..8f0bb96 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,6 +36,10 @@
     <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">"Adicionar toque"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Excluir"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Não foi possível adicionar o toque personalizado"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Não foi possível excluir o toque personalizado"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 37cf42a..6839426 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,6 +36,10 @@
     <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">"Adăugați un ton de sonerie"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Ștergeți"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nu se poate adăuga tonul de sonerie personalizat"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nu se poate șterge tonul de sonerie personalizat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6a43bb1..dcd5b9d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 0f89f28..74dfea1 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"පැද්දීම"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"එහා මෙහා යාම"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"නාද රිද්මය එක් කරන්න"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3372c65..89dd806 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,6 +36,10 @@
     <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">"Pridať tón zvonenia"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Odstrániť"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nepodarilo sa pridať vlastný tón zvonenia"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nepodarilo sa odstrániť vlastný tón zvonenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index de566cf..5468ed6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Guganje"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Mahanje"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Dodaj ton zvonjenja"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Izbriši"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Tona zvonjenja po meri ni mogoče dodati"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Tona zvonjenja po meri ni mogoče izbrisati"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e919dc4..7224954 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Lëkundje"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Tundje"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Shto zile"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Fshi"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Nuk mund të shtojë ton zileje të personalizuar"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Nuk mund të fshijë ton zileje të personalizuar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2fe284e..bc22473 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"њихање"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"махање"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Додај мелодију звона"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 12bd0f3..05634c7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -36,6 +36,10 @@
     <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">"Lägg till ringsignal"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Radera"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Det gick inte att lägga till en egen ringsignal"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Det gick inte att radera den egna ringsignalen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a2b6ae2..94aaf64 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -36,6 +36,10 @@
     <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">"Ongeza mlio wa simu"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Futa"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Imeshindwa kuongeza mlio maalum wa simu"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Imeshindwa kufuta mlio maalum wa simu"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 5a298f3..eec3836 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"ஸ்வே"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"வேக்"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"ரிங்டோனைச் சேர்"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e95a88d..edec17c 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"స్వే"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"వాగ్"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"రింగ్‌టోన్‌ను జోడించు"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4337331..8319e0f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d708cc0..7e36b5b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -36,6 +36,10 @@
     <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">"Magdagdag ng ringtone"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"I-delete"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Hindi maidagdag ang custom na ringtone"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Hindi ma-delete ang custom na ringtone"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a7ea4b3..965dc76 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -36,6 +36,10 @@
     <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">"Zil sesi ekle"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Sil"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Özel zil sesi eklenemiyor"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Özel zil sesi silinemiyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7f2e063..4568405 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1792d89..4a3e318 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"جھولن"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"جنبش"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"رنگ ٹون شامل کریں"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 14d7221..0024690 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Chayqalish"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Silkitish"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Rington qo‘shish"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"O‘chirish"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Maxsus rington qo‘shib bo‘lmadi"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Maxsus ringtonni o‘chirib bo‘lmadi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index df4085d..8a46093 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"Đu đưa"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"Thoảng qua"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Thêm nhạc chuông"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Xóa"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Không thể thêm nhạc chuông tùy chỉnh"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Không thể xóa nhạc chuông tùy chỉnh"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 645d836..2c50991 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4b8149f..e77fb09 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 68616ff..150471e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -36,6 +36,10 @@
     <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>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ea4405e..2b374ee 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -36,6 +36,10 @@
     <string name="sound_name_sway" msgid="348448316663085643">"I-Sway"</string>
     <string name="sound_name_wag" msgid="2730733083078126563">"I-Wag"</string>
     <string name="add_ringtone_text" msgid="8077717303037760418">"Engeza ithoni yokukhala"</string>
+    <!-- no translation found for add_alarm_text (2440919366091720815) -->
+    <skip />
+    <!-- no translation found for add_notification_text (5013822215567515665) -->
+    <skip />
     <string name="delete_ringtone_text" msgid="2963662097583300181">"Susa"</string>
     <string name="unable_to_add_ringtone" msgid="6256097521165711269">"Ayikwazi ukwengeza ithoni yokukhala yangokwezifiso"</string>
     <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"Ayikwazi ukususa ithoni yokukhala yangokwezifiso"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3672f52..336b654 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,6 +73,10 @@
 
     <!-- Text for the RingtonePicker item that allows adding a new ringtone. -->
     <string name="add_ringtone_text">Add ringtone</string>
+    <!-- Text for the RingtonePicker item that allows adding a new alarm. -->
+    <string name="add_alarm_text">Add alarm</string>
+    <!-- Text for the RingtonePicker item that allows adding a new notification. -->
+    <string name="add_notification_text">Add notification</string>
     <!-- Text for the RingtonePicker item ContextMenu that allows deleting a custom ringtone. -->
     <string name="delete_ringtone_text">Delete</string>
     <!-- Text for the Toast displayed when adding a custom ringtone fails. -->
diff --git a/src/com/android/providers/media/MediaDocumentsProvider.java b/src/com/android/providers/media/MediaDocumentsProvider.java
index c5af9db..18a9461 100644
--- a/src/com/android/providers/media/MediaDocumentsProvider.java
+++ b/src/com/android/providers/media/MediaDocumentsProvider.java
@@ -625,12 +625,31 @@
     }
 
     @Override
-    public Cursor queryRecentDocuments(String rootId, String[] projection)
+    public Cursor queryRecentDocuments(
+            String rootId, String[] projection, @Nullable Bundle queryArgs,
+      @Nullable CancellationSignal signal)
             throws FileNotFoundException {
         final ContentResolver resolver = getContext().getContentResolver();
         final MatrixCursor result = new MatrixCursor(resolveDocumentProjection(projection));
 
         final long token = Binder.clearCallingIdentity();
+
+        int limit = -1;
+        if (queryArgs != null) {
+            limit = queryArgs.getInt(ContentResolver.QUERY_ARG_LIMIT, -1);
+        }
+        if (limit < 0) {
+            // Use default value, and no QUERY_ARG* is honored.
+            limit = 64;
+        } else {
+            // We are honoring the QUERY_ARG_LIMIT.
+            Bundle extras = new Bundle();
+            result.setExtras(extras);
+            extras.putStringArray(ContentResolver.EXTRA_HONORED_ARGS, new String[]{
+                ContentResolver.QUERY_ARG_LIMIT
+            });
+        }
+
         Cursor cursor = null;
         try {
             if (TYPE_IMAGES_ROOT.equals(rootId)) {
@@ -638,7 +657,7 @@
                 cursor = resolver.query(Images.Media.EXTERNAL_CONTENT_URI,
                         ImageQuery.PROJECTION, null, null, ImageColumns.DATE_MODIFIED + " DESC");
                 copyNotificationUri(result, cursor);
-                while (cursor.moveToNext() && result.getCount() < 64) {
+                while (cursor.moveToNext() && result.getCount() < limit) {
                     includeImage(result, cursor);
                 }
             } else if (TYPE_VIDEOS_ROOT.equals(rootId)) {
@@ -646,7 +665,7 @@
                 cursor = resolver.query(Video.Media.EXTERNAL_CONTENT_URI,
                         VideoQuery.PROJECTION, null, null, VideoColumns.DATE_MODIFIED + " DESC");
                 copyNotificationUri(result, cursor);
-                while (cursor.moveToNext() && result.getCount() < 64) {
+                while (cursor.moveToNext() && result.getCount() < limit) {
                     includeVideo(result, cursor);
                 }
             } else {
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 8f3b54b..9de840c 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -821,7 +821,8 @@
                 + "duration INTEGER,bookmark INTEGER,artist TEXT,album TEXT,resolution TEXT,"
                 + "tags TEXT,category TEXT,language TEXT,mini_thumb_data TEXT,name TEXT,"
                 + "media_type INTEGER,old_id INTEGER,is_drm INTEGER,"
-                + "width INTEGER, height INTEGER, title_resource_uri TEXT)");
+                + "width INTEGER, height INTEGER, title_resource_uri TEXT,"
+                + "color_standard INTEGER, color_transfer INTEGER, color_range INTEGER)");
         db.execSQL("CREATE TABLE log (time DATETIME, message TEXT)");
         if (!internal) {
             db.execSQL("CREATE TABLE audio_genres (_id INTEGER PRIMARY KEY,name TEXT NOT NULL)");
@@ -925,6 +926,7 @@
         db.execSQL("DELETE from artists");
         db.execSQL("ALTER TABLE files ADD COLUMN title_resource_uri TEXT DEFAULT NULL");
         db.execSQL("UPDATE files SET date_modified=0");
+        updateFromPISchema(db);
     }
 
     private static void updateFromOCSchema(SQLiteDatabase db) {
@@ -933,6 +935,14 @@
         db.execSQL("ALTER TABLE files ADD COLUMN title_resource_uri TEXT DEFAULT NULL");
         db.execSQL("UPDATE files SET date_modified=0"
                 + " WHERE (is_alarm IS 1) OR (is_ringtone IS 1) OR (is_notification IS 1)");
+        updateFromPISchema(db);
+    }
+
+    private static void updateFromPISchema(SQLiteDatabase db) {
+        // Add the color aspects related column used for HDR detection etc.
+        db.execSQL("ALTER TABLE files ADD COLUMN color_standard INTEGER;");
+        db.execSQL("ALTER TABLE files ADD COLUMN color_transfer INTEGER;");
+        db.execSQL("ALTER TABLE files ADD COLUMN color_range INTEGER;");
     }
 
     /**
@@ -965,6 +975,8 @@
             updateFromKKSchema(db);
         } else if (fromVersion < 900) {
             updateFromOCSchema(db);
+        } else if (fromVersion < 1000) {
+            updateFromPISchema(db);
         }
 
         sanityCheck(db, fromVersion);
@@ -2918,16 +2930,7 @@
         // a nomedia path was removed, so clear the nomedia paths
         MediaScanner.clearMediaPathCache(false /* media */, true /* nomedia */);
         final DatabaseHelper helper;
-        String[] internalPaths = new String[] {
-            Environment.getRootDirectory() + "/media",
-            Environment.getOemDirectory() + "/media",
-        };
-
-        if (path.startsWith(internalPaths[0]) || path.startsWith(internalPaths[1])) {
-            helper = getDatabaseForUri(MediaStore.Audio.Media.INTERNAL_CONTENT_URI);
-        } else {
-            helper = getDatabaseForUri(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI);
-        }
+        helper = getDatabaseForUri(MediaStore.Audio.Media.getContentUriForPath(path));
         SQLiteDatabase db = helper.getWritableDatabase();
         new ScannerClient(getContext(), db, path);
     }
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java
index fffd830..95cac14 100644
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -376,7 +376,7 @@
         }
         // If external storage is available, add a button to install sounds from storage.
         if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            addNewRingtoneItem(listView);
+            addNewSoundItem(listView);
         }
 
         // Enable context menu in ringtone items
@@ -440,9 +440,19 @@
         return addStaticItem(listView, com.android.internal.R.string.ringtone_silent);
     }
 
-    private void addNewRingtoneItem(ListView listView) {
-        listView.addFooterView(getLayoutInflater().inflate(R.layout.add_ringtone_item, listView,
-                false /* attachToRoot */));
+    private void addNewSoundItem(ListView listView) {
+        View view = getLayoutInflater().inflate(R.layout.add_new_sound_item, listView,
+                false /* attachToRoot */);
+        TextView text = (TextView)view.findViewById(R.id.add_new_sound_text);
+
+        if (mType == RingtoneManager.TYPE_ALARM) {
+            text.setText(R.string.add_alarm_text);
+        } else if (mType == RingtoneManager.TYPE_NOTIFICATION) {
+            text.setText(R.string.add_notification_text);
+        } else {
+            text.setText(R.string.add_ringtone_text);
+        }
+        listView.addFooterView(view);
     }
 
     private void initRingtoneManager() {