Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9efec24c18 -s ours
Change-Id: Ied055f77c43f747a9ef66a9f4f217aaf1aa1ff76
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..7f4b137
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+deckard@android.com
+marcone@google.com
+zhangjerry@google.com
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cdfb908..1523a83 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Mediaberging"</string>
<string name="artist_label" msgid="8105600993099120273">"Kunstenaar"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Verstekluitoon"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Verstekkennisgewingklank"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Verstekkennisgewing-klank"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Verstekwekkerklank"</string>
<string name="root_images" msgid="5861633549189045666">"Prente"</string>
<string name="root_videos" msgid="8792703517064649453">"Video\'s"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3685ab5..656c4d2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,8 +21,8 @@
<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="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>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0a11304..b93068a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Memorijski prostor za medije"</string>
<string name="artist_label" msgid="8105600993099120273">"Izvođač"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Podrazumevana melodija zvona"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Podraz. zvuk obaveštenja"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Podrazumevani zvuk obaveštenja"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Podrazumevani zvuk alarma"</string>
<string name="root_images" msgid="5861633549189045666">"Slike"</string>
<string name="root_videos" msgid="8792703517064649453">"Video snimci"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 6661a3c..155e44f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -20,7 +20,7 @@
<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="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>
@@ -38,5 +38,5 @@
<string name="add_ringtone_text" msgid="8077717303037760418">"রিংটোন যোগ করুন"</string>
<string name="delete_ringtone_text" msgid="2963662097583300181">"মুছুন"</string>
<string name="unable_to_add_ringtone" msgid="6256097521165711269">"কাস্টম রিংটোন যোগ করা গেল না"</string>
- <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"কাস্টম রিংটোন মোছা গেল না"</string>
+ <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"কাস্টম রিংয়ের শব্দ মোছা গেল না"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
deleted file mode 100644
index f6104c8..0000000
--- a/res/values-en-rCA/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">"Media"</string>
- <string name="storage_description" msgid="4081716890357580107">"Local storage"</string>
- <string name="app_label" msgid="9035307001052716210">"Media Storage"</string>
- <string name="artist_label" msgid="8105600993099120273">"Artist"</string>
- <string name="ringtone_default" msgid="1744846699922263043">"Default ringtone"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Default notification sound"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Default alarm sound"</string>
- <string name="root_images" msgid="5861633549189045666">"Images"</string>
- <string name="root_videos" msgid="8792703517064649453">"Videos"</string>
- <string name="root_audio" msgid="3505830755201326018">"Audio"</string>
- <string name="sound_name_awaken" msgid="5266892392848526147">"Awaken"</string>
- <string name="sound_name_bounce" msgid="8771447635446665231">"Bounce"</string>
- <string name="sound_name_drip" msgid="1744684469020662152">"Drip"</string>
- <string name="sound_name_gallop" msgid="2664454314532060876">"Gallop"</string>
- <string name="sound_name_nudge" msgid="5445751598250698244">"Nudge"</string>
- <string name="sound_name_orbit" msgid="4623457897813255481">"Orbit"</string>
- <string name="sound_name_rise" msgid="2200258555031675806">"Rise"</string>
- <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="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>
-</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
deleted file mode 100644
index 943e3aa..0000000
--- a/res/values-en-rXC/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">"Media"</string>
- <string name="storage_description" msgid="4081716890357580107">"Local storage"</string>
- <string name="app_label" msgid="9035307001052716210">"Media Storage"</string>
- <string name="artist_label" msgid="8105600993099120273">"Artist"</string>
- <string name="ringtone_default" msgid="1744846699922263043">"Default ringtone"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Default notification sound"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Default alarm sound"</string>
- <string name="root_images" msgid="5861633549189045666">"Images"</string>
- <string name="root_videos" msgid="8792703517064649453">"Videos"</string>
- <string name="root_audio" msgid="3505830755201326018">"Audio"</string>
- <string name="sound_name_awaken" msgid="5266892392848526147">"Awaken"</string>
- <string name="sound_name_bounce" msgid="8771447635446665231">"Bounce"</string>
- <string name="sound_name_drip" msgid="1744684469020662152">"Drip"</string>
- <string name="sound_name_gallop" msgid="2664454314532060876">"Gallop"</string>
- <string name="sound_name_nudge" msgid="5445751598250698244">"Nudge"</string>
- <string name="sound_name_orbit" msgid="4623457897813255481">"Orbit"</string>
- <string name="sound_name_rise" msgid="2200258555031675806">"Rise"</string>
- <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="delete_ringtone_text" msgid="2963662097583300181">"Delete"</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>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d84e619..178a059 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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>
@@ -37,6 +37,6 @@
<string name="sound_name_wag" msgid="2730733083078126563">"वैग"</string>
<string name="add_ringtone_text" msgid="8077717303037760418">"रिंगटोन जोड़ेंं"</string>
<string name="delete_ringtone_text" msgid="2963662097583300181">"हटाएं"</string>
- <string name="unable_to_add_ringtone" msgid="6256097521165711269">"आपके मुताबिक रिंगटोन नहीं जोड़ी जा सकी"</string>
- <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"आपके मुताबिक रिंगटोन नहीं हटाई जा सकी"</string>
+ <string name="unable_to_add_ringtone" msgid="6256097521165711269">"कस्टम रिंगटोन जोड़ने में असमर्थ"</string>
+ <string name="unable_to_delete_ringtone" msgid="2258180073859253495">"कस्टम रिंगटोन हटाने में असमर्थ"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index bbdbde5..cce1c96 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -18,7 +18,7 @@
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="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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index bf6888b..1ec6ff9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -23,7 +23,7 @@
<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_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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3372c65..a011e60 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -22,7 +22,7 @@
<string name="artist_label" msgid="8105600993099120273">"Interpret"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Predvolený tón zvonenia"</string>
<string name="notification_sound_default" msgid="6541609166469990135">"Predvolený zvuk upozornenia"</string>
- <string name="alarm_sound_default" msgid="5488847775252870314">"Predvolený zvuk budíkov"</string>
+ <string name="alarm_sound_default" msgid="5488847775252870314">"Predvolený zvuk budíka"</string>
<string name="root_images" msgid="5861633549189045666">"Obrázky"</string>
<string name="root_videos" msgid="8792703517064649453">"Videá"</string>
<string name="root_audio" msgid="3505830755201326018">"Zvuk"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2fe284e..d6ac126 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Меморијски простор за медије"</string>
<string name="artist_label" msgid="8105600993099120273">"Извођач"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Подразумевана мелодија звона"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Подраз. звук обавештења"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Подразумевани звук обавештења"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Подразумевани звук аларма"</string>
<string name="root_images" msgid="5861633549189045666">"Слике"</string>
<string name="root_videos" msgid="8792703517064649453">"Видео снимци"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7f2e063..dc7e3fd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -35,7 +35,7 @@
<string name="sound_name_rise" msgid="2200258555031675806">"Rise"</string>
<string name="sound_name_sway" msgid="348448316663085643">"Sway"</string>
<string name="sound_name_wag" msgid="2730733083078126563">"Wag"</string>
- <string name="add_ringtone_text" msgid="8077717303037760418">"Додати сигнал"</string>
+ <string name="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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 14d7221..830b77e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"Multimedia xotirasi"</string>
<string name="artist_label" msgid="8105600993099120273">"Ijrochi"</string>
<string name="ringtone_default" msgid="1744846699922263043">"Standart rington"</string>
- <string name="notification_sound_default" msgid="6541609166469990135">"Standart bildirishnoma tovushi"</string>
+ <string name="notification_sound_default" msgid="6541609166469990135">"Standart bildirishnoma signali"</string>
<string name="alarm_sound_default" msgid="5488847775252870314">"Standart signal"</string>
<string name="root_images" msgid="5861633549189045666">"Rasmlar"</string>
<string name="root_videos" msgid="8792703517064649453">"Videolar"</string>
