Merge "Show remove folder option in user created labels." into jb-ub-mail
diff --git a/res/layout/compose.xml b/res/layout/compose.xml
index 132063d..a45e227 100644
--- a/res/layout/compose.xml
+++ b/res/layout/compose.xml
@@ -15,70 +15,83 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:orientation="vertical"
- android:background="@android:color/white">
+ android:layout_width="match_parent">
+ <RelativeLayout
+ android:id="@+id/wait"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:layout_gravity="center"/>
+ <LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:background="@android:color/white"
+ android:visibility="gone"
+ android:id="@+id/compose">
- <ScrollView
- android:id="@+id/compose_scrollview"
- android:fillViewport="true"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_width="match_parent">
+ <ScrollView
+ android:id="@+id/compose_scrollview"
+ android:fillViewport="true"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:layout_width="match_parent">
- <LinearLayout android:id="@+id/content"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:animateLayoutChanges="true"
- android:paddingLeft="16dip"
- android:paddingRight="16dip">
-
- <include layout="@layout/compose_from"/>
-
- <LinearLayout android:layout_height="wrap_content"
+ <LinearLayout android:id="@+id/content"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:orientation="horizontal">
+ android:layout_height="match_parent"
+ android:animateLayoutChanges="true"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip">
- <include layout="@layout/compose_recipients"
+ <include layout="@layout/compose_from"/>
+
+ <LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:orientation="horizontal">
+
+ <include layout="@layout/compose_recipients"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+
+ <!-- Attachments -->
+ <com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
android:layout_height="wrap_content"
- android:layout_weight="1"/>
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:animateLayoutChanges="true"
+ android:paddingTop="8dip"
+ android:paddingRight="5dip"
+ android:paddingBottom="0dip"
+ android:paddingLeft="5dip"
+ android:visibility="gone">
+ <include layout="@layout/compose_attachments" />
+ </com.android.mail.compose.AttachmentsView>
+ <!-- Body -->
+ <include layout="@layout/compose_body"/>
+
+ <!-- Quoted text -->
+ <com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:visibility="gone" />
+
+ <View android:id="@+id/composearea_tap_trap_bottom"
+ android:clickable="true"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/compose_background_color"/>
</LinearLayout>
- <!-- Attachments -->
- <com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:orientation="vertical"
- android:animateLayoutChanges="true"
- android:paddingTop="8dip"
- android:paddingRight="5dip"
- android:paddingBottom="0dip"
- android:paddingLeft="5dip"
- android:visibility="gone">
- <include layout="@layout/compose_attachments" />
- </com.android.mail.compose.AttachmentsView>
- <!-- Body -->
- <include layout="@layout/compose_body"/>
+ </ScrollView>
- <!-- Quoted text -->
- <com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:visibility="gone" />
-
- <View android:id="@+id/composearea_tap_trap_bottom"
- android:clickable="true"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/compose_background_color"/>
-
- </LinearLayout>
-
- </ScrollView>
-
-</LinearLayout>
+ </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/wait_for_compose.xml b/res/layout/wait_for_compose.xml
new file mode 100644
index 0000000..95e06c5
--- /dev/null
+++ b/res/layout/wait_for_compose.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Google Inc.
+ Licensed to 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.
+-->
+
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:id="@+id/wait_for_sync_wrapper">
+
+ <ProgressBar
+ android:indeterminate="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/progress_spinner"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wait_for_sync_title"
+ android:id="@+id/wait_for_sync_title"
+ android:layout_toRightOf="@id/progress_spinner"
+ android:layout_marginLeft="4dip"
+ android:layout_marginTop="8dip"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ </RelativeLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 031a682..35fc7d7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Demp"</string>
<string name="add_star" msgid="2866003744391266498">"Voeg ster by"</string>
<string name="remove_star" msgid="4372327933122106128">"Verwyder ster"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Verwyder uit <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Argiveer"</string>
<string name="report_spam" msgid="6467567747975393907">"Gee strooipos aan"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Rapporteer as nie strooipos nie"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Uitgevee"</string>
<string name="archived" msgid="7533995360704366325">"Geargiveer"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Verwyder uit <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> gemerk as belangrik."</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> gemerk as belangrik."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
<string name="close" msgid="419945428844076406">"Maak toe"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Geen vouers is vir hierdie rekening opgestel nie."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Sukses"</item>
+ <item msgid="7109065688039971961">"Geen verbinding nie."</item>
+ <item msgid="8437496123716232060">"Kon nie aanmeld nie."</item>
+ <item msgid="1651266301325684887">"Sekuriteitsfout"</item>
+ <item msgid="1461520171154288533">"Kon nie sinchroniseer nie."</item>
+ <item msgid="8749857841162829469">"Fout"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Raak om op te stel"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Om gesprekke te sien, sinkroniseer hierdie vouer."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkroniseer vouer"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Dikwels gebruik"</item>
<item msgid="3584541772344786752">"Alle vouers"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Meld aan"</string>
+ <string name="info" msgid="6009817562073541204">"Inligting"</string>
+ <string name="report" msgid="5417082746232614958">"Gee aan"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Kon nie sinchroniseer nie."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Jou toestel het nie genoeg stoorplek om te sinchroniseer nie."</string>
+ <string name="storage" msgid="3262760336059073446">"Berging"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bf09594..5fbf1bf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Спиране"</string>
<string name="add_star" msgid="2866003744391266498">"Добавяне на звезда"</string>
<string name="remove_star" msgid="4372327933122106128">"Премахване на звездата"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Премахване от „<xliff:g id="FOLDERNAME">%1$s</xliff:g>“"</string>
<string name="archive" msgid="847250094775910499">"Архив"</string>
<string name="report_spam" msgid="6467567747975393907">"Подаване на сигнал за спам"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Подаване на сигнал „Не е спам“"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Изтрита"</string>
<string name="archived" msgid="7533995360704366325">"Архивирана"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Премахнатa от „<xliff:g id="FOLDERNAME">%1$s</xliff:g>“"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"Означихте <b><xliff:g id="COUNT">%1$d</xliff:g></b> като важна."</item>
<item quantity="other" msgid="709648106181749594">"Означихте <b><xliff:g id="COUNT">%1$d</xliff:g></b> като важни."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Отказ"</string>
<string name="close" msgid="419945428844076406">"Затваряне"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"В този профил не са зададени папки."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Успех"</item>
+ <item msgid="7109065688039971961">"Няма връзка."</item>
+ <item msgid="8437496123716232060">"Не можахте да влезете."</item>
+ <item msgid="1651266301325684887">"Грешка в сигурността."</item>
+ <item msgid="1461520171154288533">"Не можа да се синхронизира."</item>
+ <item msgid="8749857841162829469">"Грешка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Докоснете, за да настроите"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"За да видите кореспонденциите, синхронизирайте тази папка."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизиране на папката"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Често ползвано"</item>
<item msgid="3584541772344786752">"Всички папки"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Вход"</string>
+ <string name="info" msgid="6009817562073541204">"Информация"</string>
+ <string name="report" msgid="5417082746232614958">"Изпращане"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Не можа да се синхронизира."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Устройството ви няма достатъчно място в хранилището, за да се извърши синхронизиране."</string>
+ <string name="storage" msgid="3262760336059073446">"Хранилище"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index eedfa7b..578d03d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -55,7 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Ignorovat"</string>
<string name="add_star" msgid="2866003744391266498">"Přidat hvězdičku"</string>
<string name="remove_star" msgid="4372327933122106128">"Odebrat hvězdičku"</string>
- <string name="remove_folder" msgid="4906542720439865413">"Odebrat ze složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+ <string name="remove_folder" msgid="4906542720439865413">"Odstranit ze složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Archivovat"</string>
<string name="report_spam" msgid="6467567747975393907">"Nahlásit spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Nahlásit, že se nejedná o spam"</string>
@@ -218,7 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Smazáno"</string>
<string name="archived" msgid="7533995360704366325">"Archivováno"</string>
- <string name="folder_removed" msgid="1047474677580149436">"Odebráno ze složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+ <string name="folder_removed" msgid="1047474677580149436">"Odestraněno ze složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"Konverzace označené jako důležité: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
<item quantity="other" msgid="709648106181749594">"Konverzace označené jako důležité: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Zrušit"</string>
<string name="close" msgid="419945428844076406">"Zavřít"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pro tento účet nebyly nastaveny žádné složky."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Podařilo se"</item>
+ <item msgid="7109065688039971961">"Žádné připojení."</item>
+ <item msgid="8437496123716232060">"Přihlášení se nezdařilo."</item>
+ <item msgid="1651266301325684887">"Chyba zabezpečení."</item>
+ <item msgid="1461520171154288533">"Chyba synchronizace."</item>
+ <item msgid="8749857841162829469">"Chyba"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Nastavte dotykem"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Chcete-li zobrazit konverzace, synchronizujte tuto složku."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovat složku"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Často používané"</item>
<item msgid="3584541772344786752">"Všechny složky"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Přihlásit se"</string>
+ <string name="info" msgid="6009817562073541204">"Informace"</string>
+ <string name="report" msgid="5417082746232614958">"Přehled"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Chyba synchronizace."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Ve vašem zařízení není pro synchronizaci dostatek místa."</string>
+ <string name="storage" msgid="3262760336059073446">"Úložiště"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a925b49..b2eb48d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Silenciar"</string>
<string name="add_star" msgid="2866003744391266498">"Destacar"</string>
<string name="remove_star" msgid="4372327933122106128">"Eliminar estrella"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Eliminar de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Archivar"</string>
<string name="report_spam" msgid="6467567747975393907">"Notificar spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Informar que no es spam"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Eliminada"</string>
<string name="archived" msgid="7533995360704366325">"Archivada"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Eliminada de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> como importantes."</item>
<item quantity="other" msgid="709648106181749594">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> como importantes."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Cerrar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"No se definieron carpetas para esta cuenta."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"La acción se realizó correctamente."</item>
+ <item msgid="7109065688039971961">"Sin conexión"</item>
+ <item msgid="8437496123716232060">"No se pudo acceder."</item>
+ <item msgid="1651266301325684887">"Error de seguridad"</item>
+ <item msgid="1461520171154288533">"No se pudo establecer la sincronización."</item>
+ <item msgid="8749857841162829469">"Error"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Toca para configurarlo"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Uso frecuente"</item>
<item msgid="3584541772344786752">"Carpetas"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Acceder"</string>
+ <string name="info" msgid="6009817562073541204">"Información"</string>
+ <string name="report" msgid="5417082746232614958">"Informar"</string>
+ <string name="sync_error" msgid="7368819509040597851">"No se pudo establecer la sincronización."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Tu dispositivo no cuenta con suficiente espacio de almacenamiento para establecer la sincronización."</string>
+ <string name="storage" msgid="3262760336059073446">"Almacenamiento"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f658342..0eef068 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Cerrar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"No se ha establecido ninguna carpeta para esta cuenta."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Sin errores"</item>
+ <item msgid="7109065688039971961">"Sin conexión"</item>
+ <item msgid="8437496123716232060">"Error al iniciar sesión"</item>
+ <item msgid="1651266301325684887">"Error de seguridad"</item>
+ <item msgid="1461520171154288533">"Error al sincronizar"</item>
+ <item msgid="8749857841162829469">"Error"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Tocar para configurar"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Uso frecuente"</item>
<item msgid="3584541772344786752">"Todas las carpetas"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Iniciar sesión"</string>
+ <string name="info" msgid="6009817562073541204">"Información"</string>
+ <string name="report" msgid="5417082746232614958">"Informar"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Error al sincronizar"</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"No hay suficiente espacio en el dispositivo para sincronizar tu correo"</string>
+ <string name="storage" msgid="3262760336059073446">"Almacenamiento"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 605dced..e65fd93 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"نادیده گرفتن"</string>
<string name="add_star" msgid="2866003744391266498">"افزودن ستاره"</string>
<string name="remove_star" msgid="4372327933122106128">"حذف ستاره"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"حذف از <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"بایگانی"</string>
<string name="report_spam" msgid="6467567747975393907">"گزارش هرزنامه"</string>
<string name="mark_not_spam" msgid="694891665407228160">"گزارش بعنوان غیرهرزنامه"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"حذف شد"</string>
<string name="archived" msgid="7533995360704366325">"بایگانی شد"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"از <xliff:g id="FOLDERNAME">%1$s</xliff:g> حذف شد"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> مورد به عنوان مهم علامتگذاری شد."</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> مورد به عنوان مهم علامتگذاری شد."</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index db562c3..6cb2dd4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Peruuta"</string>
<string name="close" msgid="419945428844076406">"Sulje"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Tälle tilille ei ole määritetty kansioita."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Onnistui"</item>
+ <item msgid="7109065688039971961">"Ei yhteyttä."</item>
+ <item msgid="8437496123716232060">"Kirjautuminen ei onnistu."</item>
+ <item msgid="1651266301325684887">"Suojausvirhe."</item>
+ <item msgid="1461520171154288533">"Synkronointi epäonnistui."</item>
+ <item msgid="8749857841162829469">"Virhe"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Kosketa ja määritä asetukset"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkronoi tämä kansio, jos haluat tarkastella keskusteluja."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkronoi kansio"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Usein käytetty"</item>
<item msgid="3584541772344786752">"Kaikki kansiot"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Kirjaudu sisään"</string>
+ <string name="info" msgid="6009817562073541204">"Tietoja"</string>
+ <string name="report" msgid="5417082746232614958">"Lähetä palautetta"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Synkronointi epäonnistui."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Laitteessa ei ole tarpeeksi tallennustilaa synkronointiin."</string>
+ <string name="storage" msgid="3262760336059073446">"Tallentaminen"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 43f708b..98c2605 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"रद्द करें"</string>
<string name="close" msgid="419945428844076406">"बंद करें"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"इस खाते के लिए कोई फ़ोल्डर सेट नहीं किया गया है."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"सफल"</item>
+ <item msgid="7109065688039971961">"कोई कनेक्शन नहीं."</item>
+ <item msgid="8437496123716232060">"साइन इन नहीं किया जा सका."</item>
+ <item msgid="1651266301325684887">"सुरक्षा त्रुटि."</item>
+ <item msgid="1461520171154288533">"समन्वयित नहीं किया जा सका."</item>
+ <item msgid="8749857841162829469">"त्रुटि"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"सेट करने के लिए स्पर्श करें"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"बातचीत देखने हेतु, फ़ोल्डर समन्वयित करें."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"फ़ोल्डर समन्वयित करें"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"अक्सर प्रयुक्त"</item>
<item msgid="3584541772344786752">"सभी फ़ोल्डर"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"साइन-इन करें"</string>
+ <string name="info" msgid="6009817562073541204">"जानकारी"</string>
+ <string name="report" msgid="5417082746232614958">"रिपोर्ट करें"</string>
+ <string name="sync_error" msgid="7368819509040597851">"समन्वयित नहीं किया जा सका."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"आपके उपकरण में समन्वयित करने के लिए पर्याप्त संग्रहण स्थान नहीं है."</string>
+ <string name="storage" msgid="3262760336059073446">"संग्रहण"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6149d9e..0e4a511 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Odustani"</string>
<string name="close" msgid="419945428844076406">"Zatvori"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Za ovaj račun nisu postavljene mape."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Uspjeh"</item>
+ <item msgid="7109065688039971961">"Nema veze."</item>
+ <item msgid="8437496123716232060">"Prijava nije bila moguća."</item>
+ <item msgid="1651266301325684887">"Sigurnosna pogreška."</item>
+ <item msgid="1461520171154288533">"Sinkronizacija nije bila moguća."</item>
+ <item msgid="8749857841162829469">"Pogreška"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Dodirnite za postavljanje"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Za prikaz razgovora sinkronizirajte ovu mapu."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronizacija mape"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Često upotreb."</item>
<item msgid="3584541772344786752">"Sve mape"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Prijava"</string>
+ <string name="info" msgid="6009817562073541204">"Informacije"</string>
+ <string name="report" msgid="5417082746232614958">"Prijavi"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Sinkronizacija nije bila moguća."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Uređaj nema dovoljno prostora za pohranu za sinkronizaciju."</string>
+ <string name="storage" msgid="3262760336059073446">"Pohrana"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bafa125..c3aabc7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Batal"</string>
<string name="close" msgid="419945428844076406">"Tutup"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada folder yang disetel untuk akun ini."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Berhasil"</item>
+ <item msgid="7109065688039971961">"Tidak ada sambungan."</item>
+ <item msgid="8437496123716232060">"Tidak dapat masuk."</item>
+ <item msgid="1651266301325684887">"Kesalahan keamanan."</item>
+ <item msgid="1461520171154288533">"Tidak dapat menyinkronkan."</item>
+ <item msgid="8749857841162829469">"Kesalahan"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyiapkan"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan folder ini."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Folder"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Sering Digunakan"</item>
<item msgid="3584541772344786752">"Semua Folder"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Masuk"</string>
+ <string name="info" msgid="6009817562073541204">"Info"</string>
+ <string name="report" msgid="5417082746232614958">"Laporan"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Tidak dapat menyinkronkan."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Ruang penyimpanan di perangkat Anda tidak cukup untuk sinkronisasi."</string>
+ <string name="storage" msgid="3262760336059073446">"Penyimpanan"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 74ffbe7..ca088ab 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"ミュート"</string>
<string name="add_star" msgid="2866003744391266498">"スターを付ける"</string>
<string name="remove_star" msgid="4372327933122106128">"スターを外す"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>から削除"</string>
<string name="archive" msgid="847250094775910499">"アーカイブ"</string>
<string name="report_spam" msgid="6467567747975393907">"迷惑メールを報告"</string>
<string name="mark_not_spam" msgid="694891665407228160">"迷惑メールでないことを報告"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"削除済み"</string>
<string name="archived" msgid="7533995360704366325">"アーカイブ済み"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>から削除しました"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b>件に重要マークを付けました。"</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b>件に重要マークを付けました。"</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"キャンセル"</string>
<string name="close" msgid="419945428844076406">"閉じる"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"このアカウントに設定されているフォルダはありません。"</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"完了"</item>
+ <item msgid="7109065688039971961">"接続できません。"</item>
+ <item msgid="8437496123716232060">"ログインできませんでした。"</item>
+ <item msgid="1651266301325684887">"セキュリティエラー"</item>
+ <item msgid="1461520171154288533">"同期できませんでした。"</item>
+ <item msgid="8749857841162829469">"エラー"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"タップしてセットアップ"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"スレッドを表示するには、このフォルダを同期します。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"フォルダを同期"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"よく使うフォルダ"</item>
<item msgid="3584541772344786752">"すべてのフォルダ"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"ログイン"</string>
+ <string name="info" msgid="6009817562073541204">"情報"</string>
+ <string name="report" msgid="5417082746232614958">"報告"</string>
+ <string name="sync_error" msgid="7368819509040597851">"同期できませんでした。"</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"お使いの端末には十分な空き容量がないため同期できません。"</string>
+ <string name="storage" msgid="3262760336059073446">"容量"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2a18079..e823a90 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"숨기기"</string>
<string name="add_star" msgid="2866003744391266498">"별표 표시"</string>
<string name="remove_star" msgid="4372327933122106128">"별표 제거"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>에서 삭제"</string>
<string name="archive" msgid="847250094775910499">"보관처리"</string>
<string name="report_spam" msgid="6467567747975393907">"스팸 신고"</string>
<string name="mark_not_spam" msgid="694891665407228160">"스팸 해제"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"삭제됨"</string>
<string name="archived" msgid="7533995360704366325">"보관됨"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>에서 삭제됨"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b>개를 중요 메일로 표시"</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b>개를 중요 메일로 표시"</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"취소"</string>
<string name="close" msgid="419945428844076406">"닫기"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"이 계정에 대한 폴더를 설정하지 않았습니다."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"완료"</item>
+ <item msgid="7109065688039971961">"연결되지 않았습니다."</item>
+ <item msgid="8437496123716232060">"로그인하지 못했습니다."</item>
+ <item msgid="1651266301325684887">"보안 오류입니다."</item>
+ <item msgid="1461520171154288533">"동기화하지 못했습니다."</item>
+ <item msgid="8749857841162829469">"오류"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"설정하려면 터치하세요."</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 폴더를 동기화하세요."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"자주 사용"</item>
<item msgid="3584541772344786752">"모든 폴더"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"로그인"</string>
+ <string name="info" msgid="6009817562073541204">"정보"</string>
+ <string name="report" msgid="5417082746232614958">"신고"</string>
+ <string name="sync_error" msgid="7368819509040597851">"동기화하지 못했습니다."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"기기에 동기화를 위한 충분한 저장 공간이 없습니다."</string>
+ <string name="storage" msgid="3262760336059073446">"저장소"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2b56bc6..7fd2521 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Desativar som"</string>
<string name="add_star" msgid="2866003744391266498">"Adicionar estrela"</string>
<string name="remove_star" msgid="4372327933122106128">"Remover estrela"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Remover de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Arquivar"</string>
<string name="report_spam" msgid="6467567747975393907">"Denunciar spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Não é spam"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Excluída"</string>
<string name="archived" msgid="7533995360704366325">"Arquivada"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Removido de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> marcada como importante."</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> marcadas como importantes."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Fechar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Nenhuma pasta foi definida para esta conta."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Êxito"</item>
+ <item msgid="7109065688039971961">"Sem conexão."</item>
+ <item msgid="8437496123716232060">"Falha ao fazer login."</item>
+ <item msgid="1651266301325684887">"Erro de segurança."</item>
+ <item msgid="1461520171154288533">"Não foi possível sincronizar."</item>
+ <item msgid="8749857841162829469">"Erro"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversações, sincronize esta pasta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar pasta"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"De uso frequente"</item>
<item msgid="3584541772344786752">"Todas as pastas"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Fazer login"</string>
+ <string name="info" msgid="6009817562073541204">"Informações"</string>
+ <string name="report" msgid="5417082746232614958">"Informar"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Não foi possível sincronizar."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"O dispositivo não tem espaço de armazenamento suficiente para sincronizar."</string>
+ <string name="storage" msgid="3262760336059073446">"Armazenamento"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>/<xliff:g id="PARENT_0">%2$s</xliff:g>/"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>/.../<xliff:g id="PARENT_0">%2$s</xliff:g>/"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>/"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c75beb6..602e898 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Suprimaţi"</string>
<string name="add_star" msgid="2866003744391266498">"Marcaţi cu stea"</string>
<string name="remove_star" msgid="4372327933122106128">"Eliminaţi steaua"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Eliminaţi din <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Arhivaţi"</string>
<string name="report_spam" msgid="6467567747975393907">"Raportaţi ca spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Nu este spam"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Ştearsă"</string>
<string name="archived" msgid="7533995360704366325">"Arhivată"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Eliminat din <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> a fost marcată ca importantă."</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> au fost marcate ca importante."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Anulaţi"</string>
<string name="close" msgid="419945428844076406">"Închideţi"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pentru acest cont nu a fost setat niciun dosar."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Finalizat"</item>
+ <item msgid="7109065688039971961">"Nicio conexiune."</item>
+ <item msgid="8437496123716232060">"Conectarea a eşuat."</item>
+ <item msgid="1651266301325684887">"Eroare de securitate."</item>
+ <item msgid="1461520171154288533">"Sincronizarea a eşuat."</item>
+ <item msgid="8749857841162829469">"Eroare"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Atingeţi pentru a configura"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Pentru a afişa conversaţiile, sincronizaţi acest dosar."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizaţi dosarul"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Utilizate des"</item>
<item msgid="3584541772344786752">"Toate dosarele"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Conectaţi-vă"</string>
+ <string name="info" msgid="6009817562073541204">"Informaţii"</string>
+ <string name="report" msgid="5417082746232614958">"Raportaţi"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Sincronizarea a eşuat."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Dispozitivul dvs. nu are suficient spaţiu de stocare pentru a se efectua sincronizarea."</string>
+ <string name="storage" msgid="3262760336059073446">"Stocare"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 06d78e5..909e1dc 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Отмена"</string>
<string name="close" msgid="419945428844076406">"Закрыть"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"В этом аккаунте нет папок."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Без ошибок"</item>
+ <item msgid="7109065688039971961">"Нет соединения"</item>
+ <item msgid="8437496123716232060">"Не удалось войти"</item>
+ <item msgid="1651266301325684887">"Ошибка системы безопасности"</item>
+ <item msgid="1461520171154288533">"Ошибка синхронизации"</item>
+ <item msgid="8749857841162829469">"Ошибка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Нажмите для настройки"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Для просмотра цепочек писем синхронизируйте эту папку."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизировать папку"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Часто"</item>
<item msgid="3584541772344786752">"Все папки"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Вход"</string>
+ <string name="info" msgid="6009817562073541204">"Детали"</string>
+ <string name="report" msgid="5417082746232614958">"Отчет"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Ошибка синхронизации"</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Недостаточно места для синхронизации"</string>
+ <string name="storage" msgid="3262760336059073446">"Память"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7686db2..275862c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"Ignorovať"</string>
<string name="add_star" msgid="2866003744391266498">"Pridať hviezdičku"</string>
<string name="remove_star" msgid="4372327933122106128">"Odstrániť hviezdičku"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"Odstrániť z priečinka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="archive" msgid="847250094775910499">"Archivovať"</string>
<string name="report_spam" msgid="6467567747975393907">"Nahlásiť spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Nahlásiť, že to nie je spam"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Odstránené"</string>
<string name="archived" msgid="7533995360704366325">"Archivované"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"Odstránené z priečinka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"Konverzácie boli označené ako dôležité (počet: <b><xliff:g id="COUNT">%1$d</xliff:g></b>)."</item>
<item quantity="other" msgid="709648106181749594">"Konverzácie boli označené ako dôležité (počet: <b><xliff:g id="COUNT">%1$d</xliff:g></b>)."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Zrušiť"</string>
<string name="close" msgid="419945428844076406">"Zavrieť"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pre tento účet neboli nastavené žiadne priečinky."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Úspech"</item>
+ <item msgid="7109065688039971961">"Žiadne pripojenie."</item>
+ <item msgid="8437496123716232060">"Nepodarilo sa prihlásiť."</item>
+ <item msgid="1651266301325684887">"Chyba zabezpečenia."</item>
+ <item msgid="1461520171154288533">"Nepodarilo sa synchronizovať."</item>
+ <item msgid="8749857841162829469">"Chyba"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Klepnutím nastavte"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Zobr. konverz., synchr. priečinok."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovať priečinok"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Často používané"</item>
<item msgid="3584541772344786752">"Všetky priečinky"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Prihlásiť sa"</string>
+ <string name="info" msgid="6009817562073541204">"Informácie"</string>
+ <string name="report" msgid="5417082746232614958">"Prehľad"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Nepodarilo sa synchronizovať."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Vaše zariadenie nemá dostatočný ukladací priestor potrebný na synchronizáciu."</string>
+ <string name="storage" msgid="3262760336059073446">"Ukladací priestor"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e527384..65ae4c4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -295,11 +295,14 @@
<string name="cancel" msgid="8762981157252199115">"Prekliči"</string>
<string name="close" msgid="419945428844076406">"Zapri"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Za ta račun ni nastavljenih map."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Uspešno"</item>
+ <item msgid="7109065688039971961">"Ni povezave."</item>
+ <item msgid="8437496123716232060">"Prijava ni mogoča."</item>
+ <item msgid="1651266301325684887">"Varnostna napaka."</item>
+ <item msgid="1461520171154288533">"Sinhroniziranje ni mogoče."</item>
+ <item msgid="8749857841162829469">"Napaka"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Dotaknite se za nastavitev"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Če si želite ogledati pogovore, sinhronizirajte to mapo."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhroniziranje mape"</string>
@@ -341,18 +344,12 @@
<item msgid="6593672292311851204">"Pogosto uporabljeno"</item>
<item msgid="3584541772344786752">"Vse mape"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Prijava"</string>
+ <string name="info" msgid="6009817562073541204">"Informacije"</string>
+ <string name="report" msgid="5417082746232614958">"Obvestite nas"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Sinhroniziranje ni mogoče."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Naprava nima dovolj prostora za sinhronizacijo."</string>
+ <string name="storage" msgid="3262760336059073446">"Shranjevanje"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9e8137c..e579f73 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -293,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"Откажи"</string>
<string name="close" msgid="419945428844076406">"Затвори"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Нису подешени директоријуми за овај налог."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Успешно"</item>
+ <item msgid="7109065688039971961">"Веза није успостављена."</item>
+ <item msgid="8437496123716232060">"Пријављивање није могуће."</item>
+ <item msgid="1651266301325684887">"Безбедносна грешка."</item>
+ <item msgid="1461520171154288533">"Синхронизација није могућа."</item>
+ <item msgid="8749857841162829469">"Грешка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Додирните да бисте подесили"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Да бисте прегледали преписке, синхронизујте директоријум."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизуј директоријум"</string>
@@ -339,18 +342,12 @@
<item msgid="6593672292311851204">"Често коришћено"</item>
<item msgid="3584541772344786752">"Сви директоријуми"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Пријави ме"</string>
+ <string name="info" msgid="6009817562073541204">"Информације"</string>
+ <string name="report" msgid="5417082746232614958">"Направи извештај"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Синхронизација није могућа."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"На уређају нема довољно складишног простора за синхронизацију."</string>
+ <string name="storage" msgid="3262760336059073446">"Складиштење"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1947f43..33713d2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"İleti Dizisini Yoksay"</string>
<string name="add_star" msgid="2866003744391266498">"Yıldız ekle"</string>
<string name="remove_star" msgid="4372327933122106128">"Yıldızı kaldır"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> adlı klasörden kaldır"</string>
<string name="archive" msgid="847250094775910499">"Arşiv"</string>
<string name="report_spam" msgid="6467567747975393907">"Spam bildir"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Spam olmadığını bildir"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"Silindi"</string>
<string name="archived" msgid="7533995360704366325">"Arşivlendi"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> adlı klasörden kaldırıldı"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi önemli olarak işaretlendi."</item>
<item quantity="other" msgid="709648106181749594">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi önemli olarak işaretlendi."</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"İptal"</string>
<string name="close" msgid="419945428844076406">"Kapat"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Bu hesap için hiçbir klasör ayarlanmamış."</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Başarılı"</item>
+ <item msgid="7109065688039971961">"Bağlantı yok."</item>
+ <item msgid="8437496123716232060">"Oturum açılamadı."</item>
+ <item msgid="1651266301325684887">"Güvenlik hatası."</item>
+ <item msgid="1461520171154288533">"Senkronize edilemedi."</item>
+ <item msgid="8749857841162829469">"Hata"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Kurulum için dokunun"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"Sık Kullanılanlar"</item>
<item msgid="3584541772344786752">"Tüm Klasörler"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"Oturum aç"</string>
+ <string name="info" msgid="6009817562073541204">"Bilgi"</string>
+ <string name="report" msgid="5417082746232614958">"Bildir"</string>
+ <string name="sync_error" msgid="7368819509040597851">"Senkronize edilemedi."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Cihazınızda senkronizasyon için yeterli depolama alanı yok."</string>
+ <string name="storage" msgid="3262760336059073446">"Depolama"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 80e2733..5bec9b6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -55,8 +55,7 @@
<string name="mute" msgid="1995954983688603977">"忽略"</string>
<string name="add_star" msgid="2866003744391266498">"加注星标"</string>
<string name="remove_star" msgid="4372327933122106128">"删除星标"</string>
- <!-- no translation found for remove_folder (4906542720439865413) -->
- <skip />
+ <string name="remove_folder" msgid="4906542720439865413">"从“<xliff:g id="FOLDERNAME">%1$s</xliff:g>”中删除"</string>
<string name="archive" msgid="847250094775910499">"归档"</string>
<string name="report_spam" msgid="6467567747975393907">"举报垃圾邮件"</string>
<string name="mark_not_spam" msgid="694891665407228160">"这不是垃圾邮件"</string>
@@ -219,8 +218,7 @@
</plurals>
<string name="deleted" msgid="2757349161107268029">"已删除"</string>
<string name="archived" msgid="7533995360704366325">"已归档"</string>
- <!-- no translation found for folder_removed (1047474677580149436) -->
- <skip />
+ <string name="folder_removed" msgid="1047474677580149436">"已从“<xliff:g id="FOLDERNAME">%1$s</xliff:g>”中删除"</string>
<plurals name="conversation_marked_important">
<item quantity="one" msgid="2335171317119674993">"已将 <b><xliff:g id="COUNT">%1$d</xliff:g></b> 个会话标记为重要。"</item>
<item quantity="other" msgid="709648106181749594">"已将 <b><xliff:g id="COUNT">%1$d</xliff:g></b> 个会话标记为重要。"</item>
@@ -295,11 +293,14 @@
<string name="cancel" msgid="8762981157252199115">"取消"</string>
<string name="close" msgid="419945428844076406">"关闭"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
- <!-- no translation found for sync_status:1 (7109065688039971961) -->
- <!-- no translation found for sync_status:2 (8437496123716232060) -->
- <!-- no translation found for sync_status:3 (1651266301325684887) -->
- <!-- no translation found for sync_status:4 (1461520171154288533) -->
- <!-- no translation found for sync_status:5 (8749857841162829469) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"成功"</item>
+ <item msgid="7109065688039971961">"无连接。"</item>
+ <item msgid="8437496123716232060">"无法登录。"</item>
+ <item msgid="1651266301325684887">"安全错误。"</item>
+ <item msgid="1461520171154288533">"无法同步。"</item>
+ <item msgid="8749857841162829469">"错误"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"触摸可进行设置"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话，请同步此文件夹。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>
@@ -341,18 +342,12 @@
<item msgid="6593672292311851204">"常用"</item>
<item msgid="3584541772344786752">"所有文件夹"</item>
</string-array>
- <!-- no translation found for signin (8958889809095796177) -->
- <skip />
- <!-- no translation found for info (6009817562073541204) -->
- <skip />
- <!-- no translation found for report (5417082746232614958) -->
- <skip />
- <!-- no translation found for sync_error (7368819509040597851) -->
- <skip />
- <!-- no translation found for sync_error_message (5367907194753034375) -->
- <skip />
- <!-- no translation found for storage (3262760336059073446) -->
- <skip />
+ <string name="signin" msgid="8958889809095796177">"登录"</string>
+ <string name="info" msgid="6009817562073541204">"信息"</string>
+ <string name="report" msgid="5417082746232614958">"报告"</string>
+ <string name="sync_error" msgid="7368819509040597851">"无法同步。"</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"您的设备存储空间不足，无法同步。"</string>
+ <string name="storage" msgid="3262760336059073446">"存储"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 022941c..5adee48 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -297,7 +297,7 @@
<item msgid="2446076619901049026">"Impumelelo"</item>
<item msgid="7109065688039971961">"Akukho ukuxhumana."</item>
<item msgid="8437496123716232060">"Ayikwazanga ukungena ngemvume."</item>
- <item msgid="1651266301325684887">"Iphutha lokuphepha"</item>
+ <item msgid="1651266301325684887">"Iphutha lokuphepha."</item>
<item msgid="1461520171154288533">"Ayikwazanga ukuvumelanisa."</item>
<item msgid="8749857841162829469">"Iphutha"</item>
</string-array>
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 7615550..ca3cfec 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -23,6 +23,9 @@
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
import android.app.LoaderManager;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -82,6 +85,7 @@
import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.android.mail.providers.UIProvider.DraftType;
import com.android.mail.ui.MailActivity;
+import com.android.mail.ui.WaitFragment;
import com.android.mail.utils.AccountUtils;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
@@ -185,7 +189,9 @@
private static final String EXTRA_FOCUS_SELECTION_END = null;
private static final String EXTRA_MESSAGE = "extraMessage";
private static final int REFERENCE_MESSAGE_LOADER = 0;
+ private static final int LOADER_ACCOUNT_CURSOR = 1;
private static final String EXTRA_SELECTED_ACCOUNT = "selectedAccount";
+ private static final String TAG_WAIT = "wait-fragment";
/**
* A single thread for running tasks in the background.
@@ -237,6 +243,7 @@
private RecipientTextWatcher mCcListener;
private RecipientTextWatcher mBccListener;
private Uri mRefMessageUri;
+ private Bundle mSavedInstanceState;
/**
@@ -291,6 +298,12 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.compose);
+ mSavedInstanceState = savedInstanceState;
+ checkValidAccounts();
+ }
+
+ private void finishCreate() {
+ Bundle savedInstanceState = mSavedInstanceState;
findViews();
Intent intent = getIntent();
Message message;
@@ -371,6 +384,32 @@
finishSetup(action, intent, savedInstanceState, showQuotedText);
}
+ private void checkValidAccounts() {
+ mAccounts = AccountUtils.getAccounts(this);
+ if (mAccounts == null || mAccounts.length == 0) {
+ final Intent noAccountIntent = MailAppProvider.getNoAccountIntent(this);
+ if (noAccountIntent != null) {
+ startActivityForResult(noAccountIntent, RESULT_CREATE_ACCOUNT);
+ }
+ } else {
+ // If none of the accounts are syncing. setup a watcher.
+ boolean anySyncing = false;
+ for (Account a : mAccounts) {
+ if (a.isAccountIntialized()) {
+ anySyncing = true;
+ break;
+ }
+ }
+ if (!anySyncing) {
+ // There are accounts, but none are sync'd, which is just like having no accounts.
+ mAccounts = null;
+ getLoaderManager().initLoader(LOADER_ACCOUNT_CURSOR, null, this);
+ return;
+ }
+ finishCreate();
+ }
+ }
+
private Account obtainAccount(Intent intent) {
Account account = null;
Object accountExtra = null;
@@ -387,12 +426,11 @@
accountExtra = Uri.parse(lastAccountUri);
}
}
- final Account[] syncingAccounts = AccountUtils.getSyncingAccounts(this);
- if (syncingAccounts.length > 0) {
+ if (mAccounts != null && mAccounts.length > 0) {
if (accountExtra instanceof String && !TextUtils.isEmpty((String) accountExtra)) {
// For backwards compatibility, we need to check account
// names.
- for (Account a : syncingAccounts) {
+ for (Account a : mAccounts) {
if (a.name.equals(accountExtra)) {
account = a;
}
@@ -400,13 +438,14 @@
} else if (accountExtra instanceof Uri) {
// The uri of the last viewed account is what is stored in
// the current code base.
- for (Account a : syncingAccounts) {
+ for (Account a : mAccounts) {
if (a.uri.equals(accountExtra)) {
account = a;
}
}
- } else {
- account = syncingAccounts[0];
+ }
+ if (account == null) {
+ account = mAccounts[0];
}
}
return account;
@@ -492,7 +531,7 @@
// Update the from spinner as other accounts
// may now be available.
if (mFromSpinner != null && mAccount != null) {
- mFromSpinner.asyncInitFromSpinner(mComposeMode, mAccount);
+ mFromSpinner.asyncInitFromSpinner(mComposeMode, mAccount, mAccounts);
}
}
@@ -514,10 +553,19 @@
@Override
protected final void onActivityResult(int request, int result, Intent data) {
- mAddingAttachment = false;
-
- if (result == RESULT_OK && request == RESULT_PICK_ATTACHMENT) {
+ if (request == RESULT_PICK_ATTACHMENT && result == RESULT_OK) {
addAttachmentAndUpdateView(data);
+ mAddingAttachment = false;
+ } else if (request == RESULT_CREATE_ACCOUNT) {
+ // We were waiting for the user to create an account
+ if (result != RESULT_OK) {
+ finish();
+ } else {
+ // Watch for accounts to show up!
+ // restart the loader to get the updated list of accounts
+ getLoaderManager().initLoader(LOADER_ACCOUNT_CURSOR, null, this);
+ showWaitFragment(null);
+ }
}
}
@@ -542,6 +590,10 @@
@Override
public final void onSaveInstanceState(Bundle state) {
super.onSaveInstanceState(state);
+ // We have no accounts so there is nothing to compose, and therefore, nothing to save.
+ if (mAccounts == null || mAccounts.length == 0) {
+ return;
+ }
// The framework is happy to save and restore the selection but only if it also saves and
// restores the contents of the edit text. That's a lot of text to put in a bundle so we do
// this manually.
@@ -661,7 +713,7 @@
if (action == EDIT_DRAFT && mDraft.draftType == UIProvider.DraftType.COMPOSE) {
action = COMPOSE;
}
- mFromSpinner.asyncInitFromSpinner(action, mAccount);
+ mFromSpinner.asyncInitFromSpinner(action, mAccount, mAccounts);
if (bundle != null) {
if (bundle.containsKey(EXTRA_SELECTED_REPLY_FROM_ACCOUNT)) {
mReplyFromAccount = ReplyFromAccount.deserialize(mAccount,
@@ -806,6 +858,7 @@
}
private void findViews() {
+ findViewById(R.id.compose).setVisibility(View.VISIBLE);
mCcBccButton = (Button) findViewById(R.id.add_cc_bcc);
if (mCcBccButton != null) {
mCcBccButton.setOnClickListener(this);
@@ -1524,6 +1577,10 @@
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
+ // Don't render any menu items when there are no accounts.
+ if (mAccounts == null || mAccounts.length == 0) {
+ return true;
+ }
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.compose_menu, menu);
mSave = menu.findItem(R.id.save);
@@ -1602,6 +1659,16 @@
return !handled ? super.onOptionsItemSelected(item) : handled;
}
+ @Override
+ public void onBackPressed() {
+ // If we are showing the wait fragment, just exit.
+ if (getWaitFragment() != null) {
+ finish();
+ } else {
+ super.onBackPressed();
+ }
+ }
+
private void onAppUpPressed() {
if (mLaunchedFromEmail) {
// If this was started from Gmail, simply treat app up as the system back button, so
@@ -1741,6 +1808,7 @@
private int mRequestId;
private String mSignature;
private AttachmentTypeSelectorAdapter mAttachmentTypeSelectorAdapter;
+ private Account[] mAccounts;
@VisibleForTesting
public static class SendOrSaveMessage {
@@ -2685,34 +2753,93 @@
case REFERENCE_MESSAGE_LOADER:
return new CursorLoader(this, mRefMessageUri, UIProvider.MESSAGE_PROJECTION, null,
null, null);
+ case LOADER_ACCOUNT_CURSOR:
+ return new CursorLoader(this, MailAppProvider.getAccountsUri(),
+ UIProvider.ACCOUNTS_PROJECTION, null, null, null);
}
return null;
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
- if (data != null && data.moveToFirst()) {
- mRefMessage = new Message(data);
- // We set these based on EXTRA_TO.
- mRefMessage.to = null;
- mRefMessage.from = null;
- Intent intent = getIntent();
- int action = intent.getIntExtra(EXTRA_ACTION, COMPOSE);
- initFromRefMessage(action, mAccount.name);
- finishSetup(action, intent, null, true);
- if (action != FORWARD) {
- String to = intent.getStringExtra(EXTRA_TO);
- if (!TextUtils.isEmpty(to)) {
- clearChangeListeners();
- mTo.append(to);
- initChangeListeners();
+ int id = loader.getId();
+ switch (id) {
+ case REFERENCE_MESSAGE_LOADER:
+ if (data != null && data.moveToFirst()) {
+ mRefMessage = new Message(data);
+ // We set these based on EXTRA_TO.
+ mRefMessage.to = null;
+ mRefMessage.from = null;
+ Intent intent = getIntent();
+ int action = intent.getIntExtra(EXTRA_ACTION, COMPOSE);
+ initFromRefMessage(action, mAccount.name);
+ finishSetup(action, intent, null, true);
+ if (action != FORWARD) {
+ String to = intent.getStringExtra(EXTRA_TO);
+ if (!TextUtils.isEmpty(to)) {
+ clearChangeListeners();
+ mTo.append(to);
+ initChangeListeners();
+ }
+ }
+ } else {
+ finish();
}
- }
- } else {
- finish();
+ break;
+ case LOADER_ACCOUNT_CURSOR:
+ if (data != null && data.moveToFirst()) {
+ // there are accounts now!
+ Account account;
+ ArrayList<Account> accounts = new ArrayList<Account>();
+ ArrayList<Account> initializedAccounts = new ArrayList<Account>();
+ do {
+ account = new Account(data);
+ if (account.isAccountIntialized()) {
+ initializedAccounts.add(account);
+ }
+ accounts.add(account);
+ } while (data.moveToNext());
+ if (initializedAccounts.size() > 0) {
+ findViewById(R.id.wait).setVisibility(View.GONE);
+ getLoaderManager().destroyLoader(LOADER_ACCOUNT_CURSOR);
+ findViewById(R.id.compose).setVisibility(View.VISIBLE);
+ mAccounts = accounts.toArray(new Account[initializedAccounts.size()]);
+ finishCreate();
+ invalidateOptionsMenu();
+ } else {
+ // Show "waiting"
+ account = accounts.size() > 0 ? accounts.get(0) : null;
+ showWaitFragment(account);
+ }
+ }
+ break;
}
}
+ private void showWaitFragment(Account account) {
+ WaitFragment fragment = getWaitFragment();
+ if (fragment != null) {
+ fragment.updateAccount(account);
+ } else {
+ findViewById(R.id.wait).setVisibility(View.VISIBLE);
+ replaceFragment(WaitFragment.newInstance(account, true),
+ FragmentTransaction.TRANSIT_FRAGMENT_OPEN, TAG_WAIT);
+ }
+ }
+
+ private WaitFragment getWaitFragment() {
+ return (WaitFragment) getFragmentManager().findFragmentByTag(TAG_WAIT);
+ }
+
+ private int replaceFragment(Fragment fragment, int transition, String tag) {
+ FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+ fragmentTransaction.addToBackStack(null);
+ fragmentTransaction.setTransition(transition);
+ fragmentTransaction.replace(R.id.wait, fragment, tag);
+ final int transactionId = fragmentTransaction.commitAllowingStateLoss();
+ return transactionId;
+ }
+
@Override
public void onLoaderReset(Loader<Cursor> arg0) {
// Do nothing.
diff --git a/src/com/android/mail/compose/FromAddressSpinner.java b/src/com/android/mail/compose/FromAddressSpinner.java
index 1efdf01..d402f55 100644
--- a/src/com/android/mail/compose/FromAddressSpinner.java
+++ b/src/com/android/mail/compose/FromAddressSpinner.java
@@ -95,10 +95,12 @@
* accounts. Otherwise, show just the account this was launched
* with.
* @param currentAccount Account used to launch activity.
+ * @param syncing accounts
*/
- public void asyncInitFromSpinner(int action, Account currentAccount) {
+ public void asyncInitFromSpinner(int action, Account currentAccount,
+ Account[] syncingAccounts) {
if (action == ComposeActivity.COMPOSE) {
- Account[] result = AccountUtils.getSyncingAccounts(getContext());
+ Account[] result = syncingAccounts;
mAccounts = AccountUtils
.mergeAccountLists(mAccounts, result, true /* prioritizeAccountList */);
} else {
diff --git a/src/com/android/mail/ui/WaitFragment.java b/src/com/android/mail/ui/WaitFragment.java
index 8be3ffa..e922104 100644
--- a/src/com/android/mail/ui/WaitFragment.java
+++ b/src/com/android/mail/ui/WaitFragment.java
@@ -38,19 +38,29 @@
// Keys used to pass data to {@link WaitFragment}.
private static final String ACCOUNT_KEY = "account";
+ private static final String COMPOSE_KEY = "isCompose";
+
private static final int MANUAL_SYNC_LOADER = 0;
+
private Account mAccount;
private LayoutInflater mInflater;
private ViewGroup mContainer;
+ private boolean mCompose;
+
public static WaitFragment newInstance(Account account) {
+ return newInstance(account, false);
+ }
+
+ public static WaitFragment newInstance(Account account, boolean compose) {
WaitFragment fragment = new WaitFragment();
final Bundle args = new Bundle();
args.putParcelable(ACCOUNT_KEY, account);
+ args.putBoolean(COMPOSE_KEY, compose);
fragment.setArguments(args);
return fragment;
}
@@ -61,6 +71,7 @@
Bundle args = getArguments();
mAccount = (Account)args.getParcelable(ACCOUNT_KEY);
+ mCompose = args.getBoolean(COMPOSE_KEY, false);
}
@Override
@@ -76,14 +87,17 @@
// Clear any views in the container.
mContainer.removeAllViews();
- if ((mAccount.syncStatus & SyncStatus.MANUAL_SYNC_REQUIRED) ==
- SyncStatus.MANUAL_SYNC_REQUIRED) {
+ if (mAccount != null
+ && (mAccount.syncStatus & SyncStatus.MANUAL_SYNC_REQUIRED)
+ == SyncStatus.MANUAL_SYNC_REQUIRED) {
// A manual sync is required
root = mInflater.inflate(R.layout.wait_for_manual_sync, mContainer, false);
root.findViewById(R.id.manual_sync).setOnClickListener(this);
root.findViewById(R.id.change_sync_settings).setOnClickListener(this);
+ } else if (mCompose) {
+ root = mInflater.inflate(R.layout.wait_for_compose, mContainer, false);
} else {
root = mInflater.inflate(R.layout.wait_for_sync, mContainer, false);
}
@@ -91,7 +105,7 @@
return root;
}
- void updateAccount(Account account) {
+ public void updateAccount(Account account) {
mAccount = account;
getContent();
}
diff --git a/src/com/android/mail/utils/AccountUtils.java b/src/com/android/mail/utils/AccountUtils.java
index 416c0bb..0db885d 100644
--- a/src/com/android/mail/utils/AccountUtils.java
+++ b/src/com/android/mail/utils/AccountUtils.java
@@ -94,4 +94,29 @@
}
return accounts.toArray(new Account[accounts.size()]);
}
+
+ /**
+ * Synchronous method which returns registered accounts.
+ * @param context
+ * @return
+ */
+ public static Account[] getAccounts(Context context) {
+ final ContentResolver resolver = context.getContentResolver();
+ Cursor accountsCursor = null;
+ final List<Account> accounts = Lists.newArrayList();
+ try {
+ accountsCursor = resolver.query(MailAppProvider.getAccountsUri(),
+ UIProvider.ACCOUNTS_PROJECTION, null, null, null);
+ if (accountsCursor != null) {
+ while (accountsCursor.moveToNext()) {
+ accounts.add(new Account(accountsCursor));
+ }
+ }
+ } finally {
+ if (accountsCursor != null) {
+ accountsCursor.close();
+ }
+ }
+ return accounts.toArray(new Account[accounts.size()]);
+ }
}
diff --git a/tests/src/com/android/mail/compose/ComposeActivityTest.java b/tests/src/com/android/mail/compose/ComposeActivityTest.java
index ab6eda3..cfcedf7 100644
--- a/tests/src/com/android/mail/compose/ComposeActivityTest.java
+++ b/tests/src/com/android/mail/compose/ComposeActivityTest.java
@@ -319,7 +319,8 @@
ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
mAccount.name, mAccount.name, mAccount.name, true, false);
mActivity.mFromSpinner.setCurrentAccount(currentAccount);
- mActivity.mFromSpinner.asyncInitFromSpinner(ComposeActivity.REPLY, currentAccount.account);
+ mActivity.mFromSpinner.asyncInitFromSpinner(ComposeActivity.REPLY, currentAccount.account,
+ null);
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -359,7 +360,7 @@
mAccount.name, mAccount.name, mAccount.name, true, false);
mActivity.mFromSpinner.setCurrentAccount(currentAccount);
mActivity.mFromSpinner.asyncInitFromSpinner(ComposeActivity.REPLY_ALL,
- currentAccount.account);
+ currentAccount.account, null);
mActivity.runOnUiThread(new Runnable() {
public void run() {
activity.initReplyRecipients(account.name, refMessage, ComposeActivity.REPLY_ALL);