merge from donutdonut-plus-aosp

10 files changed, 14 insertions, 24 deletions

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2b8ef09..c925b14 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Synkroniser feeds"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Datasynkronisering"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Grænsen for sletning er overskredet"</string>
     <string name="background_data" msgid="1103557117473896066">"Baggrundsdata"</string>
@@ -31,7 +30,7 @@
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="5806053858668452000">"Gmail"</string>
     <string name="sync_calendar" msgid="1796292773734071897">"Kalender"</string>
-    <string name="sync_contacts" msgid="2035690905925565660">"Kontakter"</string>
+    <string name="sync_contacts" msgid="2035690905925565660">"Kontakt."</string>
     <string name="sync_too_many_deletes_desc" msgid="699495654174066067">"Der er <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> slettede elementer for <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, konto <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Hvad ønsker du at gøre?"</string>
     <string name="sync_really_delete" msgid="5456355204562588976">"Slet elementerne."</string>
     <string name="sync_undo_deletes" msgid="8695514459839593307">"Fortryd sletningerne."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2482062..c5a1795 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Συγχρονισμός ροών δεδομένων"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Συγχρονισμός δεδομένων"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Έγινε υπέρβαση του ορίου διαγραφής."</string>
     <string name="background_data" msgid="1103557117473896066">"Δεδομένα φόντου"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e43c9fa..6300c8d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Canales de sincronización"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Sincronización de datos"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Eliminar el límite excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Datos de fondo"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 62bcbb7..d598ecc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"피드 동기화"</string>
     <string name="sync_settings" msgid="4549768061467147584">"데이터 동기화"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"삭제 한도를 초과했습니다."</string>
     <string name="background_data" msgid="1103557117473896066">"배경 데이터"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e609de2..e670248 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Sincronizar feeds"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Sincronização de dados"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Limite de eliminações excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Dados em segundo plano"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4335e28..af02a4a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,15 +15,14 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Sincronizar feeds"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Sincronização de dados"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Limite de exclusão excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Dados de segundo plano"</string>
     <string name="background_data_summary" msgid="4689952168187153486">"Ativar o uso de dados de segundo plano"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Atenção"</string>
     <string name="background_data_dialog_message" msgid="2817489591533703840">"A desativação dos dados de segundo plano economiza a bateria e diminui o uso dos dados. Alguns aplicativos ainda podem usar a conexão de dados de segundo plano."</string>
-    <string name="sync_automatically" msgid="4694735102757960100">"Sincronização automática"</string>
+    <string name="sync_automatically" msgid="4694735102757960100">"Sinc. automática"</string>
     <string name="sync_automatically_summary" msgid="6210073947698673774">"Sincronizar dados automaticamente"</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"Sincronizar agora"</string>
     <string name="sync_menu_sync_cancel" msgid="1005480041232010062">"Cancelar a sincronização"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 01f3f14..0af3326 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,12 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Фиды синхронизации"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Синхронизация данных"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Превышен предел удаления"</string>
     <string name="background_data" msgid="1103557117473896066">"Использовать фоновые данные"</string>
-    <string name="background_data_summary" msgid="4689952168187153486">"Разрешить использовать фоновую передачу данных"</string>
+    <string name="background_data_summary" msgid="4689952168187153486">"Разрешить фоновую передачу данных"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Внимание"</string>
     <string name="background_data_dialog_message" msgid="2817489591533703840">"Отключение фоновых данных экономит энергию батареи и уменьшает использование данных. Некоторые приложения могут, тем не менее, использовать фоновую передачу данных."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Автосинхронизация"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f7e1637..4f20418 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Synkroniseringsflöden"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Datasynkronisering"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Gränsen för borttagning har överskridits"</string>
     <string name="background_data" msgid="1103557117473896066">"Bakgrundsdata"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bc32866..ea4d4c9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"Senkronizasyon Yayınları"</string>
     <string name="sync_settings" msgid="4549768061467147584">"Veri senkronizasyonu"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Silme sınırı aşıldı"</string>
     <string name="background_data" msgid="1103557117473896066">"Arka plan veri"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index caae4ed..c4b4268 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,14 +15,13 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for app_label (2800463760279909883) -->
-    <skip />
+    <string name="app_label" msgid="2800463760279909883">"同步供稿"</string>
     <string name="sync_settings" msgid="4549768061467147584">"数据同步"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"超出删除限制"</string>
     <string name="background_data" msgid="1103557117473896066">"背景数据"</string>
     <string name="background_data_summary" msgid="4689952168187153486">"启用背景数据"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"注意事项"</string>
-    <string name="background_data_dialog_message" msgid="2817489591533703840">"禁用背景数据可节省电量并可降低数据使用量。有些应用程序可能仍会使用背景数据连接。"</string>
+    <string name="background_data_dialog_message" msgid="2817489591533703840">"停用背景数据可节省电量以及降低数据使用量。有些应用程序可能仍会使用背景数据连接。"</string>
     <string name="sync_automatically" msgid="4694735102757960100">"自动同步"</string>
     <string name="sync_automatically_summary" msgid="6210073947698673774">"自动同步数据"</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"立即同步"</string>