Add missing tablet resources; get compose working correctly/ cleanly.
Change-Id: I484a1880009e557fc660d56cda83313efc13825a
diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml
index 13589c0..cfa9118 100644
--- a/res/layout-sw600dp/compose.xml
+++ b/res/layout-sw600dp/compose.xml
@@ -59,16 +59,16 @@
</LinearLayout>
<!-- Attachments -->
- <!--<com.google.android.gm.AttachmentsView android:id="@+id/attachments"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginTop="8dip"
- android:paddingTop="2dip"
- android:layout_marginRight="100dip"
- android:paddingBottom="0dip"
- android:paddingLeft="0dip"
- android:visibility="gone" />-->
+ <com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_marginTop="8dip"
+ android:paddingTop="2dip"
+ android:layout_marginRight="100dip"
+ android:paddingBottom="0dip"
+ android:paddingLeft="0dip"
+ android:visibility="gone" />
<!-- Compose Area -->
<FrameLayout android:layout_width="match_parent"
@@ -80,10 +80,10 @@
</FrameLayout>
<!-- Quoted text -->
- <!--<com.google.android.gm.QuotedTextView android:id="@+id/quoted_text_view"
+ <com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginRight="100dip"/>-->
+ android:visibility="gone" />
<FrameLayout
android:id="@+id/composearea_tap_trap_bottom"
diff --git a/res/menu-sw600dp/compose_menu.xml b/res/menu-sw600dp/compose_menu.xml
index bd11f05..440afaa 100644
--- a/res/menu-sw600dp/compose_menu.xml
+++ b/res/menu-sw600dp/compose_menu.xml
@@ -32,10 +32,9 @@
android:title="@string/discard"
android:icon="@drawable/trash" />
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings"
+ android:showAsAction="never" />
<item
android:id="@+id/help_info_menu_item"
diff --git a/res/menu-sw600dp/conversation_list_menu.xml b/res/menu-sw600dp/conversation_list_menu.xml
index 02e0b70..439699b 100644
--- a/res/menu-sw600dp/conversation_list_menu.xml
+++ b/res/menu-sw600dp/conversation_list_menu.xml
@@ -39,9 +39,8 @@
android:title="@string/menu_manage_labels"
android:icon="@drawable/ic_menu_labels_holo_light" />
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings" />
<item
android:id="@+id/help_info_menu_item"
diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml
index d079fb9..39446ac 100644
--- a/res/menu/compose_menu.xml
+++ b/res/menu/compose_menu.xml
@@ -39,10 +39,9 @@
android:icon="@drawable/trash"
android:title="@string/discard" />
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings"
+ android:showAsAction="never" />
<item
android:id="@+id/help_info_menu_item"
diff --git a/res/menu/conversation_actions.xml b/res/menu/conversation_actions.xml
index 3f392b4..52dcd16 100644
--- a/res/menu/conversation_actions.xml
+++ b/res/menu/conversation_actions.xml
@@ -70,9 +70,8 @@
android:icon="@drawable/ic_spam_normal_holo_light" />
<!-- Always available -->
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings" />
<!-- Always available -->
<item
diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml
index 29c9ce6..e7e8e96 100644
--- a/res/menu/conversation_list_menu.xml
+++ b/res/menu/conversation_list_menu.xml
@@ -50,10 +50,9 @@
android:showAsAction="never" />
<!-- Always available -->
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings"
+ android:showAsAction="never" />
<!-- Available if the account specifies a help url -->
<item
diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml
index 7edfa76..6bbaffd 100644
--- a/res/menu/conversation_list_search_results_actions.xml
+++ b/res/menu/conversation_list_search_results_actions.xml
@@ -41,10 +41,9 @@
android:icon="@drawable/ic_menu_refresh_holo_light"
android:alphabeticShortcut="@string/trigger_refresh_char" />
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings"
+ android:showAsAction="never" />
<item
android:id="@+id/help_info_menu_item"
diff --git a/res/menu/folder_list_menu.xml b/res/menu/folder_list_menu.xml
index 566b622..2779f24 100644
--- a/res/menu/folder_list_menu.xml
+++ b/res/menu/folder_list_menu.xml
@@ -23,10 +23,9 @@
android:showAsAction="ifRoom" />
<!-- Always available -->
- <item android:id="@+id/preferences"
- android:title="@string/menu_preferences"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_preferences" />
+ <item android:id="@+id/settings"
+ android:title="@string/menu_settings"
+ android:showAsAction="never" />
<!-- Always available -->
<item
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index af6f8f0..bd8bb24 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniseer en laat weet"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiket-instellings"</string>
<string name="menu_done" msgid="5791134842152855128">"Klaar"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Rekeninginstellings"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Instellings"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Rekeninginstellings"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Instellings"</string>
<string name="menu_search" msgid="5297197523031943248">"Soek"</string>
<string name="more" msgid="1238344647379009858">"Meer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ec69d08..0f6624c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"አመሳስል & አሳውቅ"</string>
<string name="menu_label_options" msgid="1811414840489117457">"የስያሜ ቅንጅቶች"</string>
<string name="menu_done" msgid="5791134842152855128">"ተከናውኗል"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"የመለያ ቅንጅቶች"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"ቅንጅቶች"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"የመለያ ቅንጅቶች"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"ቅንጅቶች"</string>
<string name="menu_search" msgid="5297197523031943248">"ፍለጋ"</string>
<string name="more" msgid="1238344647379009858">"ተጨማሪ"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ከ<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5e62fa7..183571b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"المزامنة والإشعارات"</string>
<string name="menu_label_options" msgid="1811414840489117457">"إعدادات التصنيفات"</string>
<string name="menu_done" msgid="5791134842152855128">"تم"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"إعدادات الحساب"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"الإعدادات"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"إعدادات الحساب"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"الإعدادات"</string>
<string name="menu_search" msgid="5297197523031943248">"بحث"</string>
<string name="more" msgid="1238344647379009858">"المزيد"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a521f83..f8a0311 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Сінхранізацыя і апавяшчэнне"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Налады цэтліка"</string>
<string name="menu_done" msgid="5791134842152855128">"Гатова"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Налады ўліковага запісу"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Налады"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Налады ўліковага запісу"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Налады"</string>
<string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
<string name="more" msgid="1238344647379009858">"Дадаткова"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index db83052..a95f13e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизиране и известяване"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Настройки за етикети"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Настройки на профила"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Настройки"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Настройки на профила"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Настройки"</string>
<string name="menu_search" msgid="5297197523031943248">"Търсене"</string>
<string name="more" msgid="1238344647379009858">"Още"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 144f1b9..4549fb0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronitza i notifica"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configuració de l\'etiqueta"</string>
<string name="menu_done" msgid="5791134842152855128">"Fet"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Configuració del compte"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Configuració"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Configuració del compte"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Configuració"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
<string name="more" msgid="1238344647379009858">"Més"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 31b28cf..cce96f6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizace a upozornění"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavení štítku"</string>
<string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Nastavení účtu"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Nastavení"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Nastavení účtu"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Nastavení"</string>
<string name="menu_search" msgid="5297197523031943248">"Vyhledat"</string>
<string name="more" msgid="1238344647379009858">"Více"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e948098..9cc2336 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiketindstillinger"</string>
<string name="menu_done" msgid="5791134842152855128">"Udført"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Kontoindstillinger"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Indstillinger"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Kontoindstillinger"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Indstillinger"</string>
<string name="menu_search" msgid="5297197523031943248">"Søg"</string>
<string name="more" msgid="1238344647379009858">"Mere"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d179368..d38af3f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchr. & benachrichtigen"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Label-Einstellungen"</string>
<string name="menu_done" msgid="5791134842152855128">"Fertig"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Kontoeinstellungen"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Einstellungen"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Kontoeinstellungen"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Einstellungen"</string>
<string name="menu_search" msgid="5297197523031943248">"Suche"</string>
<string name="more" msgid="1238344647379009858">"Mehr"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4f86204..9caccb8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Συγχρονισμός και ειδοποίηση"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ρυθμίσεις ετικέτας"</string>
<string name="menu_done" msgid="5791134842152855128">"Τέλος"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Ρυθμίσεις λογαριασμού"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Ρυθμίσεις"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Ρυθμίσεις λογαριασμού"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Ρυθμίσεις"</string>
<string name="menu_search" msgid="5297197523031943248">"Αναζήτηση"</string>
<string name="more" msgid="1238344647379009858">"Περισσότερα"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index cc79315..9cf4fe8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sync & notify"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Label settings"</string>
<string name="menu_done" msgid="5791134842152855128">"Finished"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Account settings"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Settings"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Account settings"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Settings"</string>
<string name="menu_search" msgid="5297197523031943248">"Search"</string>
<string name="more" msgid="1238344647379009858">"More"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d6f0288..2284185 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configuración de la etiqueta"</string>
<string name="menu_done" msgid="5791134842152855128">"Listo"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Configuración de la cuenta"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Configuración"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Configuración de la cuenta"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Configuración"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
<string name="more" msgid="1238344647379009858">"Más"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 574263a..ecb1912 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ajustes de etiquetas"</string>
<string name="menu_done" msgid="5791134842152855128">"Listo"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Ajustes de la cuenta"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Ajustes"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Ajustes de la cuenta"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Ajustes"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
<string name="more" msgid="1238344647379009858">"Más"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8d35e30..9eb2559 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Sildi seaded"</string>
<string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Konto seaded"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Seaded"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Konto seaded"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Seaded"</string>
<string name="menu_search" msgid="5297197523031943248">"Otsing ..."</string>
<string name="more" msgid="1238344647379009858">"Rohkem"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>-st"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e1447d7..c66591c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"همگامسازی و اعلان"</string>
<string name="menu_label_options" msgid="1811414840489117457">"تنظیمات برچسب"</string>
<string name="menu_done" msgid="5791134842152855128">"انجام شد"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"تنظیمات حساب"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"تنظیمات"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"تنظیمات حساب"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"تنظیمات"</string>
<string name="menu_search" msgid="5297197523031943248">"جستجو"</string>
<string name="more" msgid="1238344647379009858">"بیشتر"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1e09c59..d4fb4e6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronoi ja ilmoita"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Tunnisteen asetukset"</string>
<string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Tilin asetukset"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Asetukset"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Tilin asetukset"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Asetukset"</string>
<string name="menu_search" msgid="5297197523031943248">"Haku"</string>
<string name="more" msgid="1238344647379009858">"Lisää"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a1d4b3a..ab2adbf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniser et signaler"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Paramètres du libellé"</string>
<string name="menu_done" msgid="5791134842152855128">"OK"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Paramètres de compte"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Paramètres"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Paramètres de compte"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Paramètres"</string>
<string name="menu_search" msgid="5297197523031943248">"Rechercher"</string>
<string name="more" msgid="1238344647379009858">"Plus"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f10456e..38e467b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"समन्वयित करें और सूचित करें"</string>
<string name="menu_label_options" msgid="1811414840489117457">"लेबल सेटिंग"</string>
<string name="menu_done" msgid="5791134842152855128">"पूर्ण"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"खाता सेटिंग"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"सेटिंग"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"खाता सेटिंग"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"सेटिंग"</string>
<string name="menu_search" msgid="5297197523031943248">"खोजें"</string>
<string name="more" msgid="1238344647379009858">"अधिक"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="COUNT">%1$s</xliff:g>"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 06038bf..b394a8f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniziraj i obavijesti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Postavke oznake"</string>
<string name="menu_done" msgid="5791134842152855128">"Gotovo"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Postavke računa"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Postavke"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Postavke računa"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Postavke"</string>
<string name="menu_search" msgid="5297197523031943248">"Pretraživanje"</string>
<string name="more" msgid="1238344647379009858">"Više"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1cb7c97..60c8ab0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Szinkronizálás és értesítés"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Címkebeállítások"</string>
<string name="menu_done" msgid="5791134842152855128">"Kész"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Fiókbeállítások"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Beállítások"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Fiókbeállítások"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Beállítások"</string>
<string name="menu_search" msgid="5297197523031943248">"Keresés"</string>
<string name="more" msgid="1238344647379009858">"Egyebek"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 419889d..fbfe1b5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkronkan & beri tahu"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Setelan label"</string>
<string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Setelan akun"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Setelan"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Setelan akun"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Setelan"</string>
<string name="menu_search" msgid="5297197523031943248">"Telusuri"</string>
<string name="more" msgid="1238344647379009858">"Lainnya"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 24eca67..de46916 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizza e notifica"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Impostazioni etichetta"</string>
<string name="menu_done" msgid="5791134842152855128">"Fine"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Impostazioni account"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Impostazioni"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Impostazioni account"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Impostazioni"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
<string name="more" msgid="1238344647379009858">"Altre"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index dff1f89..29d9f7a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"סנכרן ושלח התראה"</string>
<string name="menu_label_options" msgid="1811414840489117457">"הגדרות תווית"</string>
<string name="menu_done" msgid="5791134842152855128">"בוצע"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"הגדרות חשבון"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"הגדרות"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"הגדרות חשבון"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"הגדרות"</string>
<string name="menu_search" msgid="5297197523031943248">"חפש"</string>
<string name="more" msgid="1238344647379009858">"עוד"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e98db82..4e235d2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"同期と通知"</string>
<string name="menu_label_options" msgid="1811414840489117457">"ラベルの設定"</string>
<string name="menu_done" msgid="5791134842152855128">"完了"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"アカウント設定"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"設定"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"アカウント設定"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"設定"</string>
<string name="menu_search" msgid="5297197523031943248">"検索"</string>
<string name="more" msgid="1238344647379009858">"その他"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a235a8a..7499b7a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"동기화 및 알림"</string>
<string name="menu_label_options" msgid="1811414840489117457">"라벨 설정"</string>
<string name="menu_done" msgid="5791134842152855128">"완료"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"계정 설정"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"설정"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"계정 설정"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"설정"</string>
<string name="menu_search" msgid="5297197523031943248">"검색"</string>
<string name="more" msgid="1238344647379009858">"더보기"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>개 중 <xliff:g id="COUNT">%1$s</xliff:g>개"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index fe8260f..a4d3ff0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinchronizuoti ir pranešti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiketės nustatymai"</string>
<string name="menu_done" msgid="5791134842152855128">"Atlikta"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Paskyros nustatymai"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Nustatymai"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Paskyros nustatymai"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Nustatymai"</string>
<string name="menu_search" msgid="5297197523031943248">"Paieška"</string>
<string name="more" msgid="1238344647379009858">"Daugiau"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index de760ed..2495665 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhronizēšana un paziņojumi"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Iezīmes iestatījumi"</string>
<string name="menu_done" msgid="5791134842152855128">"Gatavs"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Konta iestatījumi"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Iestatījumi"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Konta iestatījumi"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Iestatījumi"</string>
<string name="menu_search" msgid="5297197523031943248">"Meklēt"</string>
<string name="more" msgid="1238344647379009858">"Vairāk"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>. no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 18704f8..870ee02 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Segerakkan & beritahu"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Tetapan label"</string>
<string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Tetapan akaun"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Tetapan"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Tetapan akaun"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Tetapan"</string>
<string name="menu_search" msgid="5297197523031943248">"Carian"</string>
<string name="more" msgid="1238344647379009858">"Lagi"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> daripada <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e078a1b..31ed087 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronisering og varsling"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Innstillinger for etikett"</string>
<string name="menu_done" msgid="5791134842152855128">"Ferdig"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Kontoinnstillinger"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Innstillinger"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Kontoinnstillinger"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Innstillinger"</string>
<string name="menu_search" msgid="5297197523031943248">"Søk"</string>
<string name="more" msgid="1238344647379009858">"Mer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index df4f0fd..94f1bc0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniseren en melden"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Labelinstellingen"</string>
<string name="menu_done" msgid="5791134842152855128">"Gereed"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Accountinstellingen"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Instellingen"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Accountinstellingen"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Instellingen"</string>
<string name="menu_search" msgid="5297197523031943248">"Zoeken"</string>
<string name="more" msgid="1238344647379009858">"Meer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cba14cc..3bc3712 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizuj i powiadamiaj"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ustawienia etykiety"</string>
<string name="menu_done" msgid="5791134842152855128">"Gotowe"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Ustawienia konta"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Ustawienia"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Ustawienia konta"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Ustawienia"</string>
<string name="menu_search" msgid="5297197523031943248">"Szukaj"</string>
<string name="more" msgid="1238344647379009858">"Więcej"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6927730..95ccb09 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Definições de etiquetas"</string>
<string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Definições da conta"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Definições"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Definições da conta"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Definições"</string>
<string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
<string name="more" msgid="1238344647379009858">"Mais"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1787873..d7e1eef 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configurações do marcador"</string>
<string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Configurações da conta"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Configurações"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Configurações da conta"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Configurações"</string>
<string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
<string name="more" msgid="1238344647379009858">"Mais"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0614b7b..4f919f8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizare şi notificare"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Setări pentru etichete"</string>
<string name="menu_done" msgid="5791134842152855128">"Terminat"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Setările contului"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Setări"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Setările contului"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Setări"</string>
<string name="menu_search" msgid="5297197523031943248">"Căutaţi"</string>
<string name="more" msgid="1238344647379009858">"Mai multe"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 723b5e9..10f7881 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизация и уведомления"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Настройки ярлыка"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Настройки аккаунта"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Настройки"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Настройки аккаунта"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Настройки"</string>
<string name="menu_search" msgid="5297197523031943248">"Поиск"</string>
<string name="more" msgid="1238344647379009858">"Еще"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2ac0d3d..a32c60a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizovať a upozorniť"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavenia menovky"</string>
<string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Nastavenia účtu"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Nastavenia"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Nastavenia účtu"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Nastavenia"</string>
<string name="menu_search" msgid="5297197523031943248">"Hľadať"</string>
<string name="more" msgid="1238344647379009858">"Viac"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f676aa9..647b086 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhroniziraj in obvesti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavitve oznake"</string>
<string name="menu_done" msgid="5791134842152855128">"Končano"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Nastavitve računa"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Nastavitve"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Nastavitve računa"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Nastavitve"</string>
<string name="menu_search" msgid="5297197523031943248">"Išči"</string>
<string name="more" msgid="1238344647379009858">"Več"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b8e3dd8..57d0c44 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизовање и обавештавање"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Подешавања ознаке"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Подешавања налога"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Подешавања"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Подешавања налога"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Подешавања"</string>
<string name="menu_search" msgid="5297197523031943248">"Претражи"</string>
<string name="more" msgid="1238344647379009858">"Још"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d0a6153..deed5e8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Inställningar för etikett"</string>
<string name="menu_done" msgid="5791134842152855128">"Klar"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Kontoinställningar"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Inställningar"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Kontoinställningar"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Inställningar"</string>
<string name="menu_search" msgid="5297197523031943248">"Sök"</string>
<string name="more" msgid="1238344647379009858">"Mer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51bb5fb..025cb35 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha & arifu"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Mipangilio ya lebo"</string>
<string name="menu_done" msgid="5791134842152855128">"Imekamilika"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Mipangilio ya akaunti"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Mipangilio"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Mipangilio ya akaunti"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Mipangilio"</string>
<string name="menu_search" msgid="5297197523031943248">"Tafuta"</string>
<string name="more" msgid="1238344647379009858">"Zaidi"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> wa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 81124c6..46f406e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"ซิงค์และแจ้งเตือน"</string>
<string name="menu_label_options" msgid="1811414840489117457">"การตั้งค่าป้ายกำกับ"</string>
<string name="menu_done" msgid="5791134842152855128">"เสร็จสิ้น"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"การตั้งค่าบัญชี"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"การตั้งค่า"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"การตั้งค่าบัญชี"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"การตั้งค่า"</string>
<string name="menu_search" msgid="5297197523031943248">"ค้นหา"</string>
<string name="more" msgid="1238344647379009858">"เพิ่มเติม"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2772ab1..18a64c1 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"I-sync at i-notify"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Mga setting ng label"</string>
<string name="menu_done" msgid="5791134842152855128">"Tapos na"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Mga setting ng account"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Mga Setting"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Mga setting ng account"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Mga Setting"</string>
<string name="menu_search" msgid="5297197523031943248">"Maghanap"</string>
<string name="more" msgid="1238344647379009858">"Higit pa"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ng <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 40b7245..754c51d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Senkronize et ve bildir"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiket ayarları"</string>
<string name="menu_done" msgid="5791134842152855128">"Bitti"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Hesap ayarları"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Ayarlar"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Hesap ayarları"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Ayarlar"</string>
<string name="menu_search" msgid="5297197523031943248">"Ara"</string>
<string name="more" msgid="1238344647379009858">"Diğer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6c2b881..fa48aa2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронізація та сповіщення"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Налаштування мітки"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Налаштування облікового запису"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Налаштування"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Налаштування облікового запису"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Налаштування"</string>
<string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
<string name="more" msgid="1238344647379009858">"Більше"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ceb722b..6964b22 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Đ.bộ hóa & t.báo"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Cài đặt nhãn"</string>
<string name="menu_done" msgid="5791134842152855128">"Hoàn tất"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Cài đặt tài khoản"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Cài đặt"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Cài đặt tài khoản"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Cài đặt"</string>
<string name="menu_search" msgid="5297197523031943248">"Tìm kiếm"</string>
<string name="more" msgid="1238344647379009858">"Khác"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3611336..e996938 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"同步与通知"</string>
<string name="menu_label_options" msgid="1811414840489117457">"标签设置"</string>
<string name="menu_done" msgid="5791134842152855128">"完成"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"帐户设置"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"设置"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"帐户设置"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"设置"</string>
<string name="menu_search" msgid="5297197523031943248">"搜索"</string>
<string name="more" msgid="1238344647379009858">"更多"</string>
<string name="message_count" msgid="1032500151281269302">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0684640..ae5a4d4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"同步處理並通知"</string>
<string name="menu_label_options" msgid="1811414840489117457">"標籤設定"</string>
<string name="menu_done" msgid="5791134842152855128">"完成"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"帳戶設定"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"設定"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"帳戶設定"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"設定"</string>
<string name="menu_search" msgid="5297197523031943248">"搜尋"</string>
<string name="more" msgid="1238344647379009858">"更多"</string>
<string name="message_count" msgid="1032500151281269302">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 19fc4ab..70a6d8f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -73,8 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa & ukuqaphelisa"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Izilungiselelo zelebuli"</string>
<string name="menu_done" msgid="5791134842152855128">"Kwenziwe"</string>
- <string name="menu_account_preferences" msgid="825820027931270435">"Izilungiselelo ze-akhawunti"</string>
- <string name="menu_preferences" msgid="8957431987536606063">"Izilungiselelo"</string>
+ <string name="menu_account_settings" msgid="825820027931270435">"Izilungiselelo ze-akhawunti"</string>
+ <string name="menu_settings" msgid="8957431987536606063">"Izilungiselelo"</string>
<string name="menu_search" msgid="5297197523031943248">"Sesha"</string>
<string name="more" msgid="1238344647379009858">"Okuningi"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> koku-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index da5f172..85adc73 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -140,9 +140,9 @@
<!-- Menu item: done editing label options. [CHAR LIMIT = 30] -->
<string name="menu_done">Done</string>
<!-- Menu item: launch the Global Account Settings activity -->
- <string name="menu_account_preferences">Account settings</string>
+ <string name="menu_account_settings">Account settings</string>
<!-- Menu item: launch the Settings activity -->
- <string name="menu_preferences">Settings</string>
+ <string name="menu_settings">Settings</string>
<!-- Menu item: search through the Gmail inbox -->
<string name="menu_search">Search</string>
<!-- Menu item: show more menu options in a popup. Portrait mode string. [CHAR LIMIT=15] -->
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 6eae203..83a808b 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -54,6 +54,7 @@
import android.view.inputmethod.BaseInputConnection;
import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -168,6 +169,7 @@
private long mDraftId = UIProvider.INVALID_MESSAGE_ID;
private Message mDraft;
private Object mDraftLock = new Object();
+ private ImageView mAttachmentsButton;
/**
* Can be called from a non-UI thread.
@@ -304,6 +306,10 @@
}
mCcBccView = (CcBccView) findViewById(R.id.cc_bcc_wrapper);
mAttachmentsView = (AttachmentsView)findViewById(R.id.attachments);
+ mAttachmentsButton = (ImageView) findViewById(R.id.add_attachment);
+ if (mAttachmentsButton != null) {
+ mAttachmentsButton.setOnClickListener(this);
+ }
mTo = (RecipientEditTextView) findViewById(R.id.to);
mCc = (RecipientEditTextView) findViewById(R.id.cc);
mBcc = (RecipientEditTextView) findViewById(R.id.bcc);
@@ -607,6 +613,9 @@
// Animate in cc/bcc.
showCcBccViews();
break;
+ case R.id.add_attachment:
+ doAttach();
+ break;
}
}
@@ -661,6 +670,9 @@
case R.id.discard:
doDiscard();
break;
+ case R.id.settings:
+ Utils.showSettings(this, mAccount);
+ break;
default:
handled = false;
break;
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 76feb78..ef75f66 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -402,8 +402,8 @@
case R.id.refresh:
requestFolderRefresh();
break;
- case R.id.preferences:
- showPreferences();
+ case R.id.settings:
+ Utils.showSettings(mActivity.getActivityContext(), mAccount);
break;
case R.id.help_info_menu_item:
// TODO: enable context sensitive help
@@ -508,12 +508,6 @@
}
@Override
- public void showPreferences() {
- final Intent preferenceIntent = new Intent(Intent.ACTION_EDIT, mAccount.settingsIntentUri);
- mActivity.startActivity(preferenceIntent);
- }
-
- @Override
public void onSearchRequested() {
// TODO(viki): Auto-generated method stub
}
diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index f4cc093..be91166 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java
@@ -243,11 +243,6 @@
void showFolderList();
/**
- * Shows the preferences screen
- */
- void showPreferences();
-
- /**
* Handle a touch event.
*/
void onTouchEvent(MotionEvent event);
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index d311242..d56dcde 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -675,4 +675,12 @@
}
return sVersionCode;
}
+
+ /**
+ * Show the settings screen for the supplied account.
+ */
+ public static void showSettings(Context context, Account account) {
+ final Intent settingsIntent = new Intent(Intent.ACTION_EDIT, account.settingsIntentUri);
+ context.startActivity(settingsIntent);
+ }
}