am 273c32b3: (-s ours) Import revised translations. DO NOT MERGE
* commit '273c32b363dafdf8f1054a6d264af094ee4024b3':
Import revised translations. DO NOT MERGE
diff --git a/Android.mk b/Android.mk
index d586615..ce837b1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,13 +20,15 @@
include $(CLEAR_VARS)
# Include res dir from chips
chips_dir := ../../../frameworks/ex/chips/res
-res_dir := $(chips_dir) res
+mail_common_dir := ../../../frameworks/opt/mailcommon/res
+res_dir := $(chips_dir) $(mail_common_dir) res
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email)
LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra)
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8050442..801b20a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -57,6 +57,8 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index 90a86fd..4587673 100644
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -965,7 +965,8 @@
*
* Accesses the detabase to determine the mailbox type. DO NOT CALL FROM UI THREAD.
*/
- public static String buildMessageListSelection(Context context, long mailboxId) {
+ public static String buildMessageListSelection(
+ Context context, long accountId, long mailboxId) {
if (mailboxId == Mailbox.QUERY_ALL_INBOXES) {
return Message.ALL_INBOX_SELECTION;
@@ -979,8 +980,18 @@
if (mailboxId == Mailbox.QUERY_ALL_UNREAD) {
return Message.ALL_UNREAD_SELECTION;
}
+ // TODO: we only support per-account starred mailbox right now, but presumably, we
+ // can surface the same thing for unread.
if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) {
- return Message.ALL_FAVORITE_SELECTION;
+ if (accountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
+ return Message.ALL_FAVORITE_SELECTION;
+ }
+
+ final StringBuilder selection = new StringBuilder();
+ selection.append(MessageColumns.ACCOUNT_KEY).append('=').append(accountId)
+ .append(" AND ")
+ .append(Message.ALL_FAVORITE_SELECTION);
+ return selection.toString();
}
// Now it's a regular mailbox.
diff --git a/emailcommon/src/com/android/emailcommon/utility/Utility.java b/emailcommon/src/com/android/emailcommon/utility/Utility.java
index 8788372..0a698d4 100644
--- a/emailcommon/src/com/android/emailcommon/utility/Utility.java
+++ b/emailcommon/src/com/android/emailcommon/utility/Utility.java
@@ -279,7 +279,7 @@
}
}
private final static String HOSTAUTH_WHERE_CREDENTIALS = HostAuthColumns.ADDRESS + " like ?"
- + " and " + HostAuthColumns.LOGIN + " like ?"
+ + " and " + HostAuthColumns.LOGIN + " like ? ESCAPE '\\'"
+ " and " + HostAuthColumns.PROTOCOL + " not like \"smtp\"";
private final static String ACCOUNT_WHERE_HOSTAUTH = AccountColumns.HOST_AUTH_KEY_RECV + "=?";
@@ -295,8 +295,9 @@
public static Account findExistingAccount(Context context, long allowAccountId,
String hostName, String userLogin) {
ContentResolver resolver = context.getContentResolver();
+ String userName = userLogin.replace("_", "\\_");
Cursor c = resolver.query(HostAuth.CONTENT_URI, HostAuth.ID_PROJECTION,
- HOSTAUTH_WHERE_CREDENTIALS, new String[] { hostName, userLogin }, null);
+ HOSTAUTH_WHERE_CREDENTIALS, new String[] { hostName, userName }, null);
if (c == null) throw new ProviderUnavailableException();
try {
while (c.moveToNext()) {
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
deleted file mode 100644
index 2eca31c..0000000
--- a/res/drawable-hdpi/btn_star_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
deleted file mode 100644
index 99f317d..0000000
--- a/res/drawable-hdpi/btn_star_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_attachment_holo_light.png b/res/drawable-hdpi/ic_menu_attachment_holo_light.png
deleted file mode 100644
index 14e9a07..0000000
--- a/res/drawable-hdpi/ic_menu_attachment_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_check_holo_light.png b/res/drawable-hdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index 7dd8cfc..0000000
--- a/res/drawable-hdpi/ic_menu_check_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_help_holo_light.png b/res/drawable-hdpi/ic_menu_help_holo_light.png
deleted file mode 100644
index 8ce232c..0000000
--- a/res/drawable-hdpi/ic_menu_help_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index 951e59a..0000000
--- a/res/drawable-hdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-hdpi/list_conversation_wide_unread_focused_holo.9.png
deleted file mode 100644
index e521267..0000000
--- a/res/drawable-hdpi/list_conversation_wide_unread_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/banner_background_search.9.png b/res/drawable-mdpi/banner_background_search.9.png
deleted file mode 100644
index 0e5970e..0000000
--- a/res/drawable-mdpi/banner_background_search.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
deleted file mode 100644
index fe5fd35..0000000
--- a/res/drawable-mdpi/btn_star_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
deleted file mode 100644
index 96faed7..0000000
--- a/res/drawable-mdpi/btn_star_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_edit_holo_dark.png b/res/drawable-mdpi/ic_edit_holo_dark.png
deleted file mode 100644
index 66b595e..0000000
--- a/res/drawable-mdpi/ic_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gmail_draft.png b/res/drawable-mdpi/ic_gmail_draft.png
deleted file mode 100644
index 2392d6f..0000000
--- a/res/drawable-mdpi/ic_gmail_draft.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_check_holo_light.png b/res/drawable-mdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index ff4e4fe..0000000
--- a/res/drawable-mdpi/ic_menu_check_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_help_holo_light.png b/res/drawable-mdpi/ic_menu_help_holo_light.png
deleted file mode 100644
index f6be90a..0000000
--- a/res/drawable-mdpi/ic_menu_help_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_arrow_focused_holo.9.png b/res/drawable-mdpi/list_arrow_focused_holo.9.png
deleted file mode 100644
index 756bb9c..0000000
--- a/res/drawable-mdpi/list_arrow_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-mdpi/list_conversation_wide_unread_focused_holo.9.png
deleted file mode 100644
index c9b9ef8..0000000
--- a/res/drawable-mdpi/list_conversation_wide_unread_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/list_arrow_activated_holo.9.png b/res/drawable-sw600dp-mdpi/list_arrow_activated_holo.9.png
deleted file mode 100644
index 9092014..0000000
--- a/res/drawable-sw600dp-mdpi/list_arrow_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/banner_background_search.9.png b/res/drawable-sw600dp-xhdpi/banner_background_search.9.png
deleted file mode 100644
index 02fafa2..0000000
--- a/res/drawable-sw600dp-xhdpi/banner_background_search.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/list_arrow_focused_holo.9.png b/res/drawable-sw600dp-xhdpi/list_arrow_focused_holo.9.png
deleted file mode 100644
index b1b531f..0000000
--- a/res/drawable-sw600dp-xhdpi/list_arrow_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
deleted file mode 100644
index 0fd2eb8..0000000
--- a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
deleted file mode 100644
index b8fca38..0000000
--- a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png b/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png
deleted file mode 100644
index 4e4697a..0000000
--- a/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_check_holo_light.png b/res/drawable-xhdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index 4183025..0000000
--- a/res/drawable-xhdpi/ic_menu_check_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_light.png b/res/drawable-xhdpi/ic_menu_edit_holo_light.png
deleted file mode 100644
index d6f16f8..0000000
--- a/res/drawable-xhdpi/ic_menu_edit_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png b/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png
deleted file mode 100644
index dbd1b7b..0000000
--- a/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png
deleted file mode 100644
index f9b9254..0000000
--- a/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-sw600dp-v14/compose_subject.xml b/res/layout-sw600dp-v14/compose_subject.xml
index bb6b1f2..d809939 100644
--- a/res/layout-sw600dp-v14/compose_subject.xml
+++ b/res/layout-sw600dp-v14/compose_subject.xml
@@ -22,7 +22,7 @@
/>
<EditText
android:id="@+id/subject"
- style="@style/EmailComposeEditTextView"
+ style="@style/ComposeEditTextView"
android:inputType
="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
android:imeOptions="actionNext"
diff --git a/res/layout-sw600dp-v14/recipients_area.xml b/res/layout-sw600dp-v14/recipients_area.xml
index 6ad191f..e17712f 100644
--- a/res/layout-sw600dp-v14/recipients_area.xml
+++ b/res/layout-sw600dp-v14/recipients_area.xml
@@ -29,7 +29,7 @@
android:text="@string/message_compose_to_label"
/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/to" />
</LinearLayout>
@@ -52,7 +52,7 @@
android:text="@string/message_compose_cc_label"
/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/cc" />
</LinearLayout>
@@ -67,7 +67,7 @@
android:text="@string/message_compose_bcc_label"
/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/bcc" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout-v14/compose_subject.xml b/res/layout-v14/compose_subject.xml
index bf9e2d8..6bf44bc 100644
--- a/res/layout-v14/compose_subject.xml
+++ b/res/layout-v14/compose_subject.xml
@@ -17,7 +17,7 @@
style="@style/ComposeFieldLayout">
<!-- TODO: consolidate this style with ComposeSubjectStyle -->
<EditText android:id="@+id/subject"
- style="@style/EmailComposeEditTextView"
+ style="@style/ComposeEditTextView"
android:hint="@string/message_compose_subject_hint"
android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
android:textColorHint="@color/compose_label_text"
diff --git a/res/layout-v14/message_compose_body.xml b/res/layout-v14/message_compose_body.xml
index 726964b..8423e1f 100644
--- a/res/layout-v14/message_compose_body.xml
+++ b/res/layout-v14/message_compose_body.xml
@@ -18,6 +18,7 @@
<EditText android:id="@+id/message_content"
style="@style/LargeComposeAreaBody"
+ android:hint="@string/message_compose_body_hint"
/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v14/recipients_area.xml b/res/layout-v14/recipients_area.xml
index 56dc652..51cfa05 100644
--- a/res/layout-v14/recipients_area.xml
+++ b/res/layout-v14/recipients_area.xml
@@ -36,7 +36,7 @@
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/to" />
</LinearLayout>
@@ -65,7 +65,7 @@
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/cc" />
</LinearLayout>
@@ -86,7 +86,7 @@
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
- style="@style/EmailRecipientEditTextView"
+ style="@style/RecipientEditTextViewStyle"
android:id="@+id/bcc" />
</LinearLayout>
diff --git a/res/layout/compose_subject.xml b/res/layout/compose_subject.xml
index cb7d22b..d39e45e 100644
--- a/res/layout/compose_subject.xml
+++ b/res/layout/compose_subject.xml
@@ -15,5 +15,5 @@
-->
<EditText xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subject"
- style="@style/ComposeSubjectStyle"
+ style="@style/ComposeEditTextView"
/>
\ No newline at end of file
diff --git a/res/layout/message_compose_body.xml b/res/layout/message_compose_body.xml
index fb3c438..54dd1e5 100644
--- a/res/layout/message_compose_body.xml
+++ b/res/layout/message_compose_body.xml
@@ -16,4 +16,5 @@
<EditText xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/message_content"
style="@style/ComposeBodyStyle"
+ android:hint="@string/message_compose_body_hint"
/>
\ No newline at end of file
diff --git a/res/layout/recipients_area.xml b/res/layout/recipients_area.xml
index d765c68..a43d233 100644
--- a/res/layout/recipients_area.xml
+++ b/res/layout/recipients_area.xml
@@ -22,7 +22,7 @@
android:layout_marginRight="6dip">
<RelativeLayout
- style="@style/ComposeFieldLinearLayout"
+ style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
@@ -50,7 +50,7 @@
android:visibility="gone">
<RelativeLayout
- style="@style/ComposeFieldLinearLayout"
+ style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/cc_content">
@@ -69,7 +69,7 @@
</RelativeLayout>
<RelativeLayout
- style="@style/ComposeFieldLinearLayout"
+ style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/bcc_content">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ee7dcc0..0114da8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Onderwerp:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Skryf e-pos"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Skryf e-pos"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oorspronklike boodskap --------"\n"Onderwerp: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Van: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Aan: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> het geskryf:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Aangehaalde teks"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Wys details"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Boodskapbesonderhede"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Aanhegsel-inligting"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi-konneksie benodig"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi-instellings"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-verbinding vereis"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi-instellings"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Program-instellings"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Kan nie aanhegsel oopmaak nie."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Jy kan nie hierdie lêer stoor of oopmaak nie, want hierdie tipe aanhegsel kan kwaadwillige sagteware bevat."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Hierdie aanhegsel kan nie gestoor of oopgemaak word nie, weens hierdie rekening se sekuriteitsbeleid."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Hierdie aanhegsel is te groot om op \'n mobiele netwerk af te laai. Jy kan dit aflaai wanneer jy weer aan \'n WiFi-netwerk gekoppel is."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Hierdie aanhegsel is te groot om op \'n mobiele netwerk af te laai. Jy kan dit aflaai wanneer jy weer aan \'n Wi-Fi-netwerk gekoppel is."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Daar is geen geïnstalleerde program wat hierdie aanhegsel kan oopmaak nie. Probeer om \'n toepaslike program af te laai van Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Hierdie aanhegsel is \'n program. Jy moet \"Onbekende bronne\" in Instellings > Programme kontroleer, voordat jy dit kan installeer."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Programme kan nie direk vanaf e-pos geïnstalleer word nie. Stoor eers hierdie program en installeer dit dan met behulp van die \"Aflaaisels\"-program."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Boodskap weggegooi."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Boodskap as konsep gestoor."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Kan nie die aanhegsel vertoon nie."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Kon nie die aanhegsel \"<xliff:g id="FILENAME">%s</xliff:g>\" laai nie."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan nie aanhegsel wys nie."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kon nie aanhegsel \"<xliff:g id="FILENAME">%s</xliff:g>\" laai nie."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Open tans boodskap..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> boodskap geskuif na <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kon een of meer aanhegsels nie aanstuur nie"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Aanhegsel nie aangestuur nie"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>-aanmelding het misluk"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Aanmelding het misluk"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Kan nie aanmeld nie"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniseer kontakte uit hierdie rekening."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniseer kalender vanaf hierdie rekening."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinkroniseer e-pos vanaf hierdie rekening."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Laai aanhegsels outomaties af wanneer aan WiFi gekoppel is"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Laai aanhegsels outomaties af wanneer aan Wi-Fi gekoppel is"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kon nie voltooi word nie"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dae om te sinkroniseer"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Outomaties"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Die gebruikernaam of wagwoord vir <xliff:g id="ACCOUNT">%s</xliff:g> is verkeerd. Dateer hulle nou op?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Verstek rekening"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Stuur e-pos by verstek vanaf hierdie rekening"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Laai aanhegsels outomaties af"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Laai aanhegsels outomaties af wanneer aan WiFi gekoppel is"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Laai aanhegsels af"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Laai aanhegsels outomaties af na onlangse boodskappe via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-poskennisgewings"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sinkroniseerfrekwensie, kennisgewings, ens."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Wys in statusbalk wanneer e-pos aankom"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Reusagtig"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Antwoord almal"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Maak \"Antwoord almal\" die verstek vir reageer op boodskappe"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Laai verstek vir \"Wys prente\" terug"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Laai verstek terug vir alle senders (moenie prente outomaties wys nie)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Wys prente\" is uitgevee."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Maak \"Antwoord-aan-almal\" die verstek opsie vir boodskapantwoorde"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vra om prente te wys"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Prente in boodskappe sal nie outomaties gewys word nie"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Wys prente\" uitgevee."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wag vir sinkronisasie"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jou e-posadres sal binnekort verskyn."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Raak ikoon om te verander."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Gekombineerde inkassie"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ongelees"</string>
<string name="widget_starred" msgid="8290352707134011791">"Gester"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 4c3f54e..cde79d0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"ካርቦን ቅጂ"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"ስውር ካርቦን ቅጂ፡"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"ርዕሰ ነገር:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"የደብዳቤ ፅሁፍ አዘጋጅ"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"ኢሜይል ፃፍ"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"----------- ዋና መልዕክት---------"\n"ጉዳዩ፡<xliff:g id="SUBJECT">%1$s</xliff:g>"\n" ከ፡<xliff:g id="SENDER">%2$s</xliff:g>"\n"ለ፡<xliff:g id="TO">%3$s</xliff:g>"\n"<xliff:g id="CC_0">%4$s</xliff:g>"\n" ካርቦን ቅጂ፡"\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>ፃፈ፡"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"ትዕምርተ ጥቅስ ያለበት"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"ዝርዝሮቹን አሳይ"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"የመልዕክት ዝርዝሮች"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"የአባሪ መረጃ"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi ግንኙነት ያስፈልጋል"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"የWiFi ቅንጅቶች"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"የWi-Fi ተያያዥ ይጠበቃል"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"የWi-Fi ቅንብሮች"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"መተግበሪያ ቅንጅቶች"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"አባሪ መክፈት አልተቻለም።"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"እንዲህ ዓይነቱ ዓባሪ ተንኮል አዘል ሶፍትዌር ሊይዝ ስለሚችል ይህን ፋይል ማስቀመጥ ሆነ መክፈት አትችልም::"</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"በዚህ መለያ የደህንነት ቋሚ መመሪያዎች የተነሳ ይህ ዓባሪ ሊቀመጥ ሆነ ሊከፈት አይችልም::"</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"ይህን አባሪ በተንቀሳቃሽ ስልክ አውታረመረብ ላይ ለማውረድ ከልክ በላይ በጣም ትልቅ ነው። በሚቀጥለው ጊዜ ወደWi-Fi አውታረመረብ ሲያያዝ ማውረድ ትችላለህ።"</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"ይህ አባሪ በተንቀሳቃሽ ስልክ አውታረመረብ ላይ ለማውረድ በጣም ትልቅ ነው። ቀጥሎ ወደWi-Fi አውታረመረብ ሲያያዝ ማውረድ ይችላሉ።"</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"ይህን ዓባሪ መክፈት የሚችል ምንም የተገጠመ መተግበሪያ የለም:: ከAndroid Market ተገቢነት ያለውን መተግበሪያ ለማውረድ ሞክር::"</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"ይህ ዓባሪ መተግበሪያ ነው:: መጫን ከመቻልህ በፊት በቅንጅቶች > መተግበሪያዎች ላይ ያልታወቁ ምንጮች የሚለው ላይ ምልክት ማድረግ አለብህ::"</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"መተግበሪያ ከኢሜይል በቀጥታ ሊጫን አይችልም:: በመጀመሪያ ይህን መተግበሪያ አስቀምጠውና በመቀጠል መተግበሪያ አውርዶችን በመጠቀም ጫነው::"</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"መልዕክት ተወግዷል።"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"መልዕክትእንደረቂቅ ተቀምጧል።"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"ዓባሪውን ማሳየት አይቻልም::"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"ዓባሪ \" <xliff:g id="FILENAME">%s</xliff:g>\"ን መስቀል አልተቻለም::"</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ዓባሪውን ማሳየት አይቻልም::"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"ዓባሪ \" <xliff:g id="FILENAME">%s</xliff:g>\"ን መስቀል አልተቻለም::"</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"መልዕክት በመክፈት ላይ...."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> መልዕክት ወደ<xliff:g id="MAILBOX_NAME">%2$s</xliff:g> ዞርዋል"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"አንድ ወይም ከዛ በላይ ዓባሪዎችን ለማስተላለፍ አልተቻለም::"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"አባሪ አልተላለፈም"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> በመለያ መግባት ተሰናክሏል::"</string>
- <string name="login_failed_title" msgid="791871543602843876">"በመለያ መግባት ተሰናክሏል"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"በመለያ መግባት አልተቻለም፡፡"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ከዚህ መለያ ዕውቂያዎች አሳምር"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ከዚህ መለያ የቀን አቆጣጠር አሳምር።"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ከዚህ መለያ ኢሜይል አሳምር።"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ማጠናቀቅ አልተቻለም"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ቀኖች አሳምር"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ራስ ሰር"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">" የ<xliff:g id="ACCOUNT">%s</xliff:g> ተጠቃሚ ስም ወይም ይለፍቃል የተሳሳተ ነው። አሁን ይዘምኑ?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"ነባሪ መለያ"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"አባሪዎችን በራስ-አውርድ"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"አባሪዎችን አውርድ"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ራስሰር-አውርድ አባሪዎች ወደ በቅርብ ጊዜ በWi-Fi የተላኩ መልዕክቶች"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"የኢሜይል ማሳወቂያ"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"ድግግሞሽ፣ ማሳወቂያዎች፣ ወዘተ አሳምር።"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"ኢሜይል ሲደርስ በሁኔታ አሞሌ ውስጥ አሳውቅ"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ትልቅ"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ግዙፍ"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"ለሁሉም ምላሽ ስጥ"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"ለመልዕክቶች ለመመለስ \'ለሁሉም መልስ\'ን ነባሪ አድርግ"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"ለ\"ምስሎችን አሳይ\" ነባሪ እነበረበት መልስ"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"ለሁሉም ላኪዎች(ፎቶዎችን በራስ ሰር አታሳይ) ነባሪ እነበረበት መልስ"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"ስዕሎች አሳይ\" ጠርቷል::"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"“ለሁሉም መልስ”ን ለመልዕክት መልሶች ነባሪ አድርግ"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"ስዕሎችን ለማሳየት ጠይቅ"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"በመልዕክቶች ውስጥ ስዕሎች በራስሰር አይታዩም፡፡"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"ፎቶዎች አሳይ\" ጠርቷል።"</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ከ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"አስምር በመጠበቅ ላይ"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ያንተ ኢሜይል በቅርቡ ብቅ ይላል::"</string>
- <string name="widget_other_views" msgid="4988574907386539499">"ለመለወጥ አዶ ንካ::"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"የተቀላቀለ ገቢ መልዕክት"</string>
<string name="widget_unread" msgid="4404711399009077833">"ያልተነበበ"</string>
<string name="widget_starred" msgid="8290352707134011791">"ኮከብ የተደረገባቸው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 757af92..3a27132 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"نسخة إلى:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"نسخة مخفية الوجهة:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"الموضوع:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"إنشاء رسالة"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"إنشاء رسالة إلكترونية"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- الرسالة الأصلية --------"\n"الموضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"من: <xliff:g id="SENDER">%2$s</xliff:g>"\n"إلى: <xliff:g id="TO">%3$s</xliff:g>"\n"نسخة إلى: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> كتَب:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"نص مقتبس"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"عرض التفاصيل"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"تفاصيل الرسالة"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"معلومات المرفق"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"اتصال WiFi مطلوب"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"إعدادات WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"يلزم اتصال بشبكة Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"إعدادات Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"إعدادات التطبيق"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"لا يمكن فتح المرفق."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"لا يمكنك حفظ هذا الملف أو فتحه لأن هذا النوع من المرفقات قد يحتوي على برامج ضارة."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"لا يمكن حفظ هذا المرفق أو فتحه بسبب سياسات أمان هذا الحساب."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"هذا المرفق كبير جدًا بحيث لا يمكن تنزيله عبر شبكة جوال. يمكنك تنزيله في المرة التالية التي تتصل فيها بشبكة WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"هذا المرفق كبير جدًا بحيث لا يمكن تنزيله عبر شبكة جوال. يمكنك تنزيله في المرة التالية التي تتصل فيها بشبكة Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"ليس هناك تطبيق مثبت يمكنه فتح هذا المرفق. حاول تنزيل تطبيق مناسب من Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"هذا المرفق تطبيق. يجب تحديد \"مصادر غير معروفة\" في الإعدادات > التطبيقات حتى تتمكن من تثبيته."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"لا يمكن تثبيت التطبيق مباشرة من الرسالة الإلكترونية. احفظ أولاً هذا التطبيق ثم ثبته باستخدام تطبيق التنزيلات."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"تمّ إلغاء الرسالة."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"تمّ حفظ الرسالة كمسودة."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"لا يمكن عرض المرفق."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"تعذر تحميل المرفق \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"لا يمكن عرض المرفق."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"تعذر تحميل المرفق \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"جارٍ فتح الرسالة…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"تم نقل رسالة <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> إلى <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"تتعذر إعادة توجيه واحد أو أكثر من المرفقات."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"لم تتم إعادة توجيه المرفق"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"أخفق تسجيل الدخول إلى <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"أخفق تسجيل الدخول"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"تعذر تسجيل الدخول"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"مزامنة جهات الاتصال من هذا الحساب."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"مزامنة التقويم من هذا الحساب أيضًا."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"مزامنة البريد الإلكتروني من هذا الحساب"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"تنزيل المرفقات تلقائيًا عند الاتصال بشبكة WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"تنزيل المرفقات تلقائيًا عند الاتصال بشبكة Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"تعذر الإنهاء"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"الأيام المطلوب مزامنتها"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"تلقائي"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"اسم المستخدم أو كلمة مرور <xliff:g id="ACCOUNT">%s</xliff:g> غير صحيحة. هل تريد التحديث الآن؟"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"الحساب الافتراضي"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"تنزيل تلقائي للمرفقات"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"تنزيل المرفقات تلقائيًا عند الاتصال بشبكة WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"تنزيل المرفقات"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"تنزيل مرفقات الرسائل الأخيرة تلقائيًا عبر WiFi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"إشعارات البريد إلكتروني"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"معدل المزامنة والتنبيهات وما إلى ذلك"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"التنبيه في شريط النظام عند استلام رسالة إلكترونية"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"كبير"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ضخم"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"الرد على الكل"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"جعل \"الرد على الكل\" هو الإعداد الافتراضي للرد على الرسائل"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"استعادة الإعداد الافتراضي لـ \"إظهار الصور\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"استعادة الإعداد الافتراضي لجميع المرسلين (عدم إظهار الصور تلقائيًا)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"تم إلغاء تحديد \"إظهار الصور\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"جعل \"الرد على الكل\" هو الإعداد الافتراضي للرد على الرسائل"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"طلب عرض الصور"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"لن يتم عرض الصور الواردة في الرسائل تلقائيًا"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"تم إلغاء تحديد \"إظهار الصور\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> من <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"في انتظار المزامنة"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ستظهر رسالتك الإلكترونية قريبًا."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"المس الرمز للتغيير."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"بريد وارد مجمّع"</string>
<string name="widget_unread" msgid="4404711399009077833">"غير مقروءة"</string>
<string name="widget_starred" msgid="8290352707134011791">"الرسائل المميزة بنجمة"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8fad9fd..ab6c4d9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Як:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Ск:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Ново съобщение"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Напишете имейл"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригинално съобщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"До: <xliff:g id="TO">%3$s</xliff:g>"\n"Як: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> написа:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитиран текст"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Показване на подробностите"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Подробности за съобщението"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Информация за прикачения файл"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Изисква се връзка с WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Настройки за WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Изисква се връзка с Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Настройки за Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Настройки за приложения"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Прикаченият файл не може да се отвори."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Не можете да запазите или отворите прикачения файл, защото е възможно този тип да съдържа злонамерен софтуер."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Прикаченият файл не може да бъде запазен или отворен поради правилата за сигурност на този профил."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Прикаченият файл е твърде голям за изтегляне през мобилна мрежа. Можете да го изтеглите при следващото си свързване с WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Прикаченият файл е твърде голям за изтегляне през мобилна мрежа. Можете да го изтеглите при следващото си свързване с Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Няма инсталирано приложение, което може да отвори този прикачен файл. Опитайте да изтеглите подходящо от Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Този прикачен файл е приложение. Трябва да отметнете „Неизвестни източници“ в „Настройки“ > „Приложения“, преди да можете да го инсталирате."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Приложенията не могат да бъдат инсталирани директно от електронната поща. Първо запазете това приложение и след това го инсталирайте посредством приложението Изтегляния."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Съобщението е отхвърлено."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Съобщението е запазено като чернова."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Прикаченият файл не може да се покаже."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Прикаченият файл „<xliff:g id="FILENAME">%s</xliff:g>“ не можа да се зареди."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Прикаченият файл не може да се покаже."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Прикаченият файл „<xliff:g id="FILENAME">%s</xliff:g>“ не можа да се зареди."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Съобщението се отваря…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> съобщение е преместено в/ъв <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Един или повече прикачени файла не можаха да се препратят."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Прикаченото не бе препратено"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Не влязохте: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Влизането не бе успешно"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Не можах да вляза в профила си"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизиране на контактите в този профил."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизиране на календара в този профил."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхрон на имейлите от този профил"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Прикачените файлове да се изтеглят автоматично при връзка с WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматично изтегляне на прикачените файлове при връзка с Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не можа да завърши"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Дни за синхронизиране"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматично"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Потребителското име или паролата за <xliff:g id="ACCOUNT">%s</xliff:g> не са правилни. Искате ли да ги актуализирате сега?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Основен профил"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Изпращане на имейл от този профил по подразбиране"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Автоизтегляне на прикачените"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Автоматично изтегляне на прикачените файлове при връзка с WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Изтегляне на прикачените файлове"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоизтегляне на прик. файлове към скорошни съобщения през Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Известия за имейл"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Честота на синхронизиране, известия и т.н."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Известие в системната лента при получаване на имейл"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Голям"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромен"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Отговор до всички"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"„Отговор до всички“ да е стандартната опция при отговор на съобщения"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Възстановяване на стандартните настройки за „Показване на снимките“"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Възстановяване на стандартните настройки за всички податели (снимките да не се показват автоматично)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"„Показване на снимките“ бе изчистено."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"„Отговор до всички“ да е стандартната опция при отговор на съобщения"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Питане дали снимките да се показват"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Снимките в съобщенията няма да бъдат показвани автоматично"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Показване на снимките“ е изчистено."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> от <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Изчаква се синхронизиране"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Имейлът ви ще се покаже скоро."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Докосн. за промяна."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Комбинирана вх. поща"</string>
<string name="widget_unread" msgid="4404711399009077833">"Непрочетени"</string>
<string name="widget_starred" msgid="8290352707134011791">"Със звезда"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c1165b8..28461f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Cco:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Assumpte:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Redacta"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Redacta un correu electrònic"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Missatge original --------"\n"Assumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Per a: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha escrit:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text citat"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostra detalls"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalls del missatge"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informació del fitxer adjunt"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Cal una connexió Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Configuració de Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Cal una connexió Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Configuració Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Configuració d\'aplicació"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"No es pot obrir el fitxer adjunt."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"No pots desar ni obrir aquest fitxer perquè és possible que aquest tipus de fitxer adjunt contingui programari maliciós."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Aquest fitxer adjunt no es pot desar o no es pot obrir a causa de les polítiques de seguretat d\'aquest compte."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Aquest fitxer adjunt és massa gran per baixar-lo a través d\'una xarxa de telefonia mòbil. Podràs baixar-lo la propera vegada que et connectis a una xarxa Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Aquest fitxer adjunt és massa gran per baixar-lo a través d\'una xarxa de telefonia mòbil. Podràs baixar-lo la propera vegada que et connectis a una xarxa Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"No hi ha cap aplicació instal·lada que pugui obrir aquest fitxer adjunt. Prova de baixar una aplicació adequada d\'Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Aquest fitxer adjunt és una aplicació. Has de seleccionar Fonts desconegudes a Configuració > Aplicacions per instal·lar-la."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Les aplicacions no poden instal·lar-se directament des del correu electrònic. Primer has de desar l\'aplicació i, a continuació, instal·lar-la mitjançant l\'aplicació Baixades."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Missatge descartat."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Missatge desat com a esborrany."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"No es pot mostrar el fitxer adjunt."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"No s\'ha pogut carregar el fitxer adjunt \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No es pot mostrar el fitxer adjunt."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No s\'ha pogut carregar el fitxer adjunt \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"S\'està obrint el missatge..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatge mogut a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"No s\'han pogut reenviar un o més fitxers adjunts."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"El fitxer adjunt no s\'ha reenviat"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"L\'inici de sessió de <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ha fallat."</string>
- <string name="login_failed_title" msgid="791871543602843876">"L\'inici de sessió ha fallat"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"No es pot iniciar la sessió"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronitza els contactes d\'aquest compte."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronitza el calendari d\'aquest compte."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronitza el correu electrònic d\'aquest compte."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Baixa fitxers adjunts automàticament quan hi hagi una connexió Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa automàticament els fitxers adjunts en connectar-te a Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No s\'ha pogut acabar"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dies per sincronitzar"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automàtic"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nom d\'usuari o la contrasenya de <xliff:g id="ACCOUNT">%s</xliff:g> són incorrectes. Vols actualitzar-los ara?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Compte predeterminat"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Baixada autom. fitxers adjunts"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Baixa fitxers adjunts automàticament quan hi hagi connexió Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Baixada de fitxers adjunts"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Baixa automàtic. fitxers adjunts de missatges recents per Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacions de correu electrònic"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Freqüència de sincronització, notificacions, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica a la barra del sistema quan arribi un correu electrònic"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Gran"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Respon a tots"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Defineix \"Respon a tots\" com a opció predeterminada per respondre missatges"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaura el valor predeterminat de \"Mostra les imatges\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaura el valor predeterminat de tots els remitents (no mostris les fotos automàticament)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"S\'ha esborrat \"Mostra imatges\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Fes que \"Respon a tots\" sigui l\'opció predet. per respondre missatges"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pregunta per mostrar imatges"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"No es mostraran automàticament les imatges dels missatges"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"S\'ha esborrat \"Mostra les imatges\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"S\'està esperant per sincronitzar"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"El teu correu electrònic apareixerà aviat."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Toca la icona per canviar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Safata d\'entrada combinada"</string>
<string name="widget_unread" msgid="4404711399009077833">"No llegits"</string>
<string name="widget_starred" msgid="8290352707134011791">"Destacats"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5163de9..e6f2b64 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopie:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Skrytá:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Předmět:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Napsat e-mail"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Napsat e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Původní zpráva --------"\n"Předmět: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odesílatel: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopie: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napsal/a:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text v uvozovkách"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Zobrazit podrobnosti"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Podrobnosti zprávy"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informace o příloze"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Je vyžadováno připojení Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Nastavení Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Je požadováno připojení Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Nastavení Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Nastavení aplikace"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Přílohu nelze otevřít."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Tento soubor nemůžete uložit ani otevřít, protože tento typ přílohy může obsahovat škodlivý software."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Tuto přílohu nelze uložit ani otevřít kvůli zásadám zabezpečení účtu."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Tato příloha je na stažení prostřednictvím mobilní sítě příliš velká. Můžete ji stáhnout při příštím připojení k síti Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Tato příloha je příliš velká, aby ji bylo možné stáhnout pomocí mobilní sítě. Můžete ji stáhnout při příštím připojení k síti Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nemáte nainstalovanou žádnou aplikaci, která by dokázala tuto přílohu otevřít. Zkuste příslušnou aplikaci stáhnout ze služby Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Tato příloha je aplikace. Chcete-li ji nainstalovat, zaškrtněte nejdříve v části Nastavení > Aplikace možnost Neznámé zdroje."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikace nelze instalovat přímo z e-mailu. Nejdříve aplikaci uložte a poté ji nainstalujte pomocí aplikace Stahování."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zrušena."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Zpráva byla uložena jako koncept."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Přílohu nelze zobrazit."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Přílohu <xliff:g id="FILENAME">%s</xliff:g> nelze načíst."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Přílohu nelze zobrazit."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Přílohu <xliff:g id="FILENAME">%s</xliff:g> nelze načíst."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otevírání zprávy..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> zpráva byla přesunuta do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodařilo se přeposlat jednu nebo více příloh."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Příloha nebyla přeposlána"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Přihlášení selhalo: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Přihlášení selhalo"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Přihlášení se nezdařilo."</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovat kontakty z tohoto účtu."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovat kalendář z tohoto účtu."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizovat e-mail z tohoto účtu."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Během připojení k síti Wi-Fi automaticky stahovat přílohy"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Během připojení k síti Wi-Fi automaticky stahovat přílohy"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nelze dokončit"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Počet dní k synchronizaci"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatické"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uživatelské jméno nebo heslo pro účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávné. Chcete údaje aktualizovat?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Výchozí účet"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automaticky stahovat přílohy"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Během připojení k síti Wi-Fi automaticky stahovat přílohy"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stáhnout přílohy"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky stahovat přílohy posledních zpráv pomocí sítě Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailová upozornění"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frekvence synchronizace, oznámení apod."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Oznámit příchod e-mailu na systémové liště"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velký"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovědět všem"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Nastavit volbu Odpovědět všem jako výchozí volbu odpovídání na zprávy"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnovit výchozí nastavení možnosti Zobrazovat obrázky"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnovit výchozí nastavení pro všechny odesílatele (nezobrazovat obrázky automaticky)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Nastavení Zobrazit obrázky bylo smazáno."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastavit volbu Odpovědět všem jako výchozí volbu odpovídání na zprávy"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Dotazovat se na zobrazování obrázků"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky ve zprávách se automaticky nezobrazí"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavení Zobrazit obrázky bylo smazáno."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekání na synchronizaci"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaše e-maily se brzy zobrazí."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Změníte klepnutím na ikonu."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Všechny Doručené p."</string>
<string name="widget_unread" msgid="4404711399009077833">"Nepřečtené"</string>
<string name="widget_starred" msgid="8290352707134011791">"S hvězdičkou"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 87e9f3a..b403382 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Emne:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv mail"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Skriv e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------"\n"Emne: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Til: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Vis detaljer"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Beskedoplysninger"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Oplysninger om vedhæftet fil"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Der kræves en Wi-Fi-forbindelse"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Indstillinger for Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-forbindelse kræves"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Indstillinger for Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Indstillinger for app"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Vedhæftet fil kan ikke åbnes."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Du kan ikke gemme eller åbne denne fil, fordi denne type vedhæftede fil kan indeholde skadelig software."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Denne vedhæftede fil kan ikke gemmes eller åbnes på grund af sikkerhedspolitikken på denne konto."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Denne vedhæftede fil er for stor til at blive downloadet via mobilnetværket. Du kan downloade den, næste gang du får forbindelse til et Wi-Fi-netværk."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Denne vedhæftede fil er for stor til at blive downloadet via mobilnetværket. Du kan downloade den, næste gang du har forbindelse til et Wi-Fi-netværk."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Der er ikke installeret en app, der kan åbne denne vedhæftede fil. Prøv at downloade en passende app på Android Marked."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Denne vedhæftede fil er en app. Du skal markere Ukendte kilder i Indstillinger > Apps, før du kan installere den."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apps kan ikke installeres direkte fra e-mails. Du skal først gemme denne app og derefter installere den ved hjælp af appen Downloads."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Besked kasseret."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Beskeden er gemt som kladde."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Den vedhæftede fil kan ikke vises."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Den vedhæftede fil \"<xliff:g id="FILENAME">%s</xliff:g>\" kunne ikke indlæses."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Den vedhæftede fil kan ikke vises."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Den vedhæftede fil \"<xliff:g id="FILENAME">%s</xliff:g>\" kunne ikke indlæses."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Åbner besked..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> beskeder er flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Vedhæftet fil er ikke sendt"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Login mislykkedes"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Login mislykkedes"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontaktpersoner fra denne konto."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalender fra denne konto."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkroniser e-mail fra denne konto."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Download automatisk vedhæftede filer, når der er forbindelse til Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Download vedhæftede filer automatisk, når forbundet til Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kunne ikke afsluttes"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dage, der skal synkroniseres"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Send e-mail fra denne konto som standard"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automatisk download"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Download automatisk vedhæftede filer ved Wi-Fi-forbindelse"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftede filer"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i de seneste beskeder via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsinterval, meddelelser osv."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Underret i statuslinjen, når der kommer e-mail"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kæmpestor"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Gør \"Svar alle\" til standard, når du besvarer beskeder"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Gendan standard for \"Vis billeder\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Gendan standard for alle afsendere (vis ikke billeder automatisk)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Vis billeder\" blev ryddet."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gør \"Svar alle\" til standardsvar for meddelelser"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Bed om at vise billeder"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Billeder i meddelelser vises ikke automatisk"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Vis billeder\" er ryddet."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Dine e-mails dukker snart op."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Tryk for at skifte."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombineret indbakke"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ulæste"</string>
<string name="widget_starred" msgid="8290352707134011791">"Stjernemarkeret"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 535cab6..2ebbbff 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Betreff:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"E-Mail schreiben"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"E-Mail schreiben"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Originalnachricht --------"\n"Betreff: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Von: <xliff:g id="SENDER">%2$s</xliff:g>"\n"An: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> schrieb:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Zitierter Text"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Details anzeigen"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Nachrichtendetails"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informationen zum Anhang"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WLAN-Verbindung erforderlich"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WLAN-Einstellungen"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"WLAN-Verbindung erforderlich"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"WLAN-Einstellungen"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"App-Einstellungen"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Anhang kann nicht geöffnet werden."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, da diese Art von Anhang möglicherweise schädliche Software enthält."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Dieser Anhang kann aufgrund der Sicherheitsrichtlinien dieses Kontos nicht gespeichert oder geöffnet werden."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Dieser Anhang ist zu groß, um ihn über ein Mobilfunknetz herunterzuladen. Sie können ihn herunterladen, sobald Sie das nächste Mal mit einem WLAN-Netzwerk verbunden sind."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Dieser Anhang ist zu groß, um ihn über ein Mobilfunknetz herunterzuladen. Sie können ihn herunterladen, sobald Sie das nächste Mal mit einem WLAN-Netzwerk verbunden sind."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Sie verfügen über keine App, mit der Sie diesen Anhang öffnen können. Laden Sie eine entsprechende App von Android Market herunter."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Dieser Anhang ist eine App. Aktivieren Sie \"Unbekannte Quellen\" unter \"Einstellungen\" > \"Apps\", damit Sie die App installieren können."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apps können nicht direkt aus E-Mails installiert werden. Speichern Sie diese App zuerst und installieren Sie sie dann mithilfe der App \"Downloads\"."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Nachricht gelöscht"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Nachricht als Entwurf gespeichert"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Anhang kann nicht angezeigt werden."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Anhang \"<xliff:g id="FILENAME">%s</xliff:g>\" kann nicht geladen werden."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Anhang kann nicht angezeigt werden."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Anhang \"<xliff:g id="FILENAME">%s</xliff:g>\" kann nicht geladen werden."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Nachricht wird geöffnet..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachricht verschoben in: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Anhang nicht weitergeleitet"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Fehler beim Anmelden in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Fehler bei Anmeldung"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Anmeldung nicht möglich"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Kontakte dieses Kontos synchronisieren"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Kalender dieses Kontos synchronisieren"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-Mails dieses Kontos synchronisieren"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automatischer Download von Anhängen bei WLAN-Verbindung"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Anhänge bei WLAN-Verbindung automatisch herunterladen"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Fertigstellen nicht möglich"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Zu synchronisierende Tage"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Der Nutzername oder das Passwort für <xliff:g id="ACCOUNT">%s</xliff:g> ist falsch. Jetzt aktualisieren?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"E-Mails standardmäßig von diesem Konto senden"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Anhänge autom. herunterladen"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatischer Download von Anhängen bei WLAN-Verbindung"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Anhänge herunterladen"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Anhänge neuer Nachrichten automatisch über WLAN herunterladen"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-Mail-Benachrichtigung"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synchronisierungshäufigkeit, Benachrichtigungen usw."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Bei E-Mail-Eingang Benachrichtigung in der Systemleiste"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groß"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen antworten"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Bilderanzeige zurücksetzen"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Auf Standardeinstellung für alle Absender zurücksetzen (Bilder nicht automatisch anzeigen)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Bilder anzeigen\" wurde gelöscht."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Anzeige der Bilder anfordern"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder in E-Mails werden nicht automatisch angezeigt."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bilder anzeigen\" gelöscht"</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Warten auf Synchronisierung"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ihre E-Mail wird in Kürze angezeigt."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Symbol zum Wechseln berühren."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombinierter Posteingang"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ungelesen"</string>
<string name="widget_starred" msgid="8290352707134011791">"Markiert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 00e4790..a79300a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Κοιν.:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Κρυφή κοιν.:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Θέμα:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Σύνθεση μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Συντάξτε μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Αρχικό μήνυμα --------"\n"Θέμα: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Από: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Προς: <xliff:g id="TO">%3$s</xliff:g>"\n"Κοιν.: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Ο χρήστης <xliff:g id="SENDER">%s</xliff:g> έγραψε:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Αναφερόμενο κείμενο"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Εμφάνιση λεπττομερειών"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Λεπτομέρειες μηνύματος"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Πληροφορίες επισύναψης"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Απαιτείται σύνδεση WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Ρυθμίσεις WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Απαιτείται σύνδεση Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Ρυθμίσεις Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Ρυθμίσεις εφαρμογής"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Δεν είναι δυνατό το άνοιγμα της επισύναψης."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Δεν μπορείτε να αποθηκεύσετε ή να ανοίξετε αυτό το αρχείο επειδή αυτός ο τύπος επισύναψης ενδέχεται να περιέχει κακόβουλο λογισμικό."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Δεν είναι δυνατή η αποθήκευση ή το άνοιγμα αυτής της επισύναψης εξαιτίας των πολιτικών ασφάλειας αυτού του λογαριασμού."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Υπερβολικά μεγάλο μέγεθος επισύναψης για λήψη μέσω δικτύου κινητής τηλεφωνίας. Μπορείτε να πραγματοποιήσετε λήψη της επισύναψης την επόμενη φορά που θα συνδεθείτε σε δίκτυο WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Το μέγεθος αυτής της επισύναψης είναι πολύ μεγάλο για τη λήψη μέσω δικτύου κινητής τηλεφωνίας. Μπορείτε να πραγματοποιήσετε λήψη της επισύναψης την επόμενη φορά που θα συνδεθείτε σε δίκτυο Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Δεν υπάρχει καμία εγκατεστημένη εφαρμογή η οποία να μπορεί να ανοίξει αυτήν την επισύναψη. Δοκιμάστε να κάνετε λήψη μιας κατάλληλης εφαρμογής από το Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Αυτή η επισύναψη είναι εφαρμογή. Θα πρέπει να επιλέξετε τις \"Άγνωστες προελεύσεις\" από το μενού Ρυθμίσεις > Εφαρμογές προτού την εγκαταστήσετε."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Δεν είναι δυνατή η αποθήκευση εφαρμογών απευθείας από το ηλεκτρονικό ταχυδρομείο. Αποθηκεύστε πρώτα αυτήν την εφαρμογή και έπειτα εγκαταστήστε την χρησιμοποιώντας την εφαρμογή \"Λήψεις\"."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Το μήνυμα απορρίφθηκε."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Δεν είναι δυνατή η εμφάνιση της επισύναψης."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Δεν ήταν δυνατή η φόρτωση της επισύναψης \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Δεν είναι δυνατή η εμφάνιση του συνημμένου."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Δεν ήταν δυνατή η φόρτωση του συνημμένου \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Άνοιγμα μηνύματος…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> μήνυμα μετακινήθηκε σε <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Δεν ήταν δυνατή η προώθηση μίας ή περισσότερων επισυνάψεων."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Η επισύναψη δεν προωθήθηκε"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Αποτυχία σύνδεσης <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Η σύνδεση απέτυχε"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Δεν ήταν δυνατή η σύνδεση"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Συγχρονισμός επαφών από αυτόν τον λογαριασμό."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Συγχρονισμός ημερολογίου από αυτόν τον λογαριασμό."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Αυτόματη λήψη συνημμένων κατά τη σύνδεση σε δίκτυο WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Αυτόματη λήψη συνημμένων κατά τη σύνδεση σε δίκτυο Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Αδυναμία ολοκλήρωσης"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Ημέρες για συγχρονισμό"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Αυτόματη"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Το όνομα χρήστη ή ο κωδικός πρόσβασης για τον λογαριασμό <xliff:g id="ACCOUNT">%s</xliff:g> είναι λανθασμένα. Θέλετε να τα ενημερώσετε τώρα;"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Προεπιλεγμένος λογαριασμός"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Αυτόματη λήψη συνημμένων"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Αυτόματη λήψη συνημμένων κατά τη σύνδεση σε δίκτυο WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Λήψη συνημμένων"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Αυτόματη λήψη συνημμένων πρόσφατων μηνυμάτων μέσω Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Ειδοποιήσεις μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Συχνότητα συγχρονισμού, ειδοποιήσεις, κτλ."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Εμφάνιση ειδοποίησης στη γραμμή συστήματος κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Μεγάλο"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Πολύ μεγάλο"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Απάντηση σε όλους"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ορισμός \"Απάντηση σε όλους\" ως προεπιλογή για απάντηση σε μηνύματα."</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Επαναφορά προεπιλογής για την επιλογή \"Εμφάνιση εικόνων\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Επαναφορά προεπιλογών για όλους τους αποστολείς (να μην εμφανίζονται εικόνες αυτόματα)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Καταργήθηκε η επιλογή του στοιχείου \"Εμφάνιση εικόνων\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ορισμός \"Απάντηση σε όλους\" ως προεπιλογή για απαντήσεις σε μηνύματα."</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ερώτηση για εμφάνιση εικόνων"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Οι εικόνες σε μηνύματα δεν θα εμφανίζονται αυτόματα"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Καταργήθηκε η επιλογή του στοιχείου \"Εμφάνιση εικόνων\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Αναμονή για συγχρονισμό"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Η ηλεκτρονική αλληλογραφία σας θα εμφανιστεί σύντομα."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Αγγίξτε το εικονίδιο για αλλαγή."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Συνδ. προβ. εισερχ."</string>
<string name="widget_unread" msgid="4404711399009077833">"Μη αναγνωσμένα"</string>
<string name="widget_starred" msgid="8290352707134011791">"Με αστέρι"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index df33aa4..c036543 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Subject:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Compose Mail"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Compose Email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Quoted text"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Show details"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Message details"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Attachment info"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wi-Fi connection required"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wi-Fi settings"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi connection required"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi settings"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"App settings"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Can\'t open attachment."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"You can\'t save or open this file because this type of attachment might contain malicious software."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"This attachment can\'t be saved or opened because of this account\'s security policies."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"This attachment is too large to download over a mobile network. You can download it the next time that you connect to a Wi-Fi network."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"This attachment is too large to download over a mobile network. You can download it the next time that you connect to a Wi-Fi network."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"There is no installed app that can open this attachment. Try downloading an appropriate app from Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"This attachment is an app. You must tick Unknown Sources in Settings > Apps before you can install it."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apps can\'t be installed directly from email. Save this app first and then install it using the Downloads app."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Message discarded."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Message saved as draft."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Can\'t display the attachment."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Couldn\'t load the attachment \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Can\'t display attachment."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Couldn\'t load attachment \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Opening message…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message moved to <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Could not forward one or more attachments"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Attachment not forwarded"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in failed."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Sign-in failed"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Couldn\'t sign in"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sync contacts from this account."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sync calendar from this account."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sync email from this account."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automatically download attachments when connected to Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatically download attachments when connected to Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Couldn\'t finish"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Days to sync"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatic"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Update them now?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Default account"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Send email from this account by default"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Auto-download attachments"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatically download attachments when connected to Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download attachments"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto-download attachments to recent messages via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Email notifications"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sync frequency, notifications, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notify in System bar when emails arrive"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Large"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Huge"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Reply all"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Make \'Reply all\' the default for responding to messages"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restore default for \"Show pictures\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restore default for all senders (don\'t show pictures automatically)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Show pictures\" was cleared."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Make \"Reply all\" the default for message replies"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ask to show pictures"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pictures in messages won\'t be shown automatically"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Show pictures\" cleared."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Waiting for sync"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Your email will appear soon."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Touch icon to change."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Combined Inbox"</string>
<string name="widget_unread" msgid="4404711399009077833">"Unread"</string>
<string name="widget_starred" msgid="8290352707134011791">"Starred"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6da2ce3..944b1c3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"CC:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"CCO:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Asunto:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Redactar mensaje de correo"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Redactar correo electrónico"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensaje original --------"\n"Asunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escribió:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto citado"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostrar detalles"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalles del mensaje"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Información del archivo adjunto"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Conexión Wi-Fi necesaria"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Ajustes de Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Se necesita conexión Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Configuración Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Config. de aplicación"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"No se puede abrir el archivo adjunto"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"No puedes guardar ni abrir este archivo porque el tipo de adjunto podría incluir software malintencionado."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"No se puede guardar ni abrir este archivo adjunto debido a las políticas de seguridad de la cuenta."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Este archivo adjunto es demasiado grande para descargar en la red para celulares. Puedes descargarlo la próxima vez que te conectes a una red Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Este archivo adjunto es demasiado grande para descargar en la red para celulares. Puedes descargarlo la próxima vez que te conectes a la red Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Ninguna de las aplicaciones instaladas puede abrir este archivo adjunto. Prueba descargar una aplicación adecuada de Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Este archivo adjunto es una aplicación. Para instalarla, debes activar la opción Orígenes desconocidos en Ajustes > Aplicaciones."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Las aplicaciones no se pueden instalar directamente desde el correo electrónico. Primero debes guardar esta aplicación y luego instalarla con la aplicación Descargas."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"No se puede mostrar el archivo adjunto."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"No se pudo guardar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No se ha podido cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abriendo el mensaje…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje trasladado a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"No se pudieron enviar uno o más adjuntos."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"No se reenvió el archivo adjunto"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Error al acceder a <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Error al acceder"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"No se ha podido acceder."</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincroniza el calendario desde esta cuenta"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar el correo electrónico desde esta cuenta"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Descargar archivos adjuntos automáticamente al conectarse a Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar los archivos adjuntos automáticamente al conectarte a Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No se pudo terminar"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Días para la sincronización"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g>no es correcta. ¿Deseas actualizarlos ahora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Descargar archivos adj. automat."</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Descargar adjuntos automáticamente al conectar a una red Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adjuntos"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática por Wi-Fi de los adjuntos de msjs. recientes"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo electrónico"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en la barra de estado cuando llegue un correo electrónico"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Elige \"Responder a todos\" como opción predeterminada para los mensajes."</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restablecer predeterminado para \"Mostrar imágenes\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restablecer predeterminado para todos los remitentes (no mostrar imágenes automáticamente)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Se borró \"Mostrar imágenes\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Predetermina \"Responder a todos\" para las respuestas de mensajes."</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Preguntar antes de mostrar imágenes"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Las imágenes de los mensajes no se mostrarán automáticamente."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se borró \"Mostrar imágenes\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo electrónico aparecerá en breve."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Toca el ícono para cambiar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Combinación de Recibidos"</string>
<string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
<string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 08e775b..1321641 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"CC:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"CCO:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Asunto:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Redactar"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Redactar correo"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre comillas"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostrar detalles"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalles del mensaje"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Información de archivo adjunto"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Conexión Wi-Fi necesaria"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Ajustes Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Se necesita una conexión Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Ajustes de Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Ajustes de aplicación"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"No se puede abrir el archivo adjunto."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"No se puede guardar ni abrir este archivo porque el tipo de archivo adjunto puede incluir software malintencionado."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"No se puede guardar ni abrir este archivo adjunto debido a las políticas de seguridad de la cuenta."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Este archivo adjunto es demasiado grande para descargarlo en una red móvil. Puedes descargarlo la próxima vez que te conectes a una red Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Este archivo adjunto es demasiado grande para descargarlo en una red móvil. Puedes descargarlo la próxima vez que te conectes a una red Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Ninguna de las aplicaciones instaladas puede abrir este archivo adjunto. Prueba a descargar una aplicación adecuada en Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Este archivo adjunto es una aplicación. Para poder instalarla, debes activar la opción Orígenes desconocidos en Ajustes > Aplicaciones."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Las aplicaciones no se pueden instalar directamente desde los mensajes de correo. Primero debes guardar la aplicación y, a continuación, instalarla mediante la aplicación Descargas."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"No se puede mostrar el archivo adjunto."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"No se puede cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No se ha podido cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abriendo mensaje…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Se ha movido <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>."</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Error al enviar uno o varios archivos adjuntos"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Archivo adjunto no reenviado"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Error al iniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Error al iniciar sesión"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Error al iniciar sesión"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar calendario desde esta cuenta"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar mensajes de correo procedentes de esta cuenta"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Descargar adjuntos automáticamente al conectar a una red Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar adjuntos automáticamente al conectar a una red WiFi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Error al completar la configuración"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Días para sincronizar"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automática"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Descargar adjuntos automáticamente"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Descargar adjuntos automáticamente al conectar a una red Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar adjuntos"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática de adjuntos de mensajes recientes por Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en barra del sistema cuando llegue un correo electrónico"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Elige Responder a todos como opción predeterminada para los mensajes"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurar valores predeterminados para Mostrar imágenes"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurar valores predeterminados para todos los remitentes (no mostrar imágenes automáticamente)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Se ha restaurado la opción Mostrar imágenes."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Elegir \"Responder a todos\" como opción predeterminada para los mensajes"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Preguntar para ver imágenes"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Las imágenes de los mensajes no se mostrarán automáticamente"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se ha restaurado la opción Mostrar imágenes."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo electrónico aparecerá en breve."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Toca para cambiar"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Combinación de recibidos"</string>
<string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
<string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4321c1b..6f43749 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"گیرنده کپی:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"موضوع:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"نگاشتن نامه"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"نوشتن ایمیل"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- پیام اصلی --------"\n"موضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"فرستنده: <xliff:g id="SENDER">%2$s</xliff:g>"\n"گیرنده: <xliff:g id="TO">%3$s</xliff:g>"\n"گیرنده کپی: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> نوشت:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"متن نقل قول شده"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"نمایش جزئیات"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"جزئیات پیام"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"اطلاعات پیوست"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"به اتصال WiFi نیاز است"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"تنظیمات WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"اتصال Wi-Fi مورد نیاز است"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"تنظیمات Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"تنظیمات برنامه"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"پیوست باز نمی شود."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"شما نمیتوانید این فایل را ذخیره یا باز کنید زیرا این نوع پیوست ممکن است حاوی نرمافزار مخرب باشد."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"به دلیل خطمشیهای امنیتی، این حساب را نمیتوان ذخیره یا باز کرد."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"این پیوست برای دانلود از طریق شبکه تلفن همراه خیلی بزرگ است. میتوانید دفعه دیگر که به یک شبکه Wi-Fi متصل میشوید، آنرا دانلود کنید."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکه تلفن همراه خیلی بزرگ است. می توانید دفعه دیگر که به یک شبکه Wi-Fi متصل می شوید، آنرا دانلود کنید."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"هیچ برنامه نصب شدهای برای باز کردن این پیوست وجود ندارد. یک برنامه مناسب از Android Market نصب کنید."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"این پیوست یک برنامه است. باید قبل از نصب آن، منبعهای ناشناس را در تنظیمات > برنامهها بررسی کنید."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"نمیتوان برنامهها را به طور مستقیم از ایمیل نصب کرد. ابتدا این برنامه را ذخیره کنید و سپس آنرا با استفاده از برنامه \"دانلودها\" نصب کنید."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"پیام رد شد."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"پیام به عنوان پیش نویس ذخیره شد."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"نمایش پیوست امکانپذیر نیست."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"نمیتوان پیوست \"<xliff:g id="FILENAME">%s</xliff:g>\" را بارگیری کرد."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"نمایش پیوست امکانپذیر نیست."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"نمیتوان پیوست \"<xliff:g id="FILENAME">%s</xliff:g>\" را بارگیری کرد."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"درحال بازکردن پیام..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> پیام به <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> انتقال یافت"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"یک یا چند پیوست باز ارسال نشد."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"پیوست هدایت نشد"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"ورود به سیستم <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ناموفق بود."</string>
- <string name="login_failed_title" msgid="791871543602843876">"ورود به سیستم ناموفق بود"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"ورود به سیستم ممکن نیست"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"همگام سازی مخاطبین از این حساب."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"همگام سازی تقویم از این حساب."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ایمیل را از این حساب همگام سازی کنید."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"دانلود خودکار پیوستها هنگام اتصال به Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"دانلود خودکار پیوست ها هنگام اتصال به Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"پایان نیافت"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"روزهای همگامسازی"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"خودکار"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"نام کاربری یا رمز ورود <xliff:g id="ACCOUNT">%s</xliff:g> نادرست است. اکنون آنها را به روزرسانی می کنید؟"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"حساب پیش فرض"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"ارسال ایمیل از این حساب به صورت پیش فرض"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"دانلود خودکار پیوست ها"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"دانلود خودکار پیوستها هنگام اتصال به WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"دانلود پیوستها"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"دانلود خودکار پیوستها به پیامهای اخیر از طریق Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"اعلان های ایمیل"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"تکرار همگام سازی، اعلان ها، موارد دیگر"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"ورود ایمیل در نوار سیستم اعلام شود"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"بزرگ"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"بسیار بزرگ"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"پاسخ به همه"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\"پاسخ به همه\" پیش فرض پاسخگویی به پیامها شود"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"بازیابی پیش فرض برای \"نمایش تصاویر\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"بازیابی پیش فرض برای همه ارسال کننده ها (تصاویر به صورت خودکار نشان داده نشود)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"نمایش تصاویر\" پاک شد."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"پاسخ به همه\" را پیشفرض پاسخهای پیام قرار دهید"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"درخواست نشان دادن تصاویر"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"تصاویر در پیامها به صورت خودکار نشان داده نخواهد شد"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"نمایش تصاویر\" پاک شد."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"در انتظار همگام سازی"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ایمیل شما به زودی ظاهر خواهد شد."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"برای تغییر، نماد را لمس کنید."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"صندوق ورودی ترکیبی"</string>
<string name="widget_unread" msgid="4404711399009077833">"خوانده نشده"</string>
<string name="widget_starred" msgid="8290352707134011791">"ستاره دار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4c99cde..395c839 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopio:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Piilokopio:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Aihe:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Kirjoita viesti"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Kirjoita sähköposti"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Alkuperäinen viesti --------"\n"Aihe: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Lähettäjä: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Vastaanottaja: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopio: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> kirjoitti:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Lainattu teksti"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Näytä tiedot"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Viestin tiedot"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Liitteen tiedot"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wifi-yhteys tarvitaan"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wifi-asetukset"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wifi-yhteys vaaditaan"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wifi-asetukset"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Sovellusasetukset"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Liitteen avaaminen epäonnistui."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Et voi tallentaa tai avata tätä tiedostoa, koska tällainen liitetiedosto voi sisältää haittaohjelmia."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Tätä liitettä ei voi tallentaa tai avata tilin turvallisuuskäytäntöjen vuoksi."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Tämä liite on liian suuri ladattavaksi mobiiliverkon kautta. Voit ladata sen muodostaessasi wifi-yhteyden seuraavan kerran."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Tämä liite on liian suuri ladattavaksi mobiiliverkon kautta. Voit ladata sen muodostaessasi wifi-yhteyden seuraavan kerran."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Laitteeseen ei ole asennettu tämän liitetiedoston avaamiseen sopivaa sovellusta. Yritä ladata sopiva sovellus Android Marketista."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Tämä liite on sovellus. Valitse Tuntemattomat lähteet kohdassa Asetukset > Sovellukset, ennen kuin voit asentaa sovelluksen."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Sovelluksia ei voi asentaa suoraan sähköpostista. Tallenna sovellus ensin ja asenna se sitten Lataukset-sovelluksen avulla."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Viesti hylätty."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Viesti tallennettiin luonnokseksi."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Liitetiedostoa ei voi näyttää."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Liitettä <xliff:g id="FILENAME">%s</xliff:g> ei voitu ladata."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Liitetiedostoa ei voi näyttää."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Liitettä <xliff:g id="FILENAME">%s</xliff:g> ei voitu ladata."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avataan viestiä..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> viesti siirretty kansioon <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Vähintään yhden liitteen edelleenlähettäminen epäonnistui."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Liitettä ei lähetetty edelleen"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Kirjautuminen tiliin <xliff:g id="ACCOUNT_NAME">%s</xliff:g> epäonnistui."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Kirjautuminen epäonnistui"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Kirjautuminen ei onnistu"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronoi tämän tilin yhteystiedot."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronoi tämän tilin kalenteri."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkronoi tämän tilin lähetetyt sähköpostit."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ei onnistunut"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Synkronoitavien päivien määrä"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaattinen"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Päivitetäänkö?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Oletustili"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Lähetä sähköposti oletuksena tältä tililtä"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Lataa liitetiedostot automaattisesti"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostoja"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet wifi-yhteyden kautta."</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Ilmoita tilarivissä, kun sähköpostiviesti saapuu"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Suuri"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Hyvin suuri"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Vastaa kaikille"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Aseta viesteihin vastaamisen oletusvalinnaksi Vastaa kaikille"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Palauta Näytä kuvat -oletusasetukset"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Palauta kaikkien lähettäjien oletukset (kuvia ei näytetä automaattisesti)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Näytä kuvat\" poistettu."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Aseta viesteihin vastaamisen oletusvalinnaksi Vastaa kaikille."</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Kysy lupa kuvien näyttämiseen"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Kuvien viestit eivät näy automaattisesti."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Näytä kuvat poistettu."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Odotetaan synkronointia"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Sähköposti tulee näkyviin pian."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Muuta: kosketa kuvak."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Yhd. postilaatikko"</string>
<string name="widget_unread" msgid="4404711399009077833">"Lukemattomat"</string>
<string name="widget_starred" msgid="8290352707134011791">"Tähdelliset"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0f7882c..6cd9676 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc :"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Cci :"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Objet :"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Nouveau message"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Composez un message"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Message original --------"\n"Objet : <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De : <xliff:g id="SENDER">%2$s</xliff:g>"\n"À : <xliff:g id="TO">%3$s</xliff:g>"\n"Cc : <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a écrit :"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texte du message précédent"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Afficher détails"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Détails du message"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informations sur la pièce jointe"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Connexion Wi-Fi nécessaire"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Paramètres Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Connexion Wi-Fi requise"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Paramètres Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Paramètres application"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Impossible d\'ouvrir la pièce jointe."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Vous ne pouvez pas enregistrer ni ouvrir ce fichier, car ce type de pièce jointe est susceptible de contenir des logiciels malveillants."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Impossible d\'enregistrer ou d\'ouvrir cette pièce jointe en raison des règles de sécurité de ce compte."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Cette pièce jointe est trop volumineuse pour être téléchargée via un réseau mobile. Vous pourrez la télécharger lors de votre prochaine connexion à un réseau Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Cette pièce jointe est trop volumineuse pour être téléchargée via un réseau pour mobile. Vous pourrez la télécharger lors de votre prochaine connexion à un réseau Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Aucune application installée n\'est en mesure d\'ouvrir cette pièce jointe. Essayez de télécharger une application appropriée depuis l\'Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Cette pièce jointe est une application. Vous devez sélectionner \"Sources inconnues\" dans Paramètres > Applications avant de pouvoir l\'installer."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Les applications ne peuvent pas être installées directement depuis un e-mail. Enregistrez tout d\'abord cette application, puis installez-la à l\'aide de l\'application Téléchargements."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Message supprimé."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Brouillon enregistré"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Impossible d\'afficher la pièce jointe."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Impossible de charger la pièce jointe \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossible d\'afficher la pièce jointe."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Impossible de charger la pièce jointe \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Ouverture du message…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message déplacé vers <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossible de transférer une ou plusieurs pièces jointes."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Pièce jointe non transférée"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Échec de la connexion"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Impossible de se connecter"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchroniser les contacts issus de ce compte"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchroniser l\'agenda à partir de ce compte"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchroniser les e-mails à partir de ce compte"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Télécharger automatiquement les pièces jointes lors de la connexion à un réseau Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Télécharger automatiquement les pièces jointes une fois connecté au Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impossible de terminer"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Jours à synchroniser"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatique"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Le nom d\'utilisateur ou le mot de passe du compte <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Mettre à jour maintenant ?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Compte par défaut"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Par défaut, envoyer les e-mails avec ce compte"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Téléch. pièces jointes automatiquement"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Télécharger auto. pièces jointes si connecté à un réseau Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Télécharger les pièces jointes"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Téléch. auto des pièces jointes aux messages récents via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Fréquence de synchronisation, notifications, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Afficher une notification dans la barre système à la réception d\'e-mails"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Très grande"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Répondre à tous"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Utiliser \"Répondre à tous\" par défaut pour répondre aux messages"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurer les valeurs par défaut pour l\'option \"Afficher les images\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurer les valeurs par défaut pour tous les expéditeurs (ne pas afficher les images automatiquement)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"L\'option \"Afficher les images\" a été désactivée."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Utiliser \"Répondre à tous\" par défaut pour répondre aux messages"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Demander avant d\'afficher les images"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Les images contenues dans les messages ne s\'afficheront pas automatiquement."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Option \"Afficher les images\" désactivée."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"En attente de synchronisation"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Votre e-mail va bientôt s\'afficher."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Appuyez pour changer."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Boîte réception combinée"</string>
<string name="widget_unread" msgid="4404711399009077833">"Non lus"</string>
<string name="widget_starred" msgid="8290352707134011791">"Suivis"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 25d723c..643f187 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"विषय:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"मेल लिखें"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"ईमेल लिखें"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"--------मूल संदेश --------"\n"विषय: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"प्रेषक: <xliff:g id="SENDER">%2$s</xliff:g>"\n"प्रति: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ने लिखा:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"उद्धरित पाठ"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"विवरण दिखाएं"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"संदेश विवरण"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"अनुलग्नक जानकारी"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi कनेक्शन आवश्यक"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi सेटिंग"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi कनेक्शन आवश्यक है"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi सेटिंग"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"एप्लिकेशन सेटिंग"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"अनुलग्नक खोल नहीं सकता."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"इस प्रकार के अनुलग्नकों में दुर्भावनापूर्ण सॉफ़्टवेयर हो सकता है, इसलिए आप इस फ़ाइल को खोल या सहेज नहीं सकते."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"इस खाते की सुरक्षा नीतियों के कारण यह अनुलग्नक सहेजा या खोला नहीं जा सकता."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"किसी मोबाइल नेटवर्क पर डाउनलोड करने के लिए यह अनुलग्नक बहुत बड़ा है. अगली बार किसी WiFi नेटवर्क से कनेक्ट होने पर आप इसे डाउनलोड कर सकते हैं."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"किसी मोबाइल नेटवर्क पर डाउनलोड करने के लिए यह अनुलग्नक बहुत बड़ा है. अगली बार किसी Wi-Fi नेटवर्क से कनेक्ट होने पर आप इसे डाउनलोड कर सकते हैं."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"इंस्टॉल किया गया ऐसा कोई एप्लिकेशन नहीं है जो इस अनुलग्नक को खोल सके. Android Market से उपयुक्त एप्लिकेशन डाउनलोड करके देखें."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"यह अनुलग्नक एक एप्लिकेशन है. आपको इसे इंस्टॉल करने से पहले सेटिंग > एप्लिकेशन में अज्ञात स्रोतों की जांच करनी होगी."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"एप्लिकेशन सीधे ईमेल से इंस्टॉल नहीं किए जा सकते. पहले यह एप्लिकेशन सहेजें और फिर डाउनलोड एप्लिकेशन का उपयोग करके उसे इंस्टॉल करें."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"संदेश छोड़ दिया गया."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"अनुलग्नक प्रदर्शित नहीं हो सकता."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"अनुलग्नक \" <xliff:g id="FILENAME">%s</xliff:g>\" को लोड नहीं किया जा सका."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"अनुलग्नक प्रदर्शित नहीं हो सकता."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"अनुलग्नक \" <xliff:g id="FILENAME">%s</xliff:g>\" लोड नहीं किया जा सका."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"संदेश खोल रहा है…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> संदेश <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> में ले जाया गया"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"एक या अधिक अनुलग्नक अग्रेषित नहीं किए जा सके."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"अनुलग्नक अग्रेषित नहीं किया गया"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइन इन विफल."</string>
- <string name="login_failed_title" msgid="791871543602843876">"साइन इन विफल"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"साइन इन नहीं हो सका"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"संपर्कों को इस खाते से सिंक करें."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"इस खाते से कैलेंडर सिंक करें."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"इस खाते से ईमेल सिंक करें."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"WiFi से कनेक्ट होने पर अनुलग्नकों को स्वचालित रूप से डाउनलोड करें"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi से कनेक्ट होने पर अनुलग्नकों को स्वचालित रूप से डाउनलोड करें"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"पूरा नहीं हो सका"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"समन्वयन के लिए दिन:"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"स्वचालित"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> का उपयोगकर्ता नाम या पासवर्ड गलत है. उन्हें अभी अपडेट करें?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"डिफ़ॉल्ट खाता"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"डिफ़ॉल्ट रूप से, इस खाते से ईमेल भेजें"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"अनुलग्नक स्वत: डाउनलोड करें"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"WiFi से कनेक्ट होने पर अनुलग्नकों को स्वचालित रूप से डाउनलोड करें"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"अनुलग्नकों को डाउनलोड करें"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi के माध्यम से हाल के संदेशों के अनुलग्नक स्वत: डाउनलोड करें"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"ईमेल सूचनाएं"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"आवृत्ति, सूचनाएं आदि सिंक करें."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"ईमेल आने पर सिस्टम बार में सूचित करें"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"बड़ा"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"बहुत बड़ा"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"सभी को प्रत्युत्तर दें"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"संदेशों के प्रतिसाद के लिए \'सभी को प्रत्युत्तर दें\' को डिफ़ॉल्ट बनाएं"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"\"चित्र दिखाएं\" के लिए डिफ़ॉल्ट पुनर्स्थापित करें"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"सभी प्रेषकों के लिए डिफ़ॉल्ट पुनर्स्थापित करें (चित्रों को स्वचालित रूप से न दिखाएं)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"चित्र दिखाएं\" साफ़ कर दिया था."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"संदेशों के प्रत्युत्तर के लिए \"सभी को प्रत्युत्तर दें\" को डिफ़ॉल्ट बनाएं"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"चित्र दिखाने के लिए पूछें"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"संदेशों के चित्र स्वचालित रूप से नहीं दिखाए जाएंगे"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"चित्र दिखाएं\" साफ़ किया गया."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_2">%2$s</xliff:g> का <xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"समन्वयन की प्रतीक्षा कर रहा है"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"आपका ईमेल जल्दी ही दिखाई देगा."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"बदलने हेतु आइकन स्पर्श करें."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"संयोजित इनबॉक्स"</string>
<string name="widget_unread" msgid="4404711399009077833">"अपठित"</string>
<string name="widget_starred" msgid="8290352707134011791">"तारांकित"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5b33c73..a57f34f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopija:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Skriv. kop:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Stvori novu poruku"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Stvori novi poruku e-pošte"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvorna poruka --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Šalje: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Prima: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisao:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirani tekst"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Pokaži detalje"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Pojedinosti poruke"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informacije o privitku"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Potrebna je WiFi veza"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi postavke"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Potreban je Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi postavke"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Postavke aplikacija"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nije moguće otvoriti privitak."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Ne možete spremiti niti otvoriti tu datoteku jer ta vrsta privitka može sadržavati zlonamjerni softver."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Ovaj se privitak ne može spremiti niti otvoriti zbog pravila o sigurnosti ovog računa."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Ovaj je privitak prevelik za preuzimanje putem mobilne mreže. Možete ga preuzeti sljedeći put kad se spojite na WiFi mrežu."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Ovaj je privitak prevelik za preuzimanje putem mobilne mreže. Možete ga preuzeti sljedeći put kad se spojite na Wi-Fi mrežu."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nema instalirane aplikacije koja može otvoriti taj privitak. Pokušajte preuzeti odgovarajuću aplikaciju s Android Marketa."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Ovaj je privitak aplikacija. Morate uključiti potvrdni okvir stavke \"Nepoznati izvori\" na zaslonu Postavke > Aplikacije da biste je mogli instalirati."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikacija se ne može instalirati izravno iz e-pošte. Prvo spremite ovu aplikaciju, a zatim je instalirajte pomoću aplikacije Preuzimanja."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Poruka je odbačena."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Poruka je spremljena kao skica."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Nije moguće prikazati privitak."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Učitavanje privitka \"<xliff:g id="FILENAME">%s</xliff:g>\" nije uspjelo."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Privitak nije moguće prikazati."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Učitavanje privitka \"<xliff:g id="FILENAME">%s</xliff:g>\" nije uspjelo."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otvaranje poruke…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> poruka premještena u <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Jedan ili više privitaka nije bilo moguće proslijediti."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Privitak nije proslijeđen"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Neuspješna prijava na račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Prijava nije uspjela"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Neuspjela prijava"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniziraj i kontakte s ovog računa."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniziraj kalendar s ovog računa"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sink. e-poštu za ovaj račun."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automatski preuzmi privitke tijekom povezanosti s WiFi mrežom"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatski preuzmi privitke za vrijeme povezanosti s Wi-Fi mrežom"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Završavanje nije bilo moguće"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dani za sinkronizaciju"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatski"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Korisničko ime ili zaporka za <xliff:g id="ACCOUNT">%s</xliff:g> nisu točni. Ažurirati sada?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Zadani račun"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automatsko preuzimanje privitaka"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatski preuzmi privitke tijekom povezanosti s WiFi mrežom"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preuzimanje privitaka"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatsko preuzimanje privitaka uz nedavne poruke WiFi mrežom"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Obavijesti e-pošte"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Učestalost sinkronizacije, obavijesti itd."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Obavijesti u traci sustava kad stigne e-pošta"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velik"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Ogroman"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori svima"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Učini \"Odgovori svima\" zadanom postavkom za odgovor na poruke"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Vrati zadano za \"Prikaži slike\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Vrati zadano za sve pošiljatelje (ne prikazuj slike automatski)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Prikaži slike\" izbrisano."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Neka \"Odgovori svima\" bude zadana postavka za odgovore na poruke"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pitaj treba li prikazati slike"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Slike u porukama neće se automatski prikazivati"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Prikaži slike\" izbrisano."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekanje na sinkronizaciju"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaša će se e-pošta uskoro pojaviti."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Dodir. za promjenu."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Komb. prist. pošta"</string>
<string name="widget_unread" msgid="4404711399009077833">"Nepročitano"</string>
<string name="widget_starred" msgid="8290352707134011791">"Označeno zvjezdicom"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 355a1eb..01f61c4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Másolat:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Titkos más.:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Tárgy:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Levélírás"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Levélírás"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Eredeti üzenet --------"\n"Tárgy: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Feladó: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Címzett: <xliff:g id="TO">%3$s</xliff:g>"\n"Másolatot kap: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a következőt írta:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Idézett szöveg"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Részletek megjelenítése"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Üzenet részletei"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Melléklet adatai"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi-kapcsolat szükséges"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi-beállítások"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi kapcsolat szükséges"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi beállítások"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Alkalmazásbeállítások"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"A melléklet nem nyitható meg."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Nem lehet menteni vagy megnyitni ezt a fájlt, mert ez a fajta melléklet rosszindulatú szoftvereket is tartalmazhat."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Ezt a mellékletet a fiók biztonsági irányelvei miatt nem lehet menteni vagy megnyitni."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"A melléklet túl nagy mobilhálózatról való letöltéshez. Letöltheti, amikor legközelebb WiFi hálózatra kapcsolódik."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"A melléklet túl nagy mobilhálózatról való letöltéshez. Letöltheti, amikor legközelebb Wi-Fi hálózatra kapcsolódik."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nincs telepítve a melléklet megnyitására képes alkalmazás. Próbáljon meg megfelelő alkalmazást letölteni az Android Marketről."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Ez a melléklet egy alkalmazás. Be kell jelölnie az Ismeretlen források lehetőséget a Beállítások > Alkalmazások menüpontban, mielőtt telepíthetné azt."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Az alkalmazások nem telepíthetők közvetlenül e-mailből. Először mentenie kell az alkalmazást, majd telepíteni a Letöltések alkalmazás használatával."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Üzenet elvetve."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Az üzenet mentve piszkozatként."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Nem lehet megjeleníteni a mellékletet."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Nem sikerült betölteni a következő mellékletet: \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nem lehet megjeleníteni a mellékletet."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nem sikerült betölteni a következő mellékletet: \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Üzenet megnyitása..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> üzenet áthelyezve ide: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Egy vagy több melléklet nem továbbítható."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"A melléklet nincs továbbítva"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> bejelentkezése sikertelen volt."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Sikertelen bejelentkezés"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Sikertelen bejelentkezés"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Névjegyek szinkronizálása ebben a fiókban."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Naptár szinkronizálása ebben a fiókban."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Az e-mailek szinkronizálása ebből a fiókból."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Mellékletek automatikus letöltése WiFi-kapcsolatnál"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Mellékletek automatikus letöltése Wi-Fi-kapcsolatnál"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nem sikerült befejezni"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Szinkronizálási időtartam"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatikus"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> felhasználóneve vagy jelszava helytelen. Frissíti most?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Alapértelmezett fiók"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Mellékletek automatikus letöltése"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Mellékletek automatikus letöltése WiFi-kapcsolatnál"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mellékletek letöltése"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Mellékletek automatikus letöltése az üzenetekbe Wi-Fin keresztül"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail értesítések"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Szinkronizálási gyakoriság, értesítések stb."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Értesítés megjelenítése a Rendszersávon e-mailek érkezése esetén"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Nagy"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Óriási"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Válasz mindenkinek"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"A \"Válasz mindenkinek\" legyen az alapértelmezett válaszolási mód"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Alapértelmezett beállítások visszaállítása \"Képek megjelenítése\" esetén"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Alapértelmezett beállítások visszaállítása minden feladó esetén (ne mutassa automatikusan a képeket)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Képek megjelenítése\" törölve."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"A \"Válasz mindenkinek\" legyen az alapértelmezett válaszolási mód"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Kérdezzen rá a képek megjelenítésére"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Az üzenetekben lévő képek nem jelennek meg automatikusan"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Képek megjelenítése\" törölve."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_2">%2$s</xliff:g>/<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Várakozás a szinkronizálásra"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mail címe hamarosan megjelenik."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Ikonérintéssel válthat"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Összes e-mail"</string>
<string name="widget_unread" msgid="4404711399009077833">"Olvasatlan"</string>
<string name="widget_starred" msgid="8290352707134011791">"Csillagozott"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8f5174f..f60d1a0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Subjek:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Tulis Surat"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Tulis email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pesan Asli --------"\n"Subjek: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Dari: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kepada: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n" <xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Kutipan teks"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Tampilkan detail"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detail pesan"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Info lampiran"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Diperlukan koneksi WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Setelan WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Diperlukan koneksi Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Setelan Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Setelan apl"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Tidak dapat membuka lampiran."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Anda tidak dapat menyimpan atau membuka berkas ini karena jenis lampiran mungkin berisi perangkat lunak berbahaya."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Lampiran ini tidak dapat disimpan atau dibuka karena kebijakan keamanan akun ini."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Lampiran ini terlalu besar untuk diunduh melalui jaringan seluler. Anda dapat mengunduhnya saat tersambung lagi ke jaringan WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Lampiran ini terlalu besar untuk diunduh melalui jaringan seluler. Anda dapat mengunduhnya saat tersambung lagi ke jaringan Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Tidak ada apl terpasang yang dapat membuka lampiran ini. Coba unduh apl yang tepat dari Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Lampiran ini adalah sebuah apl. Anda harus mencentang Sumber Tidak Dikenal dalam Setelan > Apl sebelum Anda dapat memasangnya."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apl tidak dapat dipasang langsung dari email. Simpan apl ini terlebih dahulu, lalu pasang menggunakan apl Unduhan."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Pesan dibuang."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Pesan disimpan sebagai draf."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Tidak dapat menampilkan lampiran."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Tidak dapat memuat lampiran \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak dapat menampilkan lampiran."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Tidak dapat memuat lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Membuka pesan…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pesan dipindahkan ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak dapat meneruskan satu lampiran atau lebih."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak diteruskan"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Gagal masuk"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat masuk"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkronkan kenalan dari akun ini."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkronkan kalender dari akun ini."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinkronkan email dari akun ini."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Otomatis mengunduh lampiran ketika tersambung ke WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Unduh lampiran secara otomatis ketika tersambung dengan Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tidak dapat menyelesaikan"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Hari yang disinkronkan"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Otomatis"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau sandi untuk <xliff:g id="ACCOUNT">%s</xliff:g> salah. Mutakhirkan keduanya sekarang?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Akun bawaan"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Kirim email dari akun ini secara bawaan"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Unduh-otomatis lampiran"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Otomatis mengunduh lampiran ketika tersambung ke WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Unduh lampiran"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Unduh-otomatis lampiran pada pesan terbaru melalui WiFi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan email"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sinkronkan frekuensi, pemberitahuan, dll."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Beri tahukan dalam bilah Sistem ketika email tiba"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas semua"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Jadikan \'Balas semua\' sebagai bawaan untuk menjawab pesan"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Pulihkan bawaan untuk \"Tampilkan gambar\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Pulihkan bawaan untuk semua pengirim (jangan tampilkan gambar secara otomatis)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Tampilkan gambar\" dihapus."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \"Balas semua\" sebagai bawaan untuk membalas pesan"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Tanyakan untuk menampilkan gambar"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gambar dalam pesan tidak akan ditampilkan secara otomatis"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tampilkan gambar\" dihapus."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Menunggu sinkronisasi"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Email Anda akan segera muncul."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Snth ikon utk mngubah."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kotak Masuk Gabungan"</string>
<string name="widget_unread" msgid="4404711399009077833">"Belum Dibaca"</string>
<string name="widget_starred" msgid="8290352707134011791">"Yang berkilau bintangnya"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d4dec48..4614731 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Ccn:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Oggetto:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Scrivi email"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Scrivi email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messaggio originale --------"\n"Oggetto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Testo tra virgolette"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostra dettagli"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Dettagli messaggio"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informazioni allegato"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Connessione Wi-Fi richiesta"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Impostazioni Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Connessione Wi-Fi richiesta"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Impostazioni Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Impostazioni applicazione"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Impossibile aprire l\'allegato."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Impossibile salvare o aprire il file perché questo tipo di allegato potrebbe contenere software dannoso."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Impossibile salvare o aprire questo allegato a causa delle norme di sicurezza dell\'account in uso."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Questo allegato è troppo grande per il download su una rete mobile. Puoi scaricarlo la prossima volta che ti connetti a una rete Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Questo allegato è troppo grande per il download su una rete mobile. Puoi scaricarlo la prossima volta che ti connetti a una rete Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Impossibile aprire questo allegato con le applicazioni installate. Prova a scaricare un\'applicazione adeguata da Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Questo allegato è un\'applicazione. Per poterla installare, devi selezionare l\'opzione \"Origini sconosciute\" in Impostazioni > Applicazioni."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Non è possibile installare applicazioni direttamente dalla posta elettronica. Salva l\'applicazione, quindi installala utilizzando l\'applicazione Download."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Messaggio eliminato."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Messaggio salvato come bozza."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Impossibile visualizzare l\'allegato."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Impossibile caricare l\'allegato \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossibile visualizzare l\'allegato."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Impossibile caricare l\'allegato \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Apertura messaggio..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messaggio spostato in <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossibile inoltrare uno o più allegati."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Allegato non inoltrato"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Accesso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> non riuscito."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Accesso non riuscito"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Accesso non riuscito"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizza contatti da questo account."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizza il calendario da questo account."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizza le email da questo account."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Scarica automaticamente allegati quando connesso a rete Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Scarica allegati automaticamente quando connesso a Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impossibile completare"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Giorni da sincronizzare"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatico"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Il nome utente o la password per <xliff:g id="ACCOUNT">%s</xliff:g> non sono corretti. Aggiornarli ora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Account predefinito"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Invia email da questo account per impostazione predefinita"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Download automatico allegati"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Scarica automaticamente allegati quando connesso a rete Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Scarica allegati"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Scarica automaticamente allegati messaggi recenti tramite Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notifiche email"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frequenza sincronizzazione, notifiche e altro."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica sulla barra di sistema l\'arrivo di email"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grandi"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Molto grandi"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Rispondi a tutti"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Imposta \"Rispondi a tutti\" come opzione predefinita per le risposte"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Ripristina impostazioni predefinite di \"Mostra immagini\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Ripristina impostazioni predefinite per tutti i mittenti (non visualizzare automaticamente le immagini)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Le impostazioni di \"Mostra immagini\" sono state cancellate."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Imposta \"Rispondi a tutti\" come opzione predefinita per le risposte"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Chiedi di mostrare le immagini"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Le immagini all\'interno dei messaggi non verranno visualizzate automaticamente"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Impostazioni di \"Mostra immagini\" cancellate."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> di <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"In attesa di sincronizzazione"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Le email verranno visualizzate a breve."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Icona per modificare"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Posta in arr. combinata"</string>
<string name="widget_unread" msgid="4404711399009077833">"Da leggere"</string>
<string name="widget_starred" msgid="8290352707134011791">"Speciali"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e7858b2..651042b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"עותקים:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"עותק מוסתר:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"נושא:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"כתוב דואר"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"חבר דוא\"ל"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- הודעה מקורית --------"\n"נושא: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"מאת: <xliff:g id="SENDER">%2$s</xliff:g>"\n"אל: <xliff:g id="TO">%3$s</xliff:g>"\n"עותק: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> כתב:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"טקסט מצוטט"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"הצג פרטים"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"פרטי ההודעה"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"פרטי קובץ מצורף"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"נדרש חיבור WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"הגדרות WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"נדרש חיבור Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"הגדרות Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"הגדרות יישום"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"לא ניתן לפתוח את הקובץ המצורף."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"לא ניתן לשמור או לפתוח קובץ זה משום שקבצים מצורפים מסוג זה עלולים להכיל תוכנה זדונית."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"לא ניתן לשמור או לפתוח קובץ מצורף זה בשל מדיניות האבטחה של החשבון."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"קובץ מצורף זה גדול מדי להורדה דרך רשת לנייד. תוכל להוריד אותו בפעם הבאה שתתחבר לרשת WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"קובץ מצורף זה גדול מדי להורדה דרך רשת לנייד. תוכל להוריד אותו בפעם הבאה שתתחבר לרשת Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"לא מותקן יישום שיכול לפתוח קובץ מצורף זה. נסה להוריד יישום מתאים מ\'חנות Android\'."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"קובץ מצורף זה הוא יישום. עליך לסמן את \'מקורות לא ידועים\' ב\'הגדרות\' > \'יישומים\' כדי להתקינו."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"לא ניתן להתקין יישומים ישירות מדוא\"ל. ראשית יש לשמור את היישום ולאחר מכן להתקין אותו באמצעות היישום \'הורדות\'."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"ההודעה נמחקה."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"ההודעה נשמרה כטיוטה."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"לא ניתן להציג את הקובץ המצורף."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"לא ניתן לטעון את הקובץ המצורף \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"לא ניתן להציג את הקובץ המצורף."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"לא ניתן היה לטעון את הקובץ המצורף \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"פותח הודעה…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"הודעה <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הועברה אל <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"לא ניתן להעביר קובץ מצורף אחד או יותר."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"הקובץ המצורף לא הועבר"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"הכניסה ל-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> נכשלה."</string>
- <string name="login_failed_title" msgid="791871543602843876">"הכניסה נכשלה"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"לא ניתן היה להיכנס"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"סנכרן אנשי קשר מחשבון זה."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"סנכרן את לוח השנה מחשבון זה."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"סנכרן דוא\"ל מחשבון זה."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"הורד קבצים מצורפים באופן אוטומטי כאשר יש חיבור ל-WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"הורד קבצים מצורפים באופן אוטומטי כאשר יש חיבור ל-Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"לא ניתן להשלים את הפעולה"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ימים לסינכרון"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"אוטומטי"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"שם המשתמש או הסיסמה עבור <xliff:g id="ACCOUNT">%s</xliff:g> שגויים. לעדכן אותם כעת?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"חשבון ברירת מחדל"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"הורדה אוטומטית של קבצים מצורפים"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"הורד קבצים מצורפים באופן אוטומטי כאשר יש חיבור ל-WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"הורד קבצים מצורפים"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"הורד באופן אוטומטי קבצים מצורפים להודעות שהתקבלו לאחרונה באמצעות WiFi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"התראות דוא\"ל"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"תדירות סינכרון, התראות וכדומה"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"הצג הודעה בשורת המערכת כאשר מגיע דוא\"ל"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"גדול"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ענק"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"השב לכולם"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"הפוך את \'השב לכולם\' לברירת המחדל של מענה להודעות"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"שחזר ברירת מחדל עבור \'הצג תמונות\'"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"שחזר ברירת מחדל עבור כל השולחים (אל תציג תמונות באופן אוטומטי)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"האפשרות \'הצג תמונות\' בוטלה."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"הפוך את \'השב לכולם\' לברירת המחדל של מענה להודעות"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"בקש להציג תמונות"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"תמונות בהודעות לא יוצגו באופן אוטומטי"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"רשימת \'הצג תמונות\' נוקתה."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"ממתין לסינכרון"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"הדוא\"ל שלך יופיע בקרוב."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"גע בסמל כדי לשנות."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"דואר נכנס משולב"</string>
<string name="widget_unread" msgid="4404711399009077833">"לא נקרא"</string>
<string name="widget_starred" msgid="8290352707134011791">"מסומן בכוכבית"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e033a5f..4a4f584 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"件名:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"メッセージを作成"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"メールを作成します"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 元のメッセージ --------"\n"件名: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"元のメッセージ"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"詳細を表示"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"メッセージの詳細"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"添付ファイル情報"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wi-Fi接続が必要です"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wi-Fiの設定"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi接続が必要です"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi設定"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"アプリの設定"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"添付ファイルを開けません。"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"この形式の添付ファイルには不正なソフトウェアが含まれている可能性があるため、保存または開くことができません。"</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"このアカウントのセキュリティポリシーにより、この添付ファイルは保存や開くことができません。"</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"この添付ファイルはモバイルネットワークでダウンロードするには大きすぎます。Wi-Fiネットワークに次回接続したときにダウンロードできます。"</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"この添付ファイルはモバイルネットワークでダウンロードするには大きすぎます。Wi-Fiネットワークに次回接続したときにダウンロードできます。"</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"この添付ファイルを開くアプリはインストールされていません。Androidマーケットから必要なアプリをダウンロードしてください。"</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"この添付ファイルはアプリです。インストールする前に[設定] > [アプリ]で[提供元不明のアプリ]チェックボックスをオンにする必要があります。"</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"アプリを直接メールからインストールすることはできません。このアプリを保存してから、ダウンロードアプリを使用してインストールしてください。"</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"メッセージを破棄しました。"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"メッセージを下書き保存しました。"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"添付ファイルを表示できません。"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"添付ファイル「<xliff:g id="FILENAME">%s</xliff:g>」を保存できませんでした。"</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"添付ファイルを表示できません。"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"添付ファイル「<xliff:g id="FILENAME">%s</xliff:g>」を読み込むことができませんでした。"</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"メッセージを開いています..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>件のメッセージを<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>に移動しました"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"添付ファイルを転送できませんでした。"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"添付ファイルを転送できません"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>でログインできませんでした。"</string>
- <string name="login_failed_title" msgid="791871543602843876">"ログインできませんでした"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"ログインできませんでした"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"このアカウントから連絡先を同期します。"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"このアカウントからカレンダーを同期"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"このアカウントからメールを同期する"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Wi-Fiへの接続時に添付ファイルを自動的にダウンロードする"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fiへの接続時に添付ファイルを自動的にダウンロードする"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"完了できませんでした"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"同期する日数"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自動"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>のユーザー名またはパスワードが正しくありません。今すぐ更新しますか？"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"優先アカウントにする"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"いつもこのアカウントでメールを送信"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"添付ファイルの自動ダウンロード"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Wi-Fiへの接続時に添付ファイルを自動的にダウンロードする"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"添付ファイルのダウンロード"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi接続時に最近のメールの添付ファイルを自動的にダウンロード"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"メール着信通知"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"同期頻度、通知、その他"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"メール受信: システムバーで通知"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"極大"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"全員に返信"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"メールに返信する際に毎回「全員に返信」する"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"[画像を表示]をデフォルトに戻す"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"すべての送信者をデフォルトに戻す（画像を自動的に表示しない）"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"[画像を表示]を解除しました。"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"メールに返信する際に毎回「全員に返信」する"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"画像の表示を確認"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"メールの画像が自動的には表示されない"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"[画像を表示]を解除しました。"</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"同期を待機中"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"まもなくメールが表示されます。"</string>
- <string name="widget_other_views" msgid="4988574907386539499">"タップで変更"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"統合受信トレイ"</string>
<string name="widget_unread" msgid="4404711399009077833">"未読"</string>
<string name="widget_starred" msgid="8290352707134011791">"スター付き"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3655271..37d7280 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"참조:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"숨은 참조:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"제목:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"편지쓰기"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"이메일 작성"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 원본 메일 --------"\n"제목: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%2$s</xliff:g>"\n"받는사람: <xliff:g id="TO">%3$s</xliff:g>"\n"참조: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"받은메일"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"세부정보 표시"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"메일 세부정보"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"첨부파일 정보"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi 연결 필요"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi 설정"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi 연결 필요"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi 설정"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"앱 설정"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"첨부파일을 열 수 없습니다."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"이러한 유형의 첨부파일에는 악성 소프트웨어가 포함되어 있을 수 있으므로 파일을 저장하거나 열 수 없습니다."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"계정의 보안 정책으로 인해 이 첨부파일을 저장하거나 열 수 없습니다."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"이 첨부파일은 너무 커서 모바일 네트워크를 통해 다운로드할 수 없습니다. WiFi 네트워크에 연결되면 다운로드할 수 있습니다."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"이 첨부파일은 너무 커서 모바일 네트워크를 통해 다운로드할 수 없습니다. Wi-Fi 네트워크에 연결되면 다운로드할 수 있습니다."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"이 첨부파일을 열 수 있는 앱이 설치되어 있지 않습니다. Android 마켓에서 적절한 앱을 다운로드하세요."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"이 첨부파일은 앱입니다. 설치하기 전에 설정 > 앱에서 알 수 없는 출처를 확인해야 합니다."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"이메일에서 직접 앱을 설치할 수 없습니다. 먼저 이 앱을 저장한 다음 다운로드 앱을 사용하여 설치하세요."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"메일을 삭제했습니다."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"메일이 임시보관함에 저장되었습니다."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"첨부파일을 표시할 수 없습니다."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"첨부파일 \'<xliff:g id="FILENAME">%s</xliff:g>\'을(를) 로드하지 못했습니다."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"첨부파일을 표시할 수 없습니다."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"첨부파일 \'<xliff:g id="FILENAME">%s</xliff:g>\'을(를) 로드하지 못했습니다."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"메일을 여는 중…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"메일 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>개가 <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>(으)로 이동됨"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"하나 이상의 첨부파일을 전달하지 못했습니다."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"첨부파일을 전달하지 못했습니다."</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>에 로그인하지 못했습니다."</string>
- <string name="login_failed_title" msgid="791871543602843876">"로그인 실패"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"로그인하지 못했습니다."</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"이 계정에서 연락처를 동기화합니다."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"이 계정에서 캘린더를 동기화합니다."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"이메일 동기화"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"WiFi에 연결되면 자동으로 첨부파일 다운로드"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi에 연결되면 자동으로 첨부파일 다운로드"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"완료할 수 없음"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"동기화할 일 수"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"자동"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>의 사용자 이름 또는 비밀번호가 잘못되었습니다. 지금 업데이트하시겠습니까?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"기본 계정"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"기본적으로 이 계정에서 이메일 전송"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"첨부파일 자동 다운로드"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"WiFi에 연결되면 자동으로 첨부파일 다운로드"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"첨부파일 다운로드"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi를 통해 최근 메일의 첨부파일을 자동으로 다운로드합니다."</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"이메일 알림"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"빈도 및 알림 등을 동기화합니다."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"이메일이 오면 시스템 바에서 알림"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"크게"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"아주 크게"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"전체답장"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"메일 답장 시, \'전체답장\'을 기본값으로 설정"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"\'이미지 표시\'에 대한 기본값 복원"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"모든 발신자에 대한 기본값 복원(자동으로 이미지 표시 안함)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\'이미지 표시\'가 초기화되었습니다."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"메일 답장 시, \'전체답장\'을 기본값으로 설정"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"사진을 표시하도록 요청"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"메일의 사진이 자동으로 표시되지 않음"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'이미지 표시\'가 초기화되었습니다."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"동기화 대기 중"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"이메일이 곧 표시됩니다."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"변경하려면 아이콘을 터치합니다."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"모든 받은편지함"</string>
<string name="widget_unread" msgid="4404711399009077833">"읽지않음"</string>
<string name="widget_starred" msgid="8290352707134011791">"별표편지함"</string>
diff --git a/res/values-land-v14/styles.xml b/res/values-land-v14/styles.xml
deleted file mode 100644
index 832a2c5..0000000
--- a/res/values-land-v14/styles.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="RecipientComposeHeading">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">18sp</item>
- <item name="android:textColor">@color/compose_label_text</item>
- <item name="android:layout_marginRight">4dip</item>
- <item name="android:layout_gravity">center</item>
- <item name="android:layout_marginTop">2dip</item>
- </style>
-
- <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:addStatesFromChildren">true</item>
- <item name="android:focusable">false</item>
- <item name="android:focusableInTouchMode">false</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:minHeight">38dip</item>
- <item name="android:paddingTop">0dip</item>
- </style>
-
- <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
- <item name="android:minHeight">36dip</item>
- <item name="android:gravity">bottom</item>
- </style>
-
- <style name="LargeComposeAreaBody" parent="@style/ComposeBodyStyle" >
- <item name="android:background">@null</item>
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:minHeight">38dip</item>
- </style>
-
- <style name="EmailComposeEditTextView">
- <item name="android:minHeight">40dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:background">@null</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2ba0b4d..1cced02 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc (kopija):"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc (nemat. kop.):"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Tema:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Sukurti laišką"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Kurti el. laišką"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pirminis pranešimas --------"\n"Tema: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Nuo: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"CC (kopija): <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rašė:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cituojamas tekstas"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Rodyti išsamią informaciją"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Išsami pranešimo informacija"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Priedo informacija"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Reikalingas „Wi-Fi“ ryšys"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"„Wi-Fi“ nustatymai"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Reikalingas „Wi-Fi“ ryšys"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"„Wi-Fi“ nustatymai"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Programos nustatymai"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nepavyksta atidaryti priedo."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Negalima išsaugoti ar atidaryti šio failo, nes šio tipo priede gali būti kenkėjiška programinė įranga."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Šio priedo negalima išsaugoti ar atidaryti dėl šios paskyros saugos politikos."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Šis priedas per didelis, todėl jo atsisiųsti mobiliojo ryšio tinklu negalima. Jį atsisiųsti galėsite, kai kitą kartą prisijungsite prie „Wi-Fi“ tinklo."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Šis priedas yra per didelis, todėl jo atsisiųsti mobiliuoju tinklu negalima. Jį atsisiųsti galėsite, kai kitą kartą prisijungsite prie „Wi-Fi“ tinklo."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nėra įdiegtos programos, kurią naudojant būtų galima atidaryti šį priedą. Pabandykite atsisiųsti tinkamą programą iš „Android“ prekyvietės."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Šis priedas – tai programa. Kad galėtumėte ją įdiegti, pirmiausia turite pažymėti „Nežinomi šaltiniai“ skiltyje „Nustatymai“ > „Programos“."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Programų negalima įdiegti tiesiogiai iš el. pašto. Pirmiausia išsaugokite šią programą, tada įdiekite ją naudodami „Atsisiuntimų“ programą."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Pranešimas atmestas."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Pranešimas išsaugotas kaip juodraštis."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Nepavyksta pateikti priedo."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Nepavyko įkelti priedo „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nepavyksta pateikti priedo."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nepavyko įkelti priedo „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Atidaromas pranešimas…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Į <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> perkelti pranešimai: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepavyko persiųsti mažiausiai vieno priedo."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Priedas nepersiųstas"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Įvyko prisijungimo prie „<xliff:g id="ACCOUNT_NAME">%s</xliff:g>“ klaida."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Įvyko prisijungimo klaida"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Nepavyko prisijungti"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinchronizuoti šios paskyros adresatus."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinchronizuoti šios paskyros kalendorių."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinchronizuoti el. paštą iš šios paskyros."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automatiškai atsisiųsti priedus, kai prisijungiama prie „Wi-Fi“"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatiškai atsisiųsti priedus, kai prisijungiama prie „Wi-Fi“"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepavyko užbaigti"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Sinchronizuojamų dienų skaičius"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatinis"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ naudotojo vardas ar slaptažodis neteisingas. Atnaujinti juos dabar?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Numatytoji paskyra"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automat. atsisiunčiami priedai"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatiškai atsisiųsti priedus, kai prisijungiama prie „Wi-Fi“"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Atsisiųsti priedus"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatiškai atsis. naujausių pranešimų priedai per „Wi-Fi“"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"El. pašto pranešimai"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sinchronizavimo dažnumas, pranešimai ir kt."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Kai atsiunčiamas el. laiškas, pranešti sistemos juostoje"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Didelis"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Itin didelis"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atsakyti visiems"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atsakyti į pranešimus pasirinkite „Atsakyti visiems“ kaip numat. nust."</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atkurti numatytuosius funkcijos „Rodyti paveikslėlius“ nustatymus"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atkurti visų siuntėjų numatytuosius nustatymus (automatiškai nerodyti paveikslėlių)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"„Rodyti paveikslėlius“ išvalyta."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Kaip numatyt. atsakymų į praneš. nustat. pasirinkti „Atsakyti visiems“"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Paprašyti rodyti paveikslėlius"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pranešimuose esantys paveikslėliai nebus rodomi automatiškai"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Rodyti paveikslėlius“ išvalyta."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> iš <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Laukiama sinchronizavimo"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jūsų el. paštas netrukus bus parodytas."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Kad pak., pal. pikt."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Sujungt. Gautieji"</string>
<string name="widget_unread" msgid="4404711399009077833">"Neskaityta"</string>
<string name="widget_starred" msgid="8290352707134011791">"Pažymėta žvaigždute"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3129476..b767cff 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopija:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Diskr. kop.:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Tēma:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Rakstīt vēstuli"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Rakstiet e-pasta ziņojumu"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Sākotnējais ziņojums --------"\n"Temats: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"No: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rakstīja:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citēts teksts"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Rādīt informāciju"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Informācija par ziņojumu"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informācija par pielikumu"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Nepieciešams Wi-Fi savienojums"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wi-Fi iestatījumi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Nepieciešams Wi-Fi savienojums"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi iestatījumi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Lietotnes iestatījumi"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nevar atvērt pielikumu."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Šo failu nevar saglabāt vai atvērt, jo šī veida pielikumā var būt ietverta ļaunprātīga programmatūra."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Šo pielikumu nevar saglabāt vai atvērt šī konta drošības politiku dēļ."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Šis pielikums ir pārāk liels, lai to lejupielādētu pa mobilo tīklu. Varat to lejupielādēt nākamreiz, kad izveidosiet savienojumu ar Wi-Fi tīklu."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Šis pielikums ir pārāk liels, lai to lejupielādētu mobilajā tīklā. Varat to lejupielādēt nākamreiz, kad pievienosieties Wi-Fi tīklam."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nav instalēta neviena lietotne, ar kuru var atvērt šo pielikumu. Mēģiniet lejupielādēt piemērotu lietotni no vietnes Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Šis pielikums ir lietotne. Lai to instalētu, sadaļā Iestatījumi > Lietotnes ir jāatzīmē izvēles rūtiņa Nezināmi avoti."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Lietotnes nevar instalēt tieši no e-pasta ziņojuma. Vispirms saglabājiet šo lietotni un pēc tam instalējiet to, izmantojot lietotni Lejupielādes."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Ziņojums ir atmests."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Ziņojums ir saglabāts kā melnraksts."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Nevar parādīt pielikumu."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Nevarēja ielādēt pielikumu <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nevarēja parādīt pielikumu."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nevarēja ielādēt pielikumu <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Notiek ziņojuma atvēršana…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ziņojums pārvietots uz <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nevarēja pārsūtīt vienu vai vairākus pielikumus."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Pielikums netika nosūtīts."</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Neizdevās pierakstīties kontā <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Neizdevās pierakstīties"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Nevarēja pierakstīties"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhronizēt kontaktpersonas no šī konta."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhronizēt šī konta kalendāru."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Šī konta e-pasta sinhronizācija."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automātiski lejupielādēt pielikumus, kad ir izveidots Wi-Fi savienojums"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automātiski lejupielādēt pielikumus, kad ir izveidots WiFi savienojums"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nevarēja pabeigt"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Sinhronizējamās dienas"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automātiski"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> lietotājvārds un parole nav pareizi. Vai atjaunināt tos tūlīt?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Noklusējuma konts"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Pielikumu automāt. lejupielāde"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automātiski ielādēt pielikumus, ja izveidots Wi-Fi savienojums"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lejupielādēt pielikumus"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automātiski lejupielādēt jaunāko ziņojumu pielikumus Wi-Fi tīklā"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-pasta paziņojumi"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sinhronizācijas biežums, paziņojumi u.c."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Rādīt paziņojumu statusa joslā, kad tiek saņemts e-pasta ziņojums"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Liels"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Milzīgs"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atbildēt visiem"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atbildēšanai uz ziņojumiem kā noklusējumu iestatīt Atbildēt visiem"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atjaunot noklusējuma vērtību iestatījumam Rādīt attēlus"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atjaunot noklusējuma iestatījumus visiem sūtītājiem (nerādīt attēlus automātiski)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Tika notīrīts saraksts Rādīt attēlus."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Atbildēšanai uz ziņojumiem kā noklusējumu iestatīt Atbildēt visiem"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pieprasīt attēlu rādīšanu"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Ziņojumos ietvertie attēli netiks automātiski rādīti."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Iestatījums Rādīt attēlus ir notīrīts."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> no <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Gaida sinhronizāciju"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Drīz tiks parādīts jūsu e-pasta saturs."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Mainiet pieskaroties"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombinētā iesūtne"</string>
<string name="widget_unread" msgid="4404711399009077833">"Nelasītie"</string>
<string name="widget_starred" msgid="8290352707134011791">"Atzīm. ar zvaigznīti"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ddc55fa..3850413 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Sk:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Skt:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Subjek:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Karang Mel"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Karang e-mel"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mesej Asal --------"\n"Subjek: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Daripada: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kepada: <xliff:g id="TO">%3$s</xliff:g>"\n"SK: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Petikan teks:"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Tunjukkan butiran"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Butiran mesej"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maklumat lampiran"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Sambungan WiFi diperlukan"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Tetapan WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Sambungan Wi-Fi diperlukan"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Tetapan Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Tetapan aplikasi"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Tidak boleh membuka lampiran."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Anda tidak boleh menyimpan atau membuka fail ini kerana jenis lampiran ini mungkin mengandungi perisian yang berbahaya."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Lampiran ini tidak boleh disimpan atau dibuka disebabkan oleh dasar keselamatan akaun ini."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Lampiran ini terlalu besar untuk dimuat turun melalui rangkaian mudah alih. Anda boleh memuat turunnya kali yang berikut anda bersambung ke rangkaian WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Lampiran ini terlalu besar untuk dimuat turun melalui rangkaian mudah alih. Anda boleh memuat turunnya kali yang berikut anda bersambung ke rangkaian Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Tiada aplikasi dipasang yang boleh membuka lampiran ini. Cuba muat turn aplikasi yang sesuai daripada Pasaran Android."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Lampiran ini adalah satu aplikasi. Anda mesti menyemak Sumber Tidak Diketahui dalam Tetapan > Aplikasi sebelum anda boleh memasangnya."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikasi tidak boleh dipasang terus dari e-mel. Mula-mula simpan aplikasi ini dan kemudian pasangkannya menggunakan aplikasi Muat Turun."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mesej dibuang."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mesej disimpan sebagai draf."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Tidak boleh memaparkan lampiran."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Tidak dapat memuatkan lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak boleh memaparkan lampiran."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Tidak dapat memuatkan lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Membuka mesej..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesej dialih ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak boleh mengirim semula satu atau lebih lampiran."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak dikirim semula"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Log masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g> gagal."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Log masuk gagal"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat melog masuk"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Segerakkan kenalan daripada akaun ini."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Segerakkan kalendar dari akaun ini."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Segerakkan e-mel dari akaun ini."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Memuat turun lampiran secara automatik apabila disambungkan kepada WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Muat turun lampiran secara automatik apabila disambungkan kepada Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tidak boleh diselesaikan"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Hari untuk disegerakkan"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatik"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau kata laluan untuk <xliff:g id="ACCOUNT">%s</xliff:g> tidak betul. Kemas kininya sekarang?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Akaun lalai"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Hantar e-mel daripada akaun ini secara lalainya"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automuat turun lampiran"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Memuat turun lampiran secara automatik apabila disambungkan kepada WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Muat turun lampiran"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto muat turun lampiran ke mesej terbaharu melalui Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan e-mel"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Kekerapan penyegerakan, pemberitahuan, dsb."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Beritahu dalam bar Sistem apabila e-mel diterima"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas kepada semua"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Jadikan \'Balas kepada semua\' lalai untuk membalas mesej"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Pulihkan lalai untuk \"Tunjukkan gambar\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Pulihkan lalai untuk semua pengirim (jangan tunjukkan gambar secara automatik)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Tunjukkan gambar\" telah dipadam bersih."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \"Balas kepada semua\" sebagai lalai untuk balasan mesej"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Minta untuk menunjukkan gambar"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gambar dalam mesej tidak akan ditunjukkan secara automatik"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tunjukkan gambar\" sudah dipadam bersih."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Menunggu penyegerakan"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mel anda akan muncul tidak lama lagi."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Sentuh ikon untuk menukar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Peti Masuk Gabungan"</string>
<string name="widget_unread" msgid="4404711399009077833">"Belum dibaca"</string>
<string name="widget_starred" msgid="8290352707134011791">"Berbintang"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 90cf5b1..c058a37 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopi:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Blindkopi:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Emne:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-post"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Skriv e-post"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Sitert tekst"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Vis detaljer"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Meldingsinformasjon"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Vedleggsinformasjon"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"WiFi-tilkobling er påkrevd"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Innstillinger for Wi-FI"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-tilkobling kreves"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi-innstillinger"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Innstillinger for app"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Kan ikke åpne vedlegget."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Du kan ikke lagre eller åpne denne filen fordi denne typen vedlegg kan inneholde skadelig programvare."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Dette vedlegget kan ikke lagres eller åpnes på grunn av kontoens retningslinjer for sikkerhet."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Vedlegget er for stort for nedlasting over mobilt nettverk. Du kan laste det ned neste gang du er koblet til et Wi-Fi-nettverk."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Vedlegget er for stort for nedlasting over mobilnettverk. Du kan laste det ned neste gang du er koblet til et Wi-Fi-nettverk."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Det er ikke installert en app som kan åpne dette vedlegget. Prøv å laste ned en passende app fra Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Dette vedlegget er en app. Du må kontrollere Ukjente kilder i Apper under Innstillinger før du kan installere det."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apper kan ikke installeres direkte fra e-post. Du må først lagre denne appen og deretter installere den ved hjelp av appen Nedlastinger."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Meldingen ble forkastet."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Meldingen ble lagret som utkast."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Kan ikke vise vedlegget."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Kan ikke laste inn vedlegget <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan ikke vise vedlegg."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kunne ikke laste inn vedlegget «<xliff:g id="FILENAME">%s</xliff:g>»."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Åpner melding …"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> melding flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kunne ikke videresende ett eller flere vedlegg."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Vedlegget ble ikke videresendt"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Pålogging til <xliff:g id="ACCOUNT_NAME">%s</xliff:g> mislyktes."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Pålogging mislyktes"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Kunne ikke logge på"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontakter fra denne kontoen."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalendere fra denne kontoen."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkroniser e-postmeldinger fra denne kontoen."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Last ned vedlegg automatisk når du er koblet til WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Last ned vedlegg automatisk når tilkoblet til trådløst nettverk"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kunne ikke fullføre"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Antall dager å synkronisere"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brukernavn eller passord for <xliff:g id="ACCOUNT">%s</xliff:g> er feil. Vil du oppdatere nå?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Bruk denne kontoen som standard for utgående e-post."</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automatisk nedlasting av vedlegg"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Last ned vedlegg automatisk når du er koblet til WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Nedlasting av vedlegg"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Last ned vedlegg fra nye e-poster automatisk via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Varsling om e-post"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, varslinger m.m."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Gi beskjed i systemfeltet når nye e-postmeldinger kommer"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kjempestor"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Bruk «Svar alle» som standard for å svare på e-poster"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Gjenopprett standard for «Vis bilder»"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Gjenopprett standard for alle avsendere (ikke vis bilder automatisk)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"«Vis bilder» ble klarert."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Bruk «Svar alle» som standard for svar på e-poster"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Be om å vise bilder"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder vises ikke automatisk i e-poster"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"«Vis bilder» er tømt."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-posten din vil dukke opp snart."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Endre: Trykk ikon."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombinert innboks"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ulest"</string>
<string name="widget_starred" msgid="8290352707134011791">"Stjernemerket"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d5c05ec..76f6b93 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Onderwerp:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Nieuw bericht"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"E-mail opstellen"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Van: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Aan: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Geciteerde tekst"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Details weergeven"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Berichtdetails"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Bijlage-informatie"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wifi-verbinding vereist"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wifi-instellingen"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-verbinding vereist"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi-instellingen"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"App-instellingen"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Kan bijlage niet openen."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"U kunt dit bericht niet opslaan of openen omdat dit type bijlage schadelijke software kan bevatten."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Deze bijlage kan niet worden opgeslagen of geopend als gevolg van het beveiligingsbeleid van dit account."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Deze bijlage is te groot om via een mobiel netwerk te downloaden. U kunt de bijlage downloaden wanneer u de volgende keer verbinding maakt met een wifi-netwerk."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Deze bijlage is te groot om te downloaden via een mobiel netwerk. U kunt de bijlage downloaden wanneer u weer verbinding maakt met een Wi-Fi-netwerk."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Er is geen app geïnstalleerd die de bijlage kan openen. Download een geschikte app van Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Deze bijlage is een app. U moet \'Onbekende bronnen\' aanvinken in \'Instellingen\' > \'Apps\' voordat u de app kunt installeren."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apps kunnen niet rechtstreeks via e-mail worden geïnstalleerd. Sla de app eerst op en installeer deze via de app Downloads."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Bericht wordt verwijderd"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Bericht opgeslagen als concept."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Kan bijlage niet weergeven."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Kan de bijlage \'<xliff:g id="FILENAME">%s</xliff:g>\' niet laden."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan bijlage niet weergegeven."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kan de bijlage \'<xliff:g id="FILENAME">%s</xliff:g>\' niet laden."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Bericht openen..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> bericht verplaatst naar <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kan een of meer bijlagen niet doorsturen."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Bijlage niet doorgestuurd"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>: aanmelden mislukt."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Aanmelden mislukt"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Kan niet aanmelden"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Contacten van dit account synchroniseren."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Agenda van dit account synchroniseren."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-mail voor dit account synchroniseren."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Bijlagen automatisch downloaden indien verbonden met wifi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Bijlagen automatisch downloaden indien verbonden met Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Is niet voltooid"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagen om te synchroniseren"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Nu bijwerken?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Standaardaccount"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail standaard vanaf dit account verzenden"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Bijlagen automatisch downloaden"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Bijlagen automatisch downloaden indien verbonden met wifi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen downloaden"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synchronisatiefrequentie, meldingen, enzovoort"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Melding in de systeembalk wanneer er e-mail binnenkomt"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorm"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen beantwoorden"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\'Allen beantwoorden\' gebruiken als standaard beantwoordingsoptie"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Standaardinstellingen herstellen voor \'Afbeeldingen weergeven\'"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Standaardinstellingen voor alle afzenders herstellen (afbeeldingen niet automatisch weergeven)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\'Afbeeldingen weergeven\' gewist."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\'Allen beantwoorden\' instellen als standaardoptie voor berichtreacties"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vragen om afbeeldingen weer te geven"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Afbeeldingen in berichten worden niet automatisch weergegeven"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'Afbeeldingen weergeven\' gewist."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wachten op synchronisatie"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Uw e-mail wordt over enkele ogenblikken weergegeven."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Raak pictogram aan voor wijzigen."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Gecombineerde Inbox"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ongelezen"</string>
<string name="widget_starred" msgid="8290352707134011791">"Met ster"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 70e79a9..0b516b8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"DW:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"UDW:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Temat:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Utwórz wiadomość"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Napisz e-maila."</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Do: <xliff:g id="TO">%3$s</xliff:g>"\n"DW: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> napisał(a):"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cytowany tekst"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Pokaż szczegóły"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Szczegóły wiadomości"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informacje o załączniku"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wymagane połączenie Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Ustawienia Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wymagane połączenie Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Ustawienia Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Ustawienia aplikacji"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nie można otworzyć załącznika."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Pliku nie można zapisać ani otworzyć, ponieważ ten typ załącznika może zawierać złośliwe oprogramowanie."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Załącznika nie można zapisać ani otworzyć ze względu na zasady bezpieczeństwa na koncie."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Załącznik jest za duży, aby go pobrać przez sieć komórkową. Możesz go pobrać po połączeniu się z siecią Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Ten załącznik jest za duży, aby go pobrać przez sieć komórkową. Możesz go pobrać po następnym połączeniu z siecią Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Brak zainstalowanej aplikacji umożliwiającej otwarcie załącznika. Pobierz odpowiednią aplikację z Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Załącznik to aplikacja. Aby ją zainstalować, musisz zaznaczyć Nieznane źródła w sekcji Ustawienia > Aplikacje."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikacji nie można zainstalować bezpośrednio z e-maila. Najpierw ją zapisz, a następnie zainstaluj za pomocą aplikacji Pobrane pliki."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Wiadomość została odrzucona."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Wiadomość została zapisana jako wersja robocza."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Nie można wyświetlić załącznika."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Nie można wczytać załącznika „<xliff:g id="FILENAME">%s</xliff:g>”."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nie można wyświetlić załącznika."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nie można wczytać załącznika „<xliff:g id="FILENAME">%s</xliff:g>”."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otwieranie wiadomości…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Przeniesiono <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> wiadomość do <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Co najmniej jednego załącznika nie można przekazać dalej."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Nie przekazano załącznika"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Nie udało się zalogować na konto <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Logowanie nieudane"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Nie można się zalogować"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizuj kontakty na tym koncie"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizuj kalendarz na tym koncie"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizuj wiadomości e-mail z tego konta"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nie można zakończyć"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dni do synchronizacji"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatycznie"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są niepoprawne. Zaktualizować je teraz?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Domyślne konto"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Pobieranie załączników"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi."</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pobieraj załączniki"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi."</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Częstotliwość synchronizacji, powiadomienia itd."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Powiadamiaj na pasku systemu o otrzymaniu wiadomości e-mail"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpowiedz wszystkim"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Resetuj opcję „Pokaż obrazy”"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Przywróć wartość domyślną dla wszystkich nadawców (nie pokazuj obrazów)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Opcja „Pokaż obrazy” została wyczyszczona."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną."</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pytaj, czy pokazać obrazy"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrazy w wiadomościach nie będą pokazywane automatycznie."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opcja „Pokaż obrazy” została wyczyszczona."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Oczekiwanie na synchronizację"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Twoja poczta e-mail pojawi się za chwilę."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Dotknij, aby zmienić."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Wszystkie skrzynki odbiorcze"</string>
<string name="widget_unread" msgid="4404711399009077833">"Nieprzeczytane"</string>
<string name="widget_starred" msgid="8290352707134011791">"Oznaczone gwiazdką"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3baf87b..b85440c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Assunto:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Redigir correio"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Escrever e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem original --------"\n"Assunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre aspas"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostrar detalhes"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalhes da mensagem"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informações sobre o anexo"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Ligação Wi-Fi necessária"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Definições de Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Ligação Wi-Fi necessária"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Definições de Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Definições da aplicação"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Não é possível abrir o anexo."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Não é possível guardar ou abrir este ficheiro porque este tipo de anexo pode conter software malicioso."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Não é possível guardar ou abrir este anexo devido às políticas de segurança desta conta."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Este anexo é demasiado grande para ser transferido através de uma rede de telemóvel. Pode transferi-lo da próxima vez que se ligar a uma rede Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Este anexo é demasiado grande para ser transferido através de uma rede de telemóvel. Pode transferi-lo da próxima vez que se ligar a uma rede Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Não existe nenhuma aplicação instalada capaz de abrir este anexo. Tente transferir uma aplicação apropriada do Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Este anexo é uma aplicação. Tem de marcar Fontes Desconhecidas em Definições > Aplicações, antes da instalação."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Não é possível instalar aplicações diretamente a partir do e-mail. Deverá primeiro guardar esta aplicação e, em seguida, instalá-la utilizando a aplicação Transferências."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem rejeitada."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mensagem guardada como rascunho."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Não é possível visualizar o anexo."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Não foi possível carregar o anexo “<xliff:g id="FILENAME">%s</xliff:g>”."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível visualizar o anexo."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Não foi possível carregar o anexo “<xliff:g id="FILENAME">%s</xliff:g>”."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"A abrir a mensagem…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagem movida para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar um ou mais anexos."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"O anexo não foi encaminhado"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Falha no início de sessão de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Falha ao iniciar sessão"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Impossível iniciar sessão"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos a partir desta conta."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar o calendário a partir desta conta."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar e-mail a partir desta conta."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dias para sincronização"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de utilizador ou palavra-passe para <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Quer atualizá-los agora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Conta predefinida"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail a partir desta conta por predefinição"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Transf. automática dos anexos"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transferir anexos"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frequência da sincronização, notificações, etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar na barra de sistema quando chegar e-mail"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Tornar “Responder a todos” a opção predef. para responder a mensagens"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Repor predefinição para \"Mostrar imagens\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Repor predefinição para todos os remetentes (não mostrar imagens automaticamente)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"“Mostrar imagens” limpa."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Predefinir \"Responder a todos\" para mensagens de resposta"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Perguntar para mostrar fotografias"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"As fotografias em mensagens não serão apresentadas automaticamente"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Mostrar imagens\" desmarcada."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"A aguardar sincronização"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"O e-mail aparecerá em breve."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Toque ícone p/ mudar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Cx entrada combinada"</string>
<string name="widget_unread" msgid="4404711399009077833">"Não lida"</string>
<string name="widget_starred" msgid="8290352707134011791">"Com estrela"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d65a955..3c7883e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Cco:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Assunto:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Escrever e-mail"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Escrever e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem Original --------"\n"Assunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto das mensagens anteriores"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Mostrar detalhes"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalhes da mensagem"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informações do anexo"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"É necessário ter conexão Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Configurações de Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Conexão Wi-Fi necessária"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Configurações de Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Config. do aplicativo"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Não foi possível abrir o anexo."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Não é possível salvar ou abrir este arquivo porque este tipo de anexo pode conter software malicioso."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Não é possível salvar ou abrir este anexo por causa das políticas de segurança desta conta."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Este anexo é muito grande para ser transferido através de uma rede móvel. O download pode ser feito na próxima vez que você se conectar a uma rede Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Este anexo é muito grande para o download através de uma rede móvel. O download pode ser feito da próxima vez que você se conectar a uma rede Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Não há nenhum aplicativo instalado que possa abrir este anexo. Tente fazer download de um aplicativo adequado no Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Este anexo é um aplicativo. Você deve marcar Fontes desconhecidas em Configurações > Aplicativos antes de instalá-lo."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Não é possível instalar os aplicativos diretamente do e-mail. Primeiro salve este aplicativo e instale-o usando o aplicativo Downloads."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem descartada."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mensagem salva como rascunho."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Não é possível exibir o anexo."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Não foi possível carregar o anexo \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível exibir o anexo."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Não foi possível carregar o anexo \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abrindo a mensagem…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagens movidas para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar todos os anexos."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Anexo não encaminhado"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Falha ao fazer login"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Não foi possível fazer login"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contatos desta conta."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar agenda desta conta."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar e-mail desta conta."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Transferir anexos automaticamente quando conectado à rede Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Fazer download de anexos automaticamente ao conectar ao Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dias para sincronizar"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de usuário ou a senha de <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Atualizar agora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Conta padrão"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail desta conta por padrão"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Download automático dos anexos"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Transferir anexos automaticamente quando conectado à rede Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Fazer download dos anexos"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Fazer download automát. dos anexos de mens. recentes via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frequência de sincronização, notificações etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar sobre chegada de e-mails na barra de sistema"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Tornar padrão a opção \"Responder a todos\" para responder a mensagens"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurar padrão de \"Mostrar fotos\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurar padrão para todos os remetentes (não mostrar fotos automaticamente)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"A opção \"Mostrar imagens\" foi desmarcada."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Tornar a opção \"Responder a todos\" padrão p/ respostas das mensagens"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pedir para exibir imagens"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"As imagens das mensagens não serão exibidas automaticamente"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opção \"Mostrar fotos\" desmarcada."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Aguardando sincronização"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Seu e-mail aparecerá em breve."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Toque para mudar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Caixa de entrada mesclada"</string>
<string name="widget_unread" msgid="4404711399009077833">"Não lidas"</string>
<string name="widget_starred" msgid="8290352707134011791">"Com estrela"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a70dd38..031d207 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -160,7 +160,7 @@
<skip />
<!-- no translation found for message_compose_subject_label (1592314202889683309) -->
<skip />
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Nov messadi"</string>
+ <!-- outdated translation 7575406246484103697 --> <string name="message_compose_body_hint" msgid="3864004548670233396">"Nov messadi"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messadi original --------"\n"Object: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scrit:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text cità"</string>
@@ -225,9 +225,9 @@
<skip />
<!-- no translation found for attachment_info_dialog_default_title (4995755709689009622) -->
<skip />
- <!-- no translation found for attachment_info_dialog_wifi_title (3433085933207351929) -->
+ <!-- no translation found for attachment_info_dialog_wifi_title (3174350153882915382) -->
<skip />
- <!-- no translation found for attachment_info_wifi_settings (3275768005981284687) -->
+ <!-- no translation found for attachment_info_wifi_settings (96432970927503597) -->
<skip />
<!-- no translation found for attachment_info_application_settings (4124655487276125596) -->
<skip />
@@ -237,7 +237,7 @@
<skip />
<!-- no translation found for attachment_info_policy (3560422300127587508) -->
<skip />
- <!-- no translation found for attachment_info_wifi_only (1952445279772844815) -->
+ <!-- no translation found for attachment_info_wifi_only (1481120960014563617) -->
<skip />
<!-- no translation found for attachment_info_no_intent (8139209405745777924) -->
<skip />
@@ -260,8 +260,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Stizzà il messadi"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Memorisà il messadi sco sboz."</string>
- <!-- outdated translation 6096315816776330821 --> <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Impussibel da mussar questa agiunta."</string>
- <!-- no translation found for message_view_load_attachment_failed_toast (3623598332367932461) -->
+ <!-- outdated translation 6096315816776330821 --> <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impussibel da mussar questa agiunta."</string>
+ <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
<skip />
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avrir il messadi..."</string>
<!-- no translation found for message_moved_toast:one (3098493230185412871) -->
@@ -271,7 +271,7 @@
<skip />
<!-- no translation found for login_failed_ticker (5749227022559285302) -->
<skip />
- <!-- no translation found for login_failed_title (791871543602843876) -->
+ <!-- no translation found for login_failed_title (7624349996212476176) -->
<skip />
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -391,7 +391,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronisar ils contacts da quest conto"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronisar il chalender da quest conto"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronisar ils e-mails da quest conto."</string>
- <!-- no translation found for account_setup_options_background_attachments_label (6759055024748351429) -->
+ <!-- no translation found for account_setup_options_background_attachments_label (5247749298276451846) -->
<skip />
<!-- outdated translation 7827583313117521383 --> <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impussibel da terminar l\'installaziun"</string>
<!-- outdated translation 8764417340954006086 --> <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Quantitad da sincronisar"</string>
@@ -470,9 +470,9 @@
<skip />
<string name="account_settings_default_label" msgid="3575963379680943640">"Conto predefinì"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Trametter ils e-mails tenor standard cun quest conto"</string>
- <!-- no translation found for account_settings_background_attachments_label (6044567979405738536) -->
+ <!-- no translation found for account_settings_background_attachments_label (2980317599840958688) -->
<skip />
- <!-- no translation found for account_settings_background_attachments_summary (323937814012234081) -->
+ <!-- no translation found for account_settings_background_attachments_summary (5954218549226189376) -->
<skip />
<string name="account_settings_notify_label" msgid="1630001017303007974">"Avis ad e-mails"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"\"Frequenza da sincronisaziun, avis, etc.\""</string>
@@ -587,14 +587,14 @@
<!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
<!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
<skip />
- <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
+ <!-- no translation found for general_preference_reply_all_summary (9191932552604733245) -->
<!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
<skip />
- <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+ <!-- no translation found for general_preferences_clear_trusted_senders_title (507988226277210305) -->
<skip />
- <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+ <!-- no translation found for general_preferences_clear_trusted_senders_summary (2648501128162793879) -->
<skip />
- <!-- no translation found for trusted_senders_cleared (8079053907862270420) -->
+ <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
<skip />
<!-- no translation found for position_of_count (7989353140376877792) -->
<skip />
@@ -602,8 +602,6 @@
<skip />
<!-- no translation found for waitinf_for_sync_message_2 (5656175205790694016) -->
<skip />
- <!-- no translation found for widget_other_views (4988574907386539499) -->
- <skip />
<!-- no translation found for widget_all_mail (4352573990283094963) -->
<skip />
<!-- no translation found for widget_unread (4404711399009077833) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fe6910d..3eeacd7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Subiect:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Scrieţi un mesaj"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Scrieţi un e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mesajul original --------"\n"Subiect: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De la: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Către: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a scris:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Mesaj citat"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Afişaţi detalii"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Detalii mesaj"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informaţii ataşament"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Este necesară o conexiune Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Setări Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Este necesară o conexiune Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Setări Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Setări aplicaţii"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nu se poate deschide ataşamentul."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Nu puteţi salva sau deschide acest fişier, deoarece acest tip de ataşament ar putea conţine programe rău intenţionate."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Acest ataşament nu poate fi salvat sau deschis din cauza politicilor de securitate ale acestui cont."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Acest ataşament este prea mare pentru a fi descărcat prin reţeaua mobilă. Îl puteţi descărca data următoare când vă conectaţi la o reţea Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Acest ataşament este prea mare pentru a fi descărcat prin reţeaua mobilă. Îl puteţi descărca cu proxima ocazie când vă conectaţi la o reţea Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nu există nicio aplicaţie instalată care să poată deschide acest ataşament. Încercaţi să descărcaţi o aplicaţie corespunzătoare din Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Acest ataşament este o aplicaţie. Înainte de a o putea instala, trebuie să bifaţi Surse necunoscute din Setări > Aplicaţii."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplicaţiile nu pot fi instalate direct din e-mail. Salvaţi mai întâi această aplicaţie şi instalaţi-o folosind aplicaţia Descărcări."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Mesaj refuzat."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Mesaj salvat ca mesaj nefinalizat."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Ataşamentul nu se poate afişa."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Ataşamentul „<xliff:g id="FILENAME">%s</xliff:g>” nu s-a putut încărca."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ataşamentul nu se poate afişa."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Ataşamentul „<xliff:g id="FILENAME">%s</xliff:g>” nu a putut fi încărcat."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Se deschide mesajul..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesaj mutat în <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nu se pot redirecţiona unul sau mai multe ataşamente."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Ataşamentul nu a fost trimis"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Conectare eşuată la <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Conectare eşuată"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Nu s-a putut conecta"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Doresc sincronizarea agendei acestui cont."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizaţi calendarul acestui cont."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincron. e-mail din acest cont."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Ataşamentele se descarcă automat când sunteţi conectat(ă) la Wi-Fi."</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Doresc să se descarce automat ataşamentele când sunt conectat(ă) la Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nu s-a putut finaliza"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Zile pentru sincronizare"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automat"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> este incorectă. Le actualizaţi acum?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Cont prestabilit"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Descărcaţi automat ataşamentele"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Ataşam. se desc. automat doar când sunteţi conectat(ă) la Wi-Fi."</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descărcaţi ataşamentele"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descărcaţi în mod automat prin Wi-Fi ataşam. mesaj. recente"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frecvenţa sincronizării, notificări etc."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Doresc să fiu notificat(ă) în bara de sistem la primirea e-mailurilor"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Mare"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Foarte mare"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Răspundeţi tuturor"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Setaţi „Răspundeţi tuturor” ca opţiune prestabilită de răspuns la mesaje"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Reveniţi la setarea prestabilită pentru „Afişaţi fotografiile”"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Reveniţi la setarea prestabilită pentru toţi expeditorii (nu afişaţi fotografiile în mod automat)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Opţiunea „Afişaţi fotografiile” a fost debifată."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Setaţi „Răspundeţi tuturor” ca opţ. prestabilită de răspuns la mesaje"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Solicitaţi permisiunea de a afişa imagini"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Imaginile din mesaje nu vor fi afişate în mod automat"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opţiunea „Afişaţi fotografiile” este debifată."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> din <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Se aşteaptă sincronizarea"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mailul dvs. va apărea în curând."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"At. pict. pt. modif."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Toate e-mailurile"</string>
<string name="widget_unread" msgid="4404711399009077833">"Necitite"</string>
<string name="widget_starred" msgid="8290352707134011791">"Cu stea"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6fc5a1d..4d6e1f3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Копия:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Скрытая копия:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Текст сообщения"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Текст сообщения"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Исходное сообщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Кому: <xliff:g id="TO">%3$s</xliff:g>"\n"Копия: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Пользователь <xliff:g id="SENDER">%s</xliff:g> писал:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитируемый текст"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Показать сведения"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Детали"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"О прикрепленном файле"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Требуется Wi-Fi-соединение"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Настройки Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Необходимо подключение Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Настройки Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Настройки приложения"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Не удается открыть прикрепленный файл."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Через файлы такого типа часто распространяют вредоносное ПО, поэтому мы не даем открывать и сохранять их."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Политика безопасности аккаунта не позволяет сохранять подобные файлы."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Файл слишком большой для загрузки через мобильную сеть. Чтобы сохранить его, нужно подключиться к сети Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Слишком большой прикрепленный файл для загрузки через мобильную сеть. Вы можете загрузить его при следующем подключении к сети Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Неподдерживаемый формат. Чтобы открыть файл, установите подходящее приложение из Android Маркета."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Прикрепленный файл является приложением. Чтобы его можно было установить, в разделе \"Настройки > Приложения\" выберите \"Неизвестные источники\"."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Приложения нельзя устанавливать непосредственно из электронной почты. Сохраните файл, перейдите в \"Загрузки\" и выполните установку."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Черновик удален."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Черновик сообщения сохранен."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Невозможно отобразить прикрепленный файл."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Не удалось загрузить файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Невозможно отобразить прикрепленный файл."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Не удалось загрузить файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Сообщение открывается…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Сообщение (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) перемещено в папку <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Сбой при пересылке прикрепленных файлов."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Не удалось переслать вложение"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Ошибка авторизации <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Не удалось войти в аккаунт"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Вход не выполнен"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизировать контакты из этого аккаунта."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизировать календарь из этого аккаунта."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхронизировать почту из этого аккаунта"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Загружать прикрепленные файлы при подключении к Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматически загружать прикрепленные файлы при подключении к Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Настройка не закончена"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Период синхронизации"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматически"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Неверное имя пользователя или пароль аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>. Обновить их сейчас?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Аккаунт по умолчанию"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Автозагрузка прикрепл. файлов"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Загружать прикрепленные файлы при подключении к Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Загружать прикрепленные файлы"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоматически загружать файлы из новых сообщений через Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Уведомления электронной почты"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Частота синхронизации, уведомления и другие настройки"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"При получении почты показывать оповещение в строке состояния системы"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Крупный"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромный"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Ответить всем"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Всегда отвечать всем участникам переписки"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Восстановить значение по умолчанию для параметра \"Показать изображения\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Восстановить значения по умолчанию для всех отправителей (отключить автоматический показ их изображений)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Показ изображений отключен."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Всегда отвечать всем участникам переписки"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Запрашивать разрешение на показ изображений"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Автоматический показ изображений в сообщениях будет отключен"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Показ изображений отключен."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Ожидание синхронизации"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ваши письма скоро загрузятся."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Нажмите, чтобы изменить."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Все входящие"</string>
<string name="widget_unread" msgid="4404711399009077833">"Непрочитанные"</string>
<string name="widget_starred" msgid="8290352707134011791">"Помеченные"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 091394d..3e60ae9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kópia:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Skr. kópia:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Napísať správu"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Napísať e-mail"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kópia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napísal/a:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citovaný text"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Zobraziť podrobnosti"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Podrobnosti správy"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informácie o prílohe"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Vyžaduje sa pripojenie Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Nastavenia Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Vyžaduje sa pripojenie Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Nastavenia Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Nastavenia aplikácie"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Nepodarilo sa otvoriť prílohu."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Tento súbor nie je možné uložiť ani otvoriť, pretože tento typ prílohy môže obsahovať škodlivý softvér."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Kvôli pravidlám zabezpečenia tohto účtu nie je možné túto prílohu uložiť ani otvoriť."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Táto príloha je príliš veľká na to, aby sa dala prevziať prostredníctvom mobilnej siete. Môžete ju prevziať pri ďalšom pripojení k sieti Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Táto príloha je príliš veľká na to, aby sa dala prevziať prostredníctvom mobilnej siete. Môžete ju prevziať pri ďalšom pripojení k sieti Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Nemáte nainštalovanú žiadnu aplikáciu, ktorá môže otvoriť túto prílohu. Skúste prevziať príslušnú aplikáciu zo služby Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Táto príloha je aplikáciou. Pred nainštalovaním musíte v Nastaveniach > Aplikácie začiarknuť položku Neznáme zdroje."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikácie nie je možné inštalovať priamo z e-mailu. Najprv túto aplikáciu uložte a potom ju nainštalujte pomocou aplikácie Prevzaté súbory."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Správa bola zahodená."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Správa bola uložená ako koncept."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Prílohu sa nepodarilo zobraziť."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Prílohu „<xliff:g id="FILENAME">%s</xliff:g>“ sa nepodarilo načítať."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Príloha sa nedá zobraziť."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Prílohu „<xliff:g id="FILENAME">%s</xliff:g>“ sa nepodarilo načítať."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Prebieha otváranie správy..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> správa bola presunutá do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Príloha nebola poslaná ďalej"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Prihlásenie do účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> zlyhalo."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Prihlásenie zlyhalo"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Prihlásenie sa nepodarilo"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovať kontakty z tohto účtu."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovať kalendár z tohto účtu."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizovať e-mail z tohto účtu."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Automaticky prevziať prílohy počas pripojenia k sieti Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automaticky preberať prílohy počas pripojenia k sieti Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepodarilo sa dokončiť"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Počet dní na synchronizáciu"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaticky"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Používateľské meno alebo heslo pre účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávne. Chcete ich aktualizovať?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Predvolený účet"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automaticky prevziať prílohy"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automaticky prevziať prílohy počas pripojenia k sieti Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preberať všetky prílohy"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky preberať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Zobraziť upozornenie na príchod e-mailu v systémovom paneli"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Veľké"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Veľmi veľké"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovedať všetkým"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Nastaviť voľbu „Odpovedať všetkým“ ako predvol. voľbu odpov. na správy"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnoviť predvolenú hodnotu pre nastavenie „Zobraziť obrázky“"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnoviť predvolené hodnoty nastavení pre všetkých odosielateľov (nezobrazovať obrázky automaticky)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Nastavenie „Zobraziť obrázky“ bolo vymazané."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastaviť voľbu „Odpovedať všetkým“ ako predvol. voľbu odpov. na správy"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Opýtať sa, či zobraziť obrázky"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky sa v správach nebudú zobrazovať automaticky"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavenie „Zobraziť obrázky“ bolo vymazané."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Prebieha synchronizácia"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Váš e-mail sa čoskoro zobrazí."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Zmeňte klep. na ikonu"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Doručená pošta (všetky)"</string>
<string name="widget_unread" msgid="4404711399009077833">"Neprečítané"</string>
<string name="widget_starred" msgid="8290352707134011791">"Označené hviezdičkou"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b619cbf..8953f6e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kp:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Skp:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Zadeva:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Novo sporočilo"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Sestavite e-poštno sporočilo"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvirno sporočilo --------"\n"Zadeva: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Za: <xliff:g id="TO">%3$s</xliff:g>"\n"Kp: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisal:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirano besedilo"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Pokaži podrobnosti"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Podrobnosti sporočila"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Informacije o prilogi"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Potrebna je povezava Wi-Fi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Nastavitve za Wi-Fi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Potrebna je povezava Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Nastavitve za Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Nastavitve programa"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Priloge ni mogoče odpreti."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Te datoteke ni mogole shraniti ali odpreti, ker lahko ta vrsta priloge vsebuje zlonamerno programsko opremo."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Priloge ni mogoče shraniti ali odpreti zaradi varnostnih pravilnikov računa."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Ta priloga je prevelika, da bi jo bilo mogoče prenesti prek mobilnega omrežja. Lahko jo prenesete naslednjič, ko se povežete v omrežje Wi-Fi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Ta priloga je prevelika, da bi jo bilo mogoče prenesti prek mobilnega omrežja. Lahko jo prenesete naslednjič, ko se povežete v omrežje Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Ni nameščenega programa, s katerim bi lahko odprli to prilogo. Poskusite prenesti ustrezen program iz Android Marketa."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Priloga je program. Pred namestitvijo morate potrditi možnost »Neznani viri« v razdelku Nastavitve > Programi."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Programov ni mogoče namestiti neposredno iz e-pošte. Program najprej shranite in ga namestite s programom za prenose."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Sporočilo zavrženo."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Sporočilo shranjeno kot osnutek."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Priloge ni mogoče prikazati."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Priloge »<xliff:g id="FILENAME">%s</xliff:g>« ni bilo mogoče naložiti."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Priloge ni mogoče prikazati."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Priloge »<xliff:g id="FILENAME">%s</xliff:g>« ni bilo mogoče naložiti."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Odpiranje sporočila ..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil premaknjenih v <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ene ali več prilog ni bilo mogoče posredovati."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Priloga ni bila posredovana"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Prijava v račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ni uspela."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Prijava ni uspela"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Prijava ni uspela"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhroniziraj stike iz tega računa."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhroniziraj koledar iz tega računa"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinhroniziraj e-pošto iz tega računa"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ni mogoče končati"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dnevi za sinhronizacijo"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Samodejno"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uporabniško ime ali geslo za <xliff:g id="ACCOUNT">%s</xliff:g> je napačno. Ali ju želite posodobiti?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Privzeti račun"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Privzeto pošiljaj e-pošto iz tega računa"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Samodejni prenos prilog"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Prenesi priloge"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Samodejni prenos prilog k nedavnim sporočilom s povezavo Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-poštna obvestila"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Pogostost sinhronizacije, obvestila itd."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Ko pride e-pošta, obvesti v sistemski vrstici"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velika"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velikanska"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori vsem"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Naj bo »Odgovori vsem« privzeta nastavitev za odgovore na sporočila"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnovi privzeto za »Pokaži slike«"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnovi privzeto za vse pošiljatelje (slik ne pokaži samodejno)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Možnost »Pokaži slike« je bila počiščena."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"»Odgovori vsem« naj bo privzeta izbira za odgovore na sporočila"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vprašaj, ali naj bodo slike prikazane"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Slike v sporočilih ne bodo prikazane samodejno"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Možnost »Pokaži slike« je počiščena."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čakanje na sinhronizacijo"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaša e-pošta se bo pojavila kmalu."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Tapnite ikono, da spremenite."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombiniran nabiralnik"</string>
<string name="widget_unread" msgid="4404711399009077833">"Neprebrano"</string>
<string name="widget_starred" msgid="8290352707134011791">"Z zvezdico"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3d490ac..1caa06f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Копија:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Скривена копија:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Наслов:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Нова порука е-поште"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Напишите поруку е-поште"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Изворна порука --------"\n"Наслов: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Од: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Коме: <xliff:g id="TO">%3$s</xliff:g>"\n"Копија: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> је написао/ла:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Наведени текст"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Приказ детаља"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Детаљи поруке"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Информације о прилогу"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Потребна је WiFi веза"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi подешавања"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Потребна је Wi-Fi веза"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi подешавања"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Подешавања апликације"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Није могуће отворити прилог."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Не можете да сачувате или отворите ову датотеку јер овај тип прилога можда садржи злонамерни софтвер."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Овај прилог није могуће сачувати или отворити због смерница за безбедност овог налога."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Овај прилог је превелик да бисте га преузели преко мобилне мреже. Можете да га преузмете када се следећи пут повежете са WiFi мрежом."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Овај прилог је превелик да бисте га преузели преко мобилне мреже. Можете да га преузмете када се следећи пут повежете са Wi-Fi мрежом."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Нема инсталиране апликације која може да отвори овај прилог. Покушајте да преузмете одговарајућу апликацију са Android Market-а."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Овај прилог је апликација. Морате да проверите Непознате изворе у менију Подешавања > Апликације да бисте могли да га инсталирате."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Није могуће инсталирати апликације директно из порука е-поште. Најпре сачувајте ову апликацију, а затим је инсталирајте помоћу апликације Преузимања."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Порука је одбачена."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Порука је сачувана као недовршена."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Није могуће приказати прилог."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Није могуће учитати прилог „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Није могуће приказати прилог."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Није могуће учитати прилог „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Отварање поруке…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> порука је премештено у <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Није могуће проследити један или више прилога."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Прилог није прослеђен"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s</xliff:g> није успело."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Пријављивање није успело"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Пријављивање није могуће"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизуј контакте са овог налога."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизуј календар са овог налога."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхронизуј е-пошту са овог налога."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Аутоматски преузми прилоге када постоји веза са WiFi мрежом"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Аутоматски преузми прилоге када је успостављена веза са Wi-Fi мрежом"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Није могуће довршити"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Дани за синхронизацију"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Аутоматски"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Корисничко име или лозинка за <xliff:g id="ACCOUNT">%s</xliff:g> су нетачни. Желите ли да их ажурирате сада?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Подразумевани налог"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Подразумевано шаљи поруке е-поште са овог налога"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Аутоматско преузимање прилога"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Аутоматско преузимање прилога када постоји веза са WiFi мрежом"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Преузми прилоге"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Аутоматско преузимање прилога за недавне поруке преко Wi-Fi-ја"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења е-поштом"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Синхронизација учесталости, обавештења итд."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Обавештавање на системској траци када стигне порука е-поште"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Велика"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромно"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Одговори свима"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Постави опцију „Одговори свима“ као подразумевану за одговоре на поруке"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Враћање подразумеваних подешавања за „Прикажи слике“"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Враћање подразумеваних подешавања за све пошиљаоце (слике се не приказују аутоматски)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Избор опције „Прикажи слике“ је опозван."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Постављање опције „Одговори свима“ као подразумеване за одговоре"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Захтев за приказивање слика"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Слике из порука се неће аутоматски приказивати"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Избор опције „Прикажи слике“ је опозван."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Чека се синхронизација"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Адреса е-поште ће се ускоро приказати."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Додирните икону за промену."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Комбиноване Примљене"</string>
<string name="widget_unread" msgid="4404711399009077833">"Непрочитане"</string>
<string name="widget_starred" msgid="8290352707134011791">"Са звездицом"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8cba921..7b8b00e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Kopia:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Hemlig kopia:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Ämne:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-post"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Skriv ett e-postmeddelande"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Ursprungligt meddelande --------"\n"Ämne: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Från: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Till: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citerad text"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Visa information"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Meddelandeinfo"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Information om bifogad fil"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Wi-Fi-anslutning krävs"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wi-Fi-inställningar"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-anslutning krävs"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi-inställningar"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Appinställningar"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Det går inte att öppna den bifogade filen."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Du kan inte spara eller öppna filen eftersom denna typ av bilaga kan innehålla skadlig programvara."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Det går inte att spara eller öppna bilagan på grund av kontots säkerhetsprinciper."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Bilagan är så stor att du inte kan hämta den via det mobila nätverket. Du kan hämta den nästa gång enheten ansluts till ett Wi-Fi-nätverk."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Den bifogade filen är så stor att du inte kan hämta den via det mobila nätverket. Du kan hämta den nästa gång som enheten ansluts till ett Wi-Fi-nätverk."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Det finns ingen installerad app som kan öppna den här bilagan. Prova att hämta en lämplig app från Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Den här bilagan är en app. Du måste markera Okända källor i Inställningar > Appar innan du kan installera den."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Appar kan inte installeras direkt från e-post. Spara först appen och installera den sedan med appen Hämtningar."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Meddelandet slängs."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Meddelande sparat som utkast."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Det går inte att visa bilagan."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Det gick inte att läsa in bilagan <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Det går inte att visa bilagan."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Det gick inte att läsa in bilagan <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Meddelandet öppnas..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelandet har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Det gick inte att vidarebefordra en eller flera bilagor."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Bilagan vidarebefordrades inte"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Inloggning på <xliff:g id="ACCOUNT_NAME">%s</xliff:g> misslyckades."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Inloggningen misslyckades"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Det gick inte att logga in."</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronisera kontakter från det här kontot."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronisera kalendrar från det här kontot."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkronisera e-post från det här kontot."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Det gick inte att avsluta"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagar för synkronisering"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Du har angett ett felaktigt användarnamn eller lösenord for <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du uppdatera dem nu?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Hämta bilagor automatiskt"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Hämta bilagor"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hämta automatiskt bilagor för de senaste meddelandena via Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-postaviseringar"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, aviseringar osv."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Avisera i systemfältet vid e-postmeddelande"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svara alla"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Använd Svara alla som standard vid svar på meddelanden"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Återställ standard för \"Visa bilder\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Återställ standard för alla avsändare (visa inte bilder automatiskt)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Visa bilder togs bort."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Använd Svara alla som standard vid svar på meddelanden"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Fråga om bilder ska visas"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder i meddelanden kommer inte att visas automatiskt"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Visa bilder\" rensas."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Väntar på synk"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Din e-post visas snart."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Tryck för att ändra."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kombinerad inkorg"</string>
<string name="widget_unread" msgid="4404711399009077833">"Olästa"</string>
<string name="widget_starred" msgid="8290352707134011791">"Stjärnmärkt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 52d344b..d37fc2f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Nakala kwa"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Nakala fiche:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Kichwa:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Tunga Barua"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Ttunga barua pepe"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Ujumbe Asili --------"\n"Kichwa: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Kutoka: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kwa: <xliff:g id="TO">%3$s</xliff:g>"\n"Nakala kwa: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> aliandika:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Maandishii yaliyonukuliwa"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">" Onyesha maelezo"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Maelezo ya ujumbe"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maelezo ya kiambatisho"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Muunganisho wa WiFi unahitajika"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Mipangilio ya WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Inahitaji muunganisho wa Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya mtandao-hewa"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya prog"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Hauwezi kuhifadhi au kufungua faili hii kwa sababu ya aina hii ya kiambatisho kinaweza kuwa na programu hasidi."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"KIambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama za akaunti hii."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao wa WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao-hewa."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna prog zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programu ifaayo kutoka kwa Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni prog. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &gt, Prog kabla uweze kuisanidi."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Prog haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu za Upakuzi."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Ujumbe umetupwa."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Ujumbe umehifadhiwa kama rasimu."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Haiwezikuonyesha kiambatisho."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Haikuweza kupakia kiambatisho hiki \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Haiwezi kuonyesha kiambatisho"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Haikuweza kupakia kiambatisho hiki \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Inafungua ujumbe..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Barua <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>zimehamishwa hadi <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Haikuweza kusambaza kiambatisho kimoja au zaidi."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Kiambatishho hakijasambazwa"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ilishindwa kuingia."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Imeshindwa kuingia"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Haingeweza kuingia"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
<item quantity="other" msgid="4613385949384337840">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sawazisha anwani kutoka kwa akaunti hii."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sawazisha kalenda kutoka kwa akaunti hii."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sawazisha barua pepe kutoka kwa akaunti hii."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Pakua viambatisho kiotomatiki wakati umeunganishwa kwa WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Pakua viambatisho kiotomatiki wakati umeunganishwa kwenye mtandao-hewa"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Imeshindwa kumaliza"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Siku hadi Usawazishaji"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Kiotomatiki"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> si sahihi. Yasasishe saa hii?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Akaunti chaguo-msingi"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Pakua kioto viambatisho"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Pakua ambatisho zako otomatiki wakati umeunganishwa kwa WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pakua viambatisho"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Pakua-otomatiki viambatisho kwa ujumbe wa hivi karibuni kupitia Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Arifa za barua pepe"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Mara za kusawazisha, kutuma arifa, n.k."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Arifu katika upau wa hali barua pepe inapofika"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Jibu wote"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Fanya \'Jibu wote\' iwe chaguo mbadala ya kujibu ujumbe"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Rejesha chaguo-msingi la \"Onyesha picha\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Rejesha chaguo-msingi kwa watumaji wote (usionyeshe picha kiotomatiki)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Picha Onyesha\" ilifutwa."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Fanya \"Jibu wote\" iwe chaguo-msingi kwa majibu ya ujumbe"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Uliza kuonyesha picha"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Picha kwenye ujumbe hazitaonekana kiotomatiki"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Onyesha picha zilizoondolewa."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Inasubiri kusawazisha"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Barua pepe yako itaonekana hivi karibuni."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Gusa aikoni ili kubadilisha"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Kikasha Kilichochanganywa"</string>
<string name="widget_unread" msgid="4404711399009077833">"Haijasomwa"</string>
<string name="widget_starred" msgid="8290352707134011791">"Zenye Nyota"</string>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 88159e8..815749b 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -175,37 +175,4 @@
<item name="android:paddingRight">16dip</item>
</style>
- <style name="RecipientComposeHeading">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">18sp</item>
- <item name="android:textColor">@color/compose_label_text</item>
- <item name="android:layout_gravity">center_vertical</item>
- </style>
-
- <style name="ComposeFieldRelLayout" parent="android:Widget.Holo.Light.EditText">
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:addStatesFromChildren">true</item>
- <item name="android:focusable">false</item>
- <item name="android:focusableInTouchMode">false</item>
- <item name="android:gravity">center_vertical</item>
- </style>
-
- <style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldRelLayout">
- </style>
-
- <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
- <item name="android:minHeight">0dip</item>
- <item name="android:gravity">center_vertical</item>
- </style>
-
- <style name="EmailComposeEditTextView">
- <item name="android:minHeight">0dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:background">@null</item>
- </style>
-
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ce61fb6..eac8dac 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"สำเนา:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"สำเนาลับ:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"หัวเรื่อง:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"เขียนจดหมาย"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"เขียนอีเมล"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- ข้อความต้นฉบับ --------"\n"เรื่อง: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"จาก: <xliff:g id="SENDER">%2$s</xliff:g>"\n"ถึง: <xliff:g id="TO">%3$s</xliff:g>"\n"สำเนา: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> เขียนว่า:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"ข้อความที่ยกมา"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"แสดงรายละเอียด"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"รายละเอียดข้อความ"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"ข้อมูลเอกสารแนบ"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"ต้องใช้การเชื่อมต่อ WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"การตั้งค่า WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"ต้องเชื่อมต่อ Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"การตั้งค่า Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"การตั้งค่าแอปพลิเคชัน"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"ไม่สามารถเปิดเอกสารแนบ"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"คุณไม่สามารถบันทึกหรือเปิดไฟล์นี้ได้เนื่องจากไฟล์แนบชนิดนี้อาจมีซอฟต์แวร์ที่เป็นอันตราย"</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"ไม่สามารถบันทึกหรือเปิดไฟล์แนบนี้ได้ เนื่องจากนโยบายด้านความปลอดภัยของบัญชี"</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"ไฟล์แนบนี้มีขนาดใหญ่เกินกว่าจะดาวน์โหลดผ่านเครือข่ายมือถือ คุณสามารถดาวน์โหลดไฟล์แนบนี้ได้ในครั้งถัดไปที่คุณเชื่อมต่อเครือข่าย WiFi"</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"เอกสารแนบนี้มีขนาดใหญ่เกินกว่าจะดาวน์โหลดผ่านเครือข่ายมือถือ คุณสามารถดาวน์โหลดเอกสารแนบในครั้งถัดไปที่คุณเชื่อมต่อเครือข่าย Wi-Fi"</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"แอปพลิเคชันที่ติดตั้งอยู่ทั้งหมดไม่สามารถเปิดไฟล์แนบนี้ได้ ลองดาวโหลดแอปพลิเคชันที่เหมาะสมจาก Android Market"</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"ไฟล์แนบนี้เป็นแอปพลิเคชัน คุณต้องทำเครื่องหมายที่ \"แหล่งที่มาที่ไม่รู้จัก\" ใน \"การตั้งค่า > แอปพลิเคชัน\" ก่อน จึงจะสามารถติดตั้งได้"</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"ไม่สามารถติดตั้งแอปพลิเคชันได้โดยตรงจากอีเมล ก่อนอื่น ให้บันทึกแอปพลิเคชันนี้ แล้วติดตั้งโดยใช้แอปพลิเคชันดาวน์โหลด"</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"ยกเลิกข้อความแล้ว"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"บันทึกข้อความเป็นร่างจดหมาย"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"ไม่สามารถแสดงไฟล์แนบ"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"ไม่สามารถโหลดไฟล์แนบ \"<xliff:g id="FILENAME">%s</xliff:g>\""</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ไม่สามารถแสดงไฟล์แนบ"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"ไม่สามารถโหลดไฟล์แนบ \"<xliff:g id="FILENAME">%s</xliff:g>\""</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"กำลังเปิดข้อความ..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความถูกย้ายไปที่ <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"ไม่สามารถส่งต่อไฟล์แนบอย่างน้อยหนึ่งรายการ"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"ไม่ได้ส่งต่อเอกสารแนบ"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"การลงชื่อเข้าใช้ <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ล้มเหลว"</string>
- <string name="login_failed_title" msgid="791871543602843876">"การลงชื่อเข้าใช้ล้มเหลว"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"ไม่สามารถลงชื่อเข้าใช้"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ซิงค์รายชื่อจากบัญชีนี้"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ซิงค์อีเมลจากบัญชีนี้"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"ดาวน์โหลดไฟล์แนบโดยอัตโนมัติเมื่อเชื่อมต่อกับ WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ดาวน์โหลดไฟล์แนบโดยอัตโนมัติเมื่อเชื่อมต่อ Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ไม่สามารถดำเนินการให้เสร็จสิ้น"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"วันที่จะซิงค์"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"อัตโนมัติ"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง อัปเดตชื่อผู้ใช้และรหัสผ่านตอนนี้หรือไม่"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"บัญชีเริ่มต้น"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"ดาวน์โหลดไฟล์แนบอัตโนมัติ"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"ดาวน์โหลดไฟล์แนบโดยอัตโนมัติเมื่อเชื่อมต่อกับ WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ดาวน์โหลดไฟล์แนบ"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ดาวน์โหลดไฟล์แนบของข้อความล่าสุดผ่าน WiFi โดยอัตโนมัติ"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"การแจ้งเตือนทางอีเมล"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"ความถี่ในการซิงค์ การแจ้งเตือน ฯลฯ"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"แจ้งในแถบระบบเมื่อได้รับอีเมล"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ใหญ่"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ใหญ่มาก"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"ตอบกลับทั้งหมด"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"กำหนดให้ \"ตอบกลับทั้งหมด\" เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"กู้คืนค่าเริ่มต้นสำหรับ \"แสดงภาพ\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"กู้คืนค่าเริ่มต้นสำหรับผู้ส่งทั้งหมด (ไม่แสดงภาพโดยอัตโนมัติ)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"ล้าง \"แสดงภาพ\" แล้ว"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"กำหนดให้ \"ตอบทั้งหมด\" เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"ถามเพื่อจะแสดงรูปภาพ"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"รูปภาพในข้อความจะไม่แสดงโดยอัตโนมัติ"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"แสดงรูปภาพ\" ถูกยกเลิกการเลือก"</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> จาก <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"กำลังรอการซิงค์"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"อีเมลของคุณจะปรากฏขึ้นในไม่ช้า"</string>
- <string name="widget_other_views" msgid="4988574907386539499">"แตะไอคอนเพื่อเปลี่ยน"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"กล่องจดหมายรวม"</string>
<string name="widget_unread" msgid="4404711399009077833">"ยังไม่ได้อ่าน"</string>
<string name="widget_starred" msgid="8290352707134011791">"ที่ติดดาว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 05cdbd2..7d1f86f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Paksa:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Bumuo ng Mail"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Bumuo ng email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orihinal na Mensahe --------"\n"Paksa: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Mula kay: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para kay: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">"Si "\n\n"<xliff:g id="SENDER">%s</xliff:g> ay sumulat:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Naka-quote na teksto"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Ipakita ang mga detalye"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Mga detalye ng mensahe"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Impormasyon ng attachment"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Kinakailangan ng koneksyon sa WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Mga setting ng WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Kailangan ng koneksyon sa Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mga setting ng Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Mga setting ng app"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Hindi mabuksan ang attachment."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Hindi mo maise-save o mabubuksan ang file na ito dahil maaaring naglalaman ng nakakahamak na software ang ganitong uri ng attachment."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Hindi mai-save o mabuksan ang attachment na ito dahil sa mga patakaran sa seguridad ng account na ito."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Masyadong malaki ang attachment na ito upang i-download sa isang mobile network. Maaari mo itong i-download sa susunod na pagkakataong kumonekta ka sa isang WiFi network."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Masyadong malaki ang attachment na ito upang i-download sa isang mobile network. Maaari mo itong i-download sa susunod na oras na kumonekta ka sa isang Wi-Fi network."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Walang naka-install na app na makakabukas sa attachment na ito. Subukang mag-download ng isang naaangkop na app mula sa Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Isang app ang attachment na ito. Dapat mong lagyan ng check ang Hindi Alam na Mga Pinagmulan sa Mga Setting > Apps bago mo ito ma-install."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Hindi maaaring i-install nang direkta ang apps mula sa email. I-save muna ang app na ito at pagkatapos ay i-install ito gamit ang app ng Mga Download."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Itinapon ang mensahe."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Na-save ang mensahe bilang draft."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Hindi maipakita ang attachment."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Hindi mai-load ang attachment na \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Hindi maipakita ang attachment."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Hindi ma-load ang attachment na \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Binubuksan ang mensahe…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe ang nailipat sa <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Hindi makapagpasa ng isa o higit pang mga attachment."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Hindi napasa ang attachment"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Nabigo sa pag-signin sa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Nabigo ang pag-signin"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Hindi makapag-sign in"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"I-sync ang mga contact mula sa account na ito."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"I-sync ang kalendaryo mula sa account na ito"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"I-sync ang email mula sa account na ito."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Awtomatikong mag-download ng mga attachment kapag nakakonekta sa WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Awtomatikong i-download ang mga attachment kapag nakakonekta sa Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Hindi matapos"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Mga araw upang i-sync"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Awtomatiko"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Hindi tama ang username o password para sa <xliff:g id="ACCOUNT">%s</xliff:g>. I-update ang mga ito ngayon?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Default na account"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Magpadala ng email mula sa account na ito bilang default"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Awtomatiko i-download attachment"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Awtomatikong mag-download ng mga attachment kapag nakakonekta sa WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mag-download ng mga attachment"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Awto i-download mga attachment sa mga bagong mensahe sa Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Mga notification sa email"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Dalas ng pag-sync, mga notification, atbp."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"I-notify sa System bar kapag dumating ang email"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Malaki"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Malaki"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Tumugon sa lahat"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Gawing default ang \'Tumugon sa lahat\' para sa pagtugon sa mga mensahe"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Ibalik ang default para sa \"Ipakita ang mga larawan\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Ibalik ang default para sa lahat ng mga nagpapadala (huwag awtomatikong ipakita ang mga larawan)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Na-clear ang \"Ipakita ang mga larawan\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gawing default ang \"Tumugon sa lahat\" para sa mga pagtugon sa mensahe"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Hilinging ipakita ang mga larawan"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Hindi awtomatikong ipapakita ang mga larawan sa mga mensahe"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Na-clear ang \"Ipakita ang mga larawan\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ng <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Naghihintay ng pag-sync"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Lilitaw ang iyong email sa lalong madaling panahon."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Pndot icon pra bago."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Pinagsamang Inbox"</string>
<string name="widget_unread" msgid="4404711399009077833">"Hindi pa nabasa"</string>
<string name="widget_starred" msgid="8290352707134011791">"Naka-star"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d5a4d96..96214a4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Konu:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"E-Posta Yaz"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"E-posta oluştur"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orijinal İleti --------"\n"Konu: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Gönderen: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Alıcı:<xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> şunu yazdı:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Alıntılanan metin"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Ayrıntıları göster"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"İleti ayrıntıları"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Ek bilgileri"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Kablosuz bağlantı gerekli"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Kablosuz ayarları"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Kablosuz bağlantı gerekli"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Kablosuz ayarları"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Uygulama ayarları"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Ek açılamıyor."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Bu türden bir ek kötü amaçlı yazılım içerebileceğinden bu dosyayı kaydedemez veya açamazsınız."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Bu ek, hesabın güvenlik politikaları nedeniyle kaydedilemez veya açılamaz."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Bu ek, mobil ağ üzerinden indirilemeyecek kadar büyük. Bu eki kablosuz ağa tekrar bağlandığınızda indirebilirsiniz."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Bu ek, mobil ağ üzerinden indirilemeyecek kadar büyük. Bu eki kablosuz ağa tekrar bağlandığınızda indirebilirsiniz."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Bu eki açabilecek yüklenmiş uygulama yok. Android Market\'ten uygun bir uygulama indirmeyi deneyin."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Bu ek, bir uygulamadır. Bu eki yükleyebilmek için önce Ayarlar > Uygulamalar içindeki Bilinmeyen Kaynaklar\'ı işaretlemeniz gerekir."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Uygulamalar doğrudan e-posta üzerinden yüklenemez. Önce bu uygulamayı kaydedin, ardından İndirilenler uygulamasını kullanarak yükleyin."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"İleti silindi."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"İleti taslak olarak kaydedildi."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Ek görüntülenemiyor."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Ek yüklenemedi: \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ek görüntülenemiyor."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Ek yüklenemedi: \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"İleti açılıyor..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ileti <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> posta kutusuna taşındı"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Bir veya birden fazla ek yönlendirilemedi."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Ek yönlendirilmedi"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> oturumu açılamadı"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Oturum açma başarısız oldu"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Oturum açılamadı"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Bu hesaptaki kişileri senkronize et."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Bu hesaptaki takvimi senkronize et"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-postayı bu hesaptan senkronize et."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Kablosuz\'a bağlandığında ekleri otomatik olarak indir"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Kablosuz\'a bağlandığında ekleri otomatik olarak indir"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tamamlanamadı"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Senkronize edilecek gün sayısı"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Otomatik"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> için kullanıcı adı veya şifre yanlış. Şimdi güncellemek ister misiniz?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Varsayılan hesap"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Ekleri otomatik indir"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Kablosuz\'a bağlandığında ekleri otomatik olarak indir"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Ekleri indir"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Son iletilerin eklerini Kablosuz üzerinden otomatik indir"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"E-posta bildirimleri"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Sıklığı, bildirimleri vs. senkronize et"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"E-posta geldiğinde Sistem çubuğunda bildir"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Büyük"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Çok büyük"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Yanıtı tüm alıcılara gönder"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"İletileri yanıtlarken, \"Yanıtı tüm alıcılara gönder\" varsayılan olsun"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"\"Resimleri göster\" için varsayılan ayarları geri yükle"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Tüm gönderenler için varsayılan ayarları geri yükle (resimleri otomatik olarak gösterme)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Resimleri göster\" temizlendi."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"İleti yanıtlarında \"Yanıtı tüm alıcılara gönder\"i varsayılan yap"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Resimleri göstermek için sor"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"İletilerdeki resimler otomatik olarak gösterilmeyecek"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Resimleri göster\" temizlendi."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Senkronize etmek için bekleniyor"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-postanız yakında görüntülenecek."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Değiştirmek için simgeye dokunun."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Birleştirlmş Gln Kts"</string>
<string name="widget_unread" msgid="4404711399009077833">"Okunmayan"</string>
<string name="widget_starred" msgid="8290352707134011791">"Yıldızlı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 49efb76..070ad63 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Копія:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Прих. копія:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Напишіть лист"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Напишіть електронний лист"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригінал. повід. --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Від: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Кому: <xliff:g id="TO">%3$s</xliff:g>"\n"Копія: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> напис.:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитований текст"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Показати деталі"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Деталі повідомлення"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Інформація про вкладений файл"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Потрібне з’єднання WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Налаштування WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Потрібне з’єднання Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Налаштування Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Налаштування програми"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Не вдалося відкрити вкладений файл."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Цей файл неможливо зберегти чи відкрити, оскільки вкладений файл такого типу може містити шкідливі програми."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Цей вкладений файл неможливо зберегти або відкрити через правила безпеки цього облікового запису."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Цей вкладений файл завеликий для завантаження через мобільну мережу. Його можна завантажити під час наступного під’єднання до мережі WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Цей вкладений файл завеликий для завантаження через мобільну мережу. Його можна завантажити під час наступного з’єднання з мережею Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Немає встановленої програми, яка може відкрити цей вкладений файл. Спробуйте завантажити відповідну програму з Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Цей вкладений файл є програмою. Перед її встановленням потрібно поставити прапорець поруч із пунктом \"Невідомі джерела\" в меню Налаштування > Програми."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Програми не можна встановлювати безпосередньо з електронної пошти. Спочатку збережіть цю програму, а потім установіть її, використовуючи програму \"Завантаження\"."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Повідомл. відхилено."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Лист збереж. як чернетку."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Неможливо показати вкладений файл."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Не вдалося завантажити вкладений файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Неможливо показати вкладений файл."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Не вдалося завантажити вкладений файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Відкривання повідомлення…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"До <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> переміщено <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повідомлення"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Не вдалося переслати один або кілька вкладених файлів."</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Вкладений файл не переслано"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"Помилка входу в обліковий запис <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Помилка входу"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Не вдалося ввійти"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхрон. контакти з цього обл. зап."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхроніз. календ. з обл. запису."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхр. ел. пошту з обл. запису."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Автоматично завантажувати вкладені файли, коли є з’єднання з WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматично завантажувати вкладення, коли є з\'єднання з Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не вдалося закінчити"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Синхронізувати за стільки днів:"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматично"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Ім’я користувача чи пароль для <xliff:g id="ACCOUNT">%s</xliff:g> неправильні. Оновити зараз?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Обл. зап. за умовч."</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Надіс. ел.листи з цього обл. зап. за умовч."</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Автомат. завантаж. вклад. файли"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Автомат. завантажувати вкладені файли, коли є з’єднання з WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Завантажити вкладені файли"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автом. завантажувати вклад. файли з останніх повідом. через WiFi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Сповіщення ел. пошти"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Синхронізуйте частоту, сповіщення тощо"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Сповіщати в системному рядку про надходження листа"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Великий"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Дуже великий"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Відповісти всім"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Зробити \"Відповісти всім\" відповіддю на повідомлення за умовчанням"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Відновити налаштування за умовчанням \"Показати зображення\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Відновити налаштування за умовчанням для всіх відправників (не показувати зображення автоматично)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Налаштування \"Показати зображення\" очищено."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Зробити \"Відповісти всім\" відповіддю на повідомлення за умовчанням"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Запитувати, чи показувати зображення"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Зображення в повідомленнях не відображатимуться автоматично"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Налаштування \"Показати зображення\" очищено."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Очікування на синхронізацію"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ваша електронна пошта з’явиться незабаром."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Торк.знач.для зміни."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Об\'єднані Вхідні"</string>
<string name="widget_unread" msgid="4404711399009077833">"Непрочитані"</string>
<string name="widget_starred" msgid="8290352707134011791">"Із зірочкою"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 491cc64..06ae15a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Chủ đề:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Soạn Thư"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Soạn email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Tin nhắn gốc --------"\n"Chủ đề: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Từ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Tới: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> đã viết:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Văn bản được trích dẫn"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Hiển thị chi tiết"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Chi tiết thư"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Thông tin tệp đính kèm"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Yêu cầu kết nối WiFi"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Cài đặt WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Yêu cầu kết nối Wi-Fi"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Cài đặt Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Cài đặt ứng dụng"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Không thể mở tệp đính kèm."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Bạn không thể lưu hoặc mở tệp này do loại tệp đính kèm này có thể chứa phần mềm độc hại."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Không thể lưu hoặc mở tệp đính kèm này do chính sách bảo mật của tài khoản này."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Tệp đính kèm này quá lớn nên không thể tải xuống qua mạng di động. Bạn có thể tải tệp xuống vào lần sau khi bạn kết nối với mạng WiFi."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Tệp đính kèm này quá lớn để tải xuống qua mạng di động. Bạn có thể tải tệp xuống vào lần sau khi bạn kết nối với mạng Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Không có ứng dụng đã cài đặt nào có thể mở tệp đính kèm này. Hãy thử tải xuống ứng dụng phù hợp từ Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Tệp đính kèm này là một ứng dụng. Bạn phải đánh dấu chọn Nguồn không xác định trong Cài đặt > Ứng dụng trước khi bạn có thể cài đặt ứng dụng này."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Không thể cài đặt trực tiếp ứng dụng từ email. Trước tiên, hãy lưu ứng dụng này rồi cài đặt ứng dụng bằng cách sử dụng ứng dụng Tải xuống."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Tin nhắn đã bị hủy."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Không thể hiển thị tệp đính kèm."</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Không thể tải tệp đính kèm \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Không thể hiển thị tệp đính kèm."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Không thể tải tệp đính kèm \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Đang mở thư…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"Đã di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư tới <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Không thể chuyển tiếp một hoặc nhiều tệp đính kèm"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Tệp đính kèm không được chuyển tiếp"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> đăng nhập không thành công."</string>
- <string name="login_failed_title" msgid="791871543602843876">"Đăng nhập không thành công"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Không thể đăng nhập"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hoá danh bạ từ tài khoản này."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hoá lịch từ tài khoản này."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Đồng bộ hóa email từ tài khoản này."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Tự động tải xuống tệp đính kèm khi kết nối với WiFi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Tự động tải xuống tệp đính kèm khi được kết nối Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Không thể kết thúc"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Số ngày đồng bộ hóa"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Tự động"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tên người dùng hoặc mật khẩu của <xliff:g id="ACCOUNT">%s</xliff:g> không đúng. Cập nhật tên người dùng hoặc mật khẩu ngay bây giờ?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Tài khoản mặc định"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Gửi email từ tài khoản này theo mặc định"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Tự động tải xuống tệp đính kèm"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Tự động tải xuống tệp đính kèm khi kết nối với WiFi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Tải xuống tệp đính kèm"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Tự động tải xuống tệp đính kèm tin nhắn gần đây qua Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Thông báo qua email"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Đồng bộ hóa tần suất, thông báo, v.v."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Thông báo trên thanh Hệ thống khi email đến"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Lớn"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Rất lớn"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Trả lời tất cả"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Đặt \'Trả lời tất cả\' làm mặc định để trả lời thư"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Khôi phục cài đặt mặc định cho \"Hiển thị ảnh\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Khôi phục cài đặt mặc định cho tất cả người gửi (không tự động hiển thị ảnh)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"Đã xóa danh sách \"Hiển thị hình ảnh\"."</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Đặt \"Trả lời tất cả\" làm mặc định để trả lời thư"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Yêu cầu hiển thị hình ảnh"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Hình ảnh trong thư sẽ không được tự động hiển thị"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Đã xóa \"Hiển thị hình ảnh\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> trong tổng số <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Đang đợi đồng bộ hóa"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Email của bạn sẽ xuất hiện sớm."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Chạm b.t để chuyển."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Hộp thư đến kết hợp"</string>
<string name="widget_unread" msgid="4404711399009077833">"Chưa đọc"</string>
<string name="widget_starred" msgid="8290352707134011791">"Được gắn dấu sao"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 096d4e2..039d56f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"抄送："</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"密送："</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"主题："</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"撰写邮件"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"撰写电子邮件"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 原始邮件 --------"\n"主题：<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"发件人：<xliff:g id="SENDER">%2$s</xliff:g>"\n"收件人：<xliff:g id="TO">%3$s</xliff:g>"\n"抄送：<xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>编写："\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用文字"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"显示详情"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"邮件详情"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"附件信息"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"需要使用 Wi-Fi 连接"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Wi-Fi 设置"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"需要使用 Wi-Fi 连接"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi 设置"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"应用程序设置"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"无法打开附件。"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"该类型的附件中可能包含恶意软件，因此您无法保存或打开此文件。"</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"由于此帐户安全政策的限制，因此无法保存或打开此附件。"</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"附件过大，无法通过移动网络下载。您可以在下次连接到 Wi-Fi 网络时下载。"</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"附件过大，无法通过移动网络下载。您可以在下次连接到 Wi-Fi 网络时下载。"</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"已安装的应用程序都无法打开此附件。请尝试从 Android 电子市场下载一个合适的应用程序。"</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"此附件是应用程序。要想安装该应用程序，您需要在“设置”>“应用程序”中选中“未知来源”。"</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"无法直接从电子邮件中安装应用程序。请先保存此应用程序，然后使用“下载内容”应用程序进行安装。"</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"邮件已舍弃。"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"信息已存为草稿。"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"无法显示该附件。"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"无法加载附件“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"无法显示附件。"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"无法加载附件“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"正在打开邮件..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"已将 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封邮件移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"一个或多个附件无法转发。"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"无法转发附件"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登录失败。"</string>
- <string name="login_failed_title" msgid="791871543602843876">"登录失败"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"无法登录"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"同步此帐户下的联系人。"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"同步此帐户下的日历。"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"同步此帐户中的电子邮件。"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"连接到 Wi-Fi 时自动下载附件"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到 Wi-Fi 后自动下载附件"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"无法完成"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"要同步的天数"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自动"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码错误。要立即更新吗？"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下从此帐户发送电子邮件"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"自动下载附件"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"连接到 Wi-Fi 时自动下载附件"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下载附件"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过 Wi-Fi 自动下载最新邮件的附件"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"同步频率、通知等。"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"收到电子邮件时在系统栏中显示通知"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"超大"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"全部回复"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"将“全部回复”作为回复邮件的默认设置"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"恢复“显示图片”的默认设置"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"针对所有发件人恢复默认设置（不自动显示图片）"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"“显示图片”列表已清除。"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"将“全部回复”设置为默认的邮件回复操作"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"请求显示图片"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"邮件中的图片不会自动显示"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"“显示图片”设置已清除。"</string>
<string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"系统很快就会显示您的电子邮件。"</string>
- <string name="widget_other_views" msgid="4988574907386539499">"触摸图标即可更改。"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"合并的收件箱"</string>
<string name="widget_unread" msgid="4404711399009077833">"未读邮件"</string>
<string name="widget_starred" msgid="8290352707134011791">"已加星标的邮件"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f6f79d9..faf3e6e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"副本："</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"密件副本："</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"主旨："</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"撰寫郵件"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"撰寫電子郵件"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"--------原始郵件 --------"\n"主旨：<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"寄件者：<xliff:g id="SENDER">%2$s</xliff:g>"\n"收件者：<xliff:g id="TO">%3$s</xliff:g>"\n"副本：<xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>提到："\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用的文字"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"顯示詳細資料"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"郵件詳細資料"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"附件資訊"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"需要 WiFi 連線"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"WiFi 設定"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"需要 Wi-Fi 連線"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi 設定"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"應用程式設定"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"無法開啟附件。"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"這類附件可能含有惡意軟體，因此您無法儲存或開啟這個檔案。"</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"受限於這個帳戶的安全性政策，系統無法儲存或開啟這個附件。"</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"這個附件過大，無法透過行動網路下載。您可以在下次連上 WiFi 網路時重新下載。"</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"這個附件過大，無法透過行動網路下載，您可以在下次連上 WiFi 網路時重新下載。"</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"您所安裝的應用程式都無法開啟這個附件，不妨從 Android Market 下載適用的應用程式試試看。"</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"這個附件是應用程式，您必須前往 [設定] > [應用程式] 中勾選 [不明的來源]，才能安裝這個應用程式。"</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"您無法直接透過電子郵件安裝應用程式。請先儲存這個應用程式，然後使用「下載」應用程式進行安裝。"</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"已捨棄郵件。"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"已儲存郵件草稿。"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"無法顯示附件。"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"無法載入附件「<xliff:g id="FILENAME">%s</xliff:g>」。"</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"無法顯示附件。"</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"無法載入附件「<xliff:g id="FILENAME">%s</xliff:g>」。"</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"正在開啟郵件…"</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封郵件已移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"無法轉寄一或多個附件。"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"無法轉寄附件"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
- <string name="login_failed_title" msgid="791871543602843876">"登入失敗"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"無法登入"</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"同步處理此帳戶的聯絡人。"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"同步處理此帳戶的日曆。"</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"同步處理此帳戶所寄的電子郵件。"</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"連上 WiFi 時自動下載附件"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"連上 Wi-Fi 時自動下載附件。"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"無法完成"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"同步處理的天數"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自動"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的使用者名稱或密碼不正確，要立即更新嗎？"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"預設帳戶"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"預設使用這個帳戶傳送電子郵件"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"自動下載附件"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"連上 WiFi 時自動下載附件"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下載附件"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"透過 WiFi 自動下載最新郵件的附件"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"電子郵件通知"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等其他設定"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"收到電子郵件時，在系統列中顯示通知"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"回覆所有人"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"將「回覆所有人」做為預設的回信方式"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"還原「顯示圖片」的預設值"</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"還原所有寄件者的預設值 (不要自動顯示圖片)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"「顯示圖片」已清除。"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"將「回覆所有人」做為預設的回信方式"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"詢問後才可顯示圖片"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"系統不會自動顯示郵件中的圖片"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"「顯示圖片」已清除。"</string>
<string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步處理"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"您的電子郵件即將顯示。"</string>
- <string name="widget_other_views" msgid="4988574907386539499">"輕觸圖示即可變更。"</string>
<string name="widget_all_mail" msgid="4352573990283094963">"整合式收件匣"</string>
<string name="widget_unread" msgid="4404711399009077833">"未讀取"</string>
<string name="widget_starred" msgid="8290352707134011791">"已加星號"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 541bf9d..a05af63 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -128,7 +128,7 @@
<string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
<string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
<string name="message_compose_subject_label" msgid="1592314202889683309">"Isihloko:"</string>
- <string name="message_compose_body_hint" msgid="7575406246484103697">"Bhala i-imeyili"</string>
+ <string name="message_compose_body_hint" msgid="3864004548670233396">"Yakha i-imeyili"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Umyalezo Wangempela --------"\n"Isihloko: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Kusuka ku: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kuya ku: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>ubhale:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Umbhalo ocaphuniwe"</string>
@@ -177,13 +177,13 @@
<string name="message_view_show_details" msgid="6287415596441037095">"Bonisa imininingwane"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Imininingwane yomlayezo"</string>
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Imniningwane yokunamathesilwayo kwi-imeyli"</string>
- <string name="attachment_info_dialog_wifi_title" msgid="3433085933207351929">"Kudingeka ukuxhumeka Okungenazintambo"</string>
- <string name="attachment_info_wifi_settings" msgid="3275768005981284687">"Izilungiselelo ze-WiFi"</string>
+ <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Ukuxhumana kungenazintambo kuyadingeka"</string>
+ <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Izilungiselelo ze-Wi-Fi"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"Izilungiselelo zohlelo lokusebenza"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Ayikwazi ukuvula okunamathiselwayo"</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Angeke ukwazi ukulondoloza noma ukuvula leli fayela ngoba lolu hlobo lokunamatheliswa kwi-imeyli kungenzeka ukuthi luqukethe i-software enokuthile okungahambi kahle."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Lokhu okunamathiselwe kwi-imeyli angeke kulondolozwe noma kuvulwe ngenxa yemigomo yezokuphepha yale akhawunti."</string>
- <string name="attachment_info_wifi_only" msgid="1952445279772844815">"Lokhu okunamathiselwa kwi-imeyili kukhulu kakhulu ukuba kungalayishwa ngohleloxhumano lweselula. Ungalilayisha ngokuzayo uma uxhuma kuhleloxhumano lokuxhumana kunenazintambo."</string>
+ <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Lokhu okunamathiselwa kwi-imeyili kukhulu kakhulu ukuba kungalayishwa ngohleloxhumano lweselula. Ungalilayisha ngokuzayo uma uxhuma kuhleloxhumano lokuxhumana kunenazintambo."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Alukho uhlelo lokungiselela ukusebenza olufakiwe olungakwazi ukuthi luvule lokhu okunamathiselwe kule imeyili. Zama ukulayisha ungenisa uhlelo lokusebenza olufanele kwiMakethe ye-Android."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Lokhu okunamathiselwe kuwuhlelo lokusebenza. Kumele ubheke Imithombo Engaziwa kwiZilungiselelo > Faka uhlelo lokusebenza ngaphambi kokuba uyifake."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Uhlelo lokusebenza alukwazi ukuthi lufakwe ngqo ukusuka kwi-imeyili. Qala ngokulondoloza lolu hlelo lokusebenza bese ulufaka usebenzisa uhlelo lokusebenza Lokulayisha ungenisa."</string>
@@ -201,8 +201,8 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Umlayezo ulahliwe."</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Umlayezo ulondolozwe njengokungaphelele"</string>
- <string name="message_view_display_attachment_toast" msgid="5557358787789844554">"Ayikwazi ukuvula okunamathiselwe kwi-imeyili"</string>
- <string name="message_view_load_attachment_failed_toast" msgid="3623598332367932461">"Yehlulekile ukufaka okunamathiselwe kwi-imeyli \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+ <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ayikwazi ukuveza okunamekiwe."</string>
+ <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Yehlulekile ukufaka okunamathiselwe kwi-imeyli \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Ivula umyalezo..."</string>
<plurals name="message_moved_toast">
<item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> umyalezo uhambiswe e-<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,7 +211,7 @@
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ayikwazi ukudlulisa isinamathiseli esisodwa noma ezengeziwe"</string>
<string name="forward_download_failed_title" msgid="6139701848515572511">"Okunamathiselwa kwi-imeyli akuthunyelwanga"</string>
<string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ukungena ngemvume kwehlulekile"</string>
- <string name="login_failed_title" msgid="791871543602843876">"Kwehlulekile ukungena ngemvume"</string>
+ <string name="login_failed_title" msgid="7624349996212476176">"Ayikwazanga ukungena ngemvume."</string>
<plurals name="message_view_attachment_bytes">
<item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
<item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -310,7 +310,7 @@
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Vumelanisa othintana nabo kusuka kule akhawunti."</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Vumelanisa ikhalenda kule akhawunti."</string>
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Vumelanisa i-imeyli kule akhawunti."</string>
- <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kwi-Wi-Fi"</string>
+ <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kukuxhuma kungenazintambo"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ayikwazanga ukuqeda"</string>
<string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Izinsuku zokuvumelanisa"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Okuzenzakalelayo"</string>
@@ -361,8 +361,8 @@
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Igama lomsebenzisi noma i-password ka <xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Wabuyekeze manje?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"I-akhawunti ezenzakalelayo"</string>
<string name="account_settings_default_summary" msgid="1531901438624688482">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
- <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Izinamathiseli zokulanda okuzenzakalelayo"</string>
- <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kwi-Wi-Fi"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Layisha ngokungenisa okunamathelayo"</string>
+ <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Dawuniloda ngokuzenzakalla ukunamathiseleka emiyalezweni yakamuva nge-Wi-Fi"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"Izaziso ze-Imeyli"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Ukuvama kokuvumelanisa, isaziso, nokunye."</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"Ngazise Kusistimu ochaza ngesimo uma i-imeyli ifika"</string>
@@ -445,14 +445,13 @@
<string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Okukhulu"</string>
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Khulu"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"Phendula konke"</string>
- <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Yenza okuthi \"Phendula Konke\" kube okumisiwe kokuphenudula imiyalezo"</string>
- <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Buyisela okuzenzakalelayo koku \"Bonisa izithombe\""</string>
- <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Buyisela okuzenzakalelayo kwabathumeli bonke (ungabonisi izithombe ngokuzenzakalelayo)"</string>
- <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Bonisa izithombe\" ezisusiwe"</string>
+ <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Enza \"Phendula konke\" idifalithi yezimpendulo zemiyaezo"</string>
+ <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Cela ukukhombisa izithombe"</string>
+ <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Izithombe emilayezweni ingekwe ivezwe"</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bonisa izithombe\" ezisusiwe"</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ku-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Ilinde ukuvumelanisa"</string>
<string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"I-imeyli yakho izovela maduze."</string>
- <string name="widget_other_views" msgid="4988574907386539499">"Cindezela isithonjana ukuze ushintshe."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Ibhokisi lemiyalezo engenayo elihlanganisiwe"</string>
<string name="widget_unread" msgid="4404711399009077833">"Akufundiwe"</string>
<string name="widget_starred" msgid="8290352707134011791">"Okunenkanyezi"</string>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 0ca5fec..b80270a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -18,8 +18,8 @@
<resources>
<dimen name="button_minWidth">100sp</dimen>
- <dimen name="message_list_item_height_wide">70dip</dimen>
- <dimen name="message_list_item_height_normal">70dip</dimen>
+ <dimen name="message_list_item_height_wide">70sp</dimen>
+ <dimen name="message_list_item_height_normal">70sp</dimen>
<dimen name="message_list_item_color_tip_width">35dip</dimen>
<dimen name="message_list_item_color_tip_height">6dip</dimen>
<dimen name="message_list_badge_margin">4dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e14b4a8..95fa936 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -304,7 +304,7 @@
<!-- Label for Subject field [CHAR LIMIT=12] -->
<string name="message_compose_subject_label">Subject:</string>
<!-- Hint text in Message composer body field -->
- <string name="message_compose_body_hint">Compose Mail</string>
+ <string name="message_compose_body_hint">Compose email</string>
<!-- Header for forwarded original messages -->
<string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%1$s</xliff:g>\nFrom: <xliff:g id="sender">%2$s</xliff:g>\nTo: <xliff:g id="to">%3$s</xliff:g>\nCC: <xliff:g id="cc">%4$s</xliff:g>\n\n</string>
<!-- Header for replied-to messages -->
@@ -414,9 +414,9 @@
<!-- Title for most attachment info dialogs [CHAR LIMIT=32] -->
<string name="attachment_info_dialog_default_title">Attachment info</string>
<!-- Title when Wi-Fi settings prevent attachments from downloading [CHAR LIMIT=32] -->
- <string name="attachment_info_dialog_wifi_title">WiFi connection required</string>
+ <string name="attachment_info_dialog_wifi_title">Wi-Fi connection required</string>
<!-- Text of button to launch the Wi-Fi settings activity [CHAR LIMIT=24] -->
- <string name="attachment_info_wifi_settings">WiFi settings</string>
+ <string name="attachment_info_wifi_settings">Wi-Fi settings</string>
<!-- Text of button to launch the application settings activity [CHAR LIMIT=24] -->
<string name="attachment_info_application_settings">App settings</string>
<!-- Message body when we don't know exactly why an attachment can't be shown -->
@@ -432,7 +432,7 @@
<!-- Message body when the attachment can only be downloaded over Wi-Fi -->
<string name="attachment_info_wifi_only">
This attachment is too large to download over a mobile network.
- You can download it the next time you connect to a WiFi network.</string>
+ You can download it the next time you connect to a Wi-Fi network.</string>
<!-- Message body when no activities can open the attachment -->
<string name="attachment_info_no_intent">
There is no installed app that can open this attachment.
@@ -474,9 +474,9 @@
<string name="message_saved_toast">Message saved as draft.</string>
<!-- String that is displayed when the attachment could not be displayed. -->
<string name="message_view_display_attachment_toast">Can\'t display
- the attachment.</string>
+ attachment.</string>
<!-- String that is displayed when the attachment could not be loaded.[CHAR LIMIT=none] -->
- <string name="message_view_load_attachment_failed_toast">Couldn\'t load the attachment \"
+ <string name="message_view_load_attachment_failed_toast">Couldn\'t load attachment \"
<xliff:g id="filename">%s</xliff:g>\".</string>
<!-- String that is displayed when a long message is being parsed. [CHAR LIMIT=none] -->
<string name="message_view_parse_message_toast">Opening message\u2026</string>
@@ -497,7 +497,7 @@
<string name="login_failed_ticker">
<xliff:g id="account_name">%s</xliff:g> signin failed.</string>
<!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
- <string name="login_failed_title">Signin failed</string>
+ <string name="login_failed_title">Couldn\'t sign in</string>
<!-- Size unit for bytes for attachments [CHAR LIMIT=10] -->
<plurals name="message_view_attachment_bytes">
@@ -750,7 +750,7 @@
<!-- In Account setup options screen, check box to auto-download attachments [CHAR LIMIT=none]
-->
<string name="account_setup_options_background_attachments_label">
- Automatically download attachments when connected to WiFi</string>
+ Automatically download attachments when connected to Wi-Fi</string>
<!-- Dialog title when "setup" could not finish -->
<string name="account_setup_failed_dlg_title">Couldn\'t finish</string>
<!-- In Account setup options screen, label for email lookback selector -->
@@ -923,10 +923,10 @@
<!-- On Settings screen, setting option name -->
<!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
<string name="account_settings_background_attachments_label">
- Auto-download attachments</string>
+ Download attachments</string>
<!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
<string name="account_settings_background_attachments_summary">
- Automatically download attachments when connected to WiFi</string>
+ Auto-download attachments to recent messages via Wi-Fi</string>
<string name="account_settings_notify_label">Email notifications</string>
<!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
[CHAR LIMIT=50] -->
@@ -1145,19 +1145,19 @@
<!-- Settings screen, Reply to all default setting title [CHAR LIMIT=30] -->
<string msgid="6469564953937885304" name="general_preference_reply_all_label">Reply all</string>
<!-- Settings screen, Reply to all default setting summary [CHAR LIMIT=70] -->
- <string msgid="3356918650886350497" name="general_preference_reply_all_summary">Make \'Reply all\' the default for responding to messages</string>
+ <string msgid="3356918650886350497" name="general_preference_reply_all_summary">Make \"Reply all\" the default for message replies</string>
<!-- Settings screen, title used to clear the setting for the list of
senders to automatically show pictures for [CHAR LIMIT=80] -->
<string name="general_preferences_clear_trusted_senders_title"
- >Restore default for \"Show pictures\"</string>
+ >Ask to show pictures</string>
<!-- Settings screen, summary for clearing the settings for the list of
senders to automatically show pictures for [CHAR LIMIT=160] -->
<string name="general_preferences_clear_trusted_senders_summary"
- >Restore default for all senders (don\'t show pictures automatically)</string>
+ >Pictures in messages won\'t be shown automatically</string>
<!-- Message shown in toast when the user taps to clear the lsit of senders
to automatically show pictures for [CHAR LIMIT=80] -->
- <string name="trusted_senders_cleared">\"Show pictures\" was cleared.</string>
+ <string name="trusted_senders_cleared">\"Show pictures\" cleared.</string>
<!-- Generic string for "current position" / "total number" [CHAR LIMIT=12] -->
<string name="position_of_count"><xliff:g example="1">%1$d</xliff:g> of <xliff:g
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dfdea27..abd2bbd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -215,95 +215,6 @@
<item name="android:paddingRight">6dip</item>
</style>
- <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
- <item name="android:minHeight">42dip</item>
- <item name="android:gravity">bottom</item>
- </style>
-
- <style name="EmailComposeEditTextView">
- <item name="android:minHeight">44dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:background">@null</item>
- </style>
-
- <style name="LargeComposeAreaBody" parent="@style/ComposeBodyStyle" >
- <item name="android:background">@null</item>
- <item name="android:minHeight">42dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- </style>
-
- <style name="RecipientComposeFieldSpacer">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">4dip</item>
- </style>
-
- <style name="ComposeFieldLinearLayout" parent="android:Widget.Holo.Light.EditText">
- <item name="android:addStatesFromChildren">true</item>
- <item name="android:focusable">false</item>
- <item name="android:focusableInTouchMode">false</item>
- <item name="android:orientation">horizontal</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:clickable">true</item>
- <item name="android:paddingLeft">0dip</item>
- <item name="android:paddingRight">0dip</item>
- </style>
- <style name="ComposeHeading">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">18sp</item>
- <item name="android:textColor">@color/compose_label_text</item>
- <item name="android:paddingLeft">8dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- </style>
-
- <style name="RecipientComposeHeading">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">18sp</item>
- <item name="android:textColor">@color/compose_label_text</item>
- <item name="android:layout_marginRight">4dip</item>
- <item name="android:layout_marginTop">4dip</item>
- <item name="android:layout_gravity">center_vertical</item>
- </style>
-
- <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:addStatesFromChildren">true</item>
- <item name="android:focusable">false</item>
- <item name="android:focusableInTouchMode">false</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:paddingTop">0dip</item>
- </style>
-
- <style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldLayout">
- <item name="android:orientation">vertical</item>
- </style>
-
- <style name="ComposeBodyStyle">
- <item name="android:minHeight">48dip</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:inputType">textLongMessage|textMultiLine|textAutoCorrect|textCapSentences</item>
- <item name="android:hint">@string/message_compose_body_hint</item>
- <item name="android:imeOptions">flagNoExtractUi|actionDone|flagNoEnterAction</item>
- <item name="android:textColorHint">@color/compose_label_text</item>
- </style>
-
- <style name="ComposeSubjectStyle">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- <item name="android:textColorHint">@color/compose_label_text</item>
- <item name="android:inputType">textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine</item>
- <item name="android:imeOptions">actionNext|flagNoExtractUi</item>
- </style>
-
<style name="message_list_item_normal">
<!-- no styles on phones -->
</style>
diff --git a/src/com/android/email/Email.java b/src/com/android/email/Email.java
index 46069ed..1ef55cf 100644
--- a/src/com/android/email/Email.java
+++ b/src/com/android/email/Email.java
@@ -166,12 +166,10 @@
MailService.actionReschedule(context);
}
- // Note - the Email widget is always enabled as it will show a warning if no accounts are
- // configured. In previous releases, this was disabled if no accounts were set, so we
- // need to unconditionally enable it here.
pm.setComponentEnabledSetting(
new ComponentName(context, WidgetConfiguration.class),
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+ enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
// Start/stop the various services depending on whether there are any accounts
diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index be1aa8d..6a0f1e1 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -364,6 +364,8 @@
// Select generic sync or store-specific sync
SyncResults results = synchronizeMailboxGeneric(account, folder);
+ // The account might have been deleted
+ if (results == null) return;
mListeners.synchronizeMailboxFinished(account.mId, folder.mId,
results.mTotalMessages,
results.mAddedMessages.size(),
@@ -771,6 +773,8 @@
// 2. Open the remote folder and create the remote folder if necessary
Store remoteStore = Store.getInstance(account, mContext);
+ // The account might have been deleted
+ if (remoteStore == null) return null;
Folder remoteFolder = remoteStore.getFolder(mailbox.mServerId);
/*
diff --git a/src/com/android/email/Preferences.java b/src/com/android/email/Preferences.java
index b9288ba..8e448bb 100644
--- a/src/com/android/email/Preferences.java
+++ b/src/com/android/email/Preferences.java
@@ -22,6 +22,7 @@
import android.util.Log;
import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.Account;
import org.json.JSONArray;
import org.json.JSONException;
@@ -48,6 +49,7 @@
private static final String TEXT_ZOOM = "textZoom";
private static final String BACKGROUND_ATTACHMENTS = "backgroundAttachments";
private static final String TRUSTED_SENDERS = "trustedSenders";
+ private static final String LAST_ACCOUNT_USED = "lastAccountUsed";
public static final int AUTO_ADVANCE_NEWER = 0;
public static final int AUTO_ADVANCE_OLDER = 1;
@@ -262,6 +264,29 @@
return new JSONArray(set).toString();
}
+ /**
+ * Returns the last used account ID as set by {@link #setLastUsedAccountId}.
+ * The system makes no attempt to automatically track what is considered a "use" - clients
+ * are expected to call {@link #setLastUsedAccountId} manually.
+ *
+ * Note that the last used account may have been deleted in the background so there is also
+ * no guarantee that the account exists.
+ */
+ public long getLastUsedAccountId() {
+ return mSharedPreferences.getLong(LAST_ACCOUNT_USED, Account.NO_ACCOUNT);
+ }
+
+ /**
+ * Sets the specified ID of the last account used. Treated as an opaque ID and does not
+ * validate the value. Value is saved asynchronously.
+ */
+ public void setLastUsedAccountId(long accountId) {
+ mSharedPreferences
+ .edit()
+ .putLong(LAST_ACCOUNT_USED, accountId)
+ .apply();
+ }
+
public void clear() {
mSharedPreferences.edit().clear().apply();
}
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index c3e4341..0cd8429 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.app.Fragment;
import android.content.Intent;
+import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
@@ -63,6 +64,8 @@
/** Loader IDs starting with this is safe to use from ActionBarController. */
static final int ACTION_BAR_CONTROLLER_LOADER_ID_BASE = 200;
+ private static float sLastFontScale = -1;
+
private Controller mController;
private Controller.Result mControllerResult;
@@ -161,6 +164,15 @@
protected void onCreate(Bundle savedInstanceState) {
if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) Log.d(Logging.LOG_TAG, this + " onCreate");
+ float fontScale = getResources().getConfiguration().fontScale;
+ if (sLastFontScale != -1 && sLastFontScale != fontScale) {
+ // If the font scale has been initialized, and has been detected to be different than
+ // the last time the Activity ran, it means the user changed the font while no
+ // Email Activity was running - we still need to purge static information though.
+ onFontScaleChangeDetected();
+ }
+ sLastFontScale = fontScale;
+
// UIController is used in onPrepareOptionsMenu(), which can be called from within
// super.onCreate(), so we need to initialize it here.
initUIController();
@@ -399,4 +411,11 @@
}
}
}
+
+ /**
+ * Handle a change to the system font size. This invalidates some static caches we have.
+ */
+ private void onFontScaleChangeDetected() {
+ MessageListItem.resetDrawingCaches();
+ }
}
diff --git a/src/com/android/email/activity/MailboxListFragment.java b/src/com/android/email/activity/MailboxListFragment.java
index 34001c8..e9750e8 100644
--- a/src/com/android/email/activity/MailboxListFragment.java
+++ b/src/com/android/email/activity/MailboxListFragment.java
@@ -865,13 +865,19 @@
// the current loader and make the mListAdapter lose the cursor.
// Note, don't just use getAccountId(). A mailbox may tied to a different account ID
// from getAccountId(). (Currently "Starred" does so.)
- final long accountId = mListAdapter.getAccountId(position);
+ long accountId = mListAdapter.getAccountId(position);
boolean nestedNavigation = false;
if (((MailboxListItem) view).isNavigable() && (id != mParentMailboxId)) {
// Drill-in. Selected one will be the next parent, and it'll also be highlighted.
startLoading(id, id);
nestedNavigation = true;
}
+ if (accountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
+ // Virtual mailboxes, such as "Starred", will have a "combined view" ID. However,
+ // we really want to relay the current active account, so that
+ // things like per-account starred mailboxes work as expected.
+ accountId = getAccountId();
+ }
mCallback.onMailboxSelected(accountId, id, nestedNavigation);
}
}
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 612656d..2f5af75 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -117,7 +117,9 @@
private static final String EXTRA_ACCOUNT_ID = "account_id";
private static final String EXTRA_MESSAGE_ID = "message_id";
/** If the intent is sent from the email app itself, it should have this boolean extra. */
- private static final String EXTRA_FROM_WITHIN_APP = "from_within_app";
+ public static final String EXTRA_FROM_WITHIN_APP = "from_within_app";
+ /** If the intent is sent from thw widget. */
+ public static final String EXTRA_FROM_WIDGET = "from_widget";
private static final String STATE_KEY_CC_SHOWN =
"com.android.email.activity.MessageCompose.ccShown";
@@ -226,9 +228,7 @@
};
private static Intent getBaseIntent(Context context) {
- Intent i = new Intent(context, MessageCompose.class);
- i.putExtra(EXTRA_FROM_WITHIN_APP, true);
- return i;
+ return new Intent(context, MessageCompose.class);
}
/**
@@ -242,14 +242,27 @@
}
/**
- * Compose a new message using the given account. If account is -1 the default account
- * will be used.
+ * Creates an {@link Intent} that can start the message compose activity from the main Email
+ * activity. This should not be used for Intents to be fired from outside of the main Email
+ * activity, such as from widgets, as the behavior of the compose screen differs subtly from
+ * those cases.
+ */
+ private static Intent getMainAppIntent(Context context, long accountId) {
+ Intent result = getMessageComposeIntent(context, accountId);
+ result.putExtra(EXTRA_FROM_WITHIN_APP, true);
+ return result;
+ }
+
+ /**
+ * Compose a new message using the given account. If account is {@link Account#NO_ACCOUNT}
+ * the default account will be used.
+ * This should only be called from the main Email application.
* @param context
* @param accountId
*/
public static void actionCompose(Context context, long accountId) {
try {
- Intent i = getMessageComposeIntent(context, accountId);
+ Intent i = getMainAppIntent(context, accountId);
context.startActivity(i);
} catch (ActivityNotFoundException anfe) {
// Swallow it - this is usually a race condition, especially under automated test.
@@ -261,6 +274,7 @@
/**
* Compose a new message using a uri (mailto:) and a given account. If account is -1 the
* default account will be used.
+ * This should only be called from the main Email application.
* @param context
* @param uriString
* @param accountId
@@ -268,7 +282,7 @@
*/
public static boolean actionCompose(Context context, String uriString, long accountId) {
try {
- Intent i = getMessageComposeIntent(context, accountId);
+ Intent i = getMainAppIntent(context, accountId);
i.setAction(Intent.ACTION_SEND);
i.setData(Uri.parse(uriString));
context.startActivity(i);
@@ -538,6 +552,11 @@
outState.putLong(STATE_KEY_LAST_SAVE_TASK_ID, mLastSaveTaskId);
}
+ @Override
+ public void onBackPressed() {
+ onBack(true /* systemKey */);
+ }
+
/**
* Whether or not the current message being edited has a source message (i.e. is a reply,
* or forward) that is loaded.
@@ -554,6 +573,11 @@
return (i != null && i.getBooleanExtra(EXTRA_FROM_WITHIN_APP, false));
}
+ private boolean isOpenedFromWidget() {
+ Intent i = getIntent();
+ return (i != null && i.getBooleanExtra(EXTRA_FROM_WIDGET, false));
+ }
+
/**
* Sets message as loaded and then initializes the TextWatchers.
* @param isLoaded - value to which to set mMessageLoaded
@@ -1457,6 +1481,10 @@
}
private void showQuickResponseDialog() {
+ if (mAccount == null) {
+ // Load not finished, bail.
+ return;
+ }
InsertQuickResponseDialog.newInstance(null, mAccount)
.show(getFragmentManager(), null);
}
@@ -1508,9 +1536,12 @@
}
private void showCcBccFields() {
- mCcBccContainer.setVisibility(View.VISIBLE);
- UiUtilities.setVisibilitySafe(this, R.id.add_cc_bcc, View.INVISIBLE);
- invalidateOptionsMenu();
+ if (mCcBccContainer.getVisibility() != View.VISIBLE) {
+ mCcBccContainer.setVisibility(View.VISIBLE);
+ mCcView.requestFocus();
+ UiUtilities.setVisibilitySafe(this, R.id.add_cc_bcc, View.INVISIBLE);
+ invalidateOptionsMenu();
+ }
}
/**
@@ -1718,7 +1749,7 @@
private boolean handleCommand(int viewId) {
switch (viewId) {
case android.R.id.home:
- onActionBarHomePressed();
+ onBack(false /* systemKey */);
return true;
case R.id.send:
onSend();
@@ -1749,11 +1780,18 @@
return false;
}
- private void onActionBarHomePressed() {
+ /**
+ * Handle a tap to the system back key, or the "app up" button in the action bar.
+ * @param systemKey whether or not the system key was pressed
+ */
+ private void onBack(boolean systemKey) {
finish();
if (isOpenedFromWithinApp()) {
// If opened from within the app, we just close it.
- } else {
+ return;
+ }
+
+ if (isOpenedFromWidget() || !systemKey) {
// Otherwise, need to open the main screen for the appropriate account.
// Note that mAccount should always be set by the time the action bar is set up.
startActivity(Welcome.createOpenAccountInboxIntent(this, mAccount.mId));
diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index 1bf32ea..4a3d487 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -21,6 +21,7 @@
import android.app.LoaderManager;
import android.content.ClipData;
import android.content.ContentUris;
+import android.content.Context;
import android.content.Loader;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -165,7 +166,7 @@
/**
* Called when the specified mailbox does not exist.
*/
- public void onMailboxNotFound();
+ public void onMailboxNotFound(boolean firstLoad);
/**
* Called when the user wants to open a message.
@@ -206,7 +207,7 @@
public static final Callback INSTANCE = new EmptyCallback();
@Override
- public void onMailboxNotFound() {
+ public void onMailboxNotFound(boolean isFirstLoad) {
}
@Override
@@ -278,7 +279,7 @@
* @return true if the mailbox is a combined mailbox. Safe to call even before onCreate.
*/
public boolean isCombinedMailbox() {
- return getMailboxId() < 0;
+ return getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
}
public MessageListContext getListContext() {
@@ -843,8 +844,14 @@
@Override
public void onMoveToMailboxSelected(long newMailboxId, long[] messageIds) {
+ final Context context = getActivity();
+ if (context == null) {
+ // Detached from activity. This callback was really delayed or a monkey was involved.
+ return;
+ }
+
mCallback.onAdvancingOpAccepted(Utility.toLongSet(messageIds));
- ActivityHelper.moveMessages(getActivity(), newMailboxId, messageIds);
+ ActivityHelper.moveMessages(context, newMailboxId, messageIds);
// Move is async, so we can't refresh now. Instead, just clear the selection.
onDeselectAll();
@@ -1229,7 +1236,7 @@
// Start loading...
final LoaderManager lm = getLoaderManager();
- lm.initLoader(LOADER_ID_MESSAGES_LOADER, null, new MessagesLoaderCallback());
+ lm.initLoader(LOADER_ID_MESSAGES_LOADER, null, LOADER_CALLBACKS);
}
/** Timeout to show a warning, since some IMAP searches could take a long time. */
@@ -1254,7 +1261,8 @@
/**
* Loader callbacks for message list.
*/
- private class MessagesLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
+ private final LoaderManager.LoaderCallbacks<Cursor> LOADER_CALLBACKS =
+ new LoaderManager.LoaderCallbacks<Cursor>() {
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
final MessageListContext listContext = getListContext();
@@ -1301,7 +1309,7 @@
mListAdapter.swapCursor(cursor);
if (!cursor.mIsFound) {
- mCallback.onMailboxNotFound();
+ mCallback.onMailboxNotFound(mIsFirstLoad);
return;
}
@@ -1386,7 +1394,7 @@
mSearchedMailbox = null;
mCountTotalAccounts = 0;
}
- }
+ };
/**
* Show/hide the "selection" action mode, according to the number of selected messages and
diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java
index fa4708d..3a9b931 100644
--- a/src/com/android/email/activity/MessageListItem.java
+++ b/src/com/android/email/activity/MessageListItem.java
@@ -184,6 +184,16 @@
}
/**
+ * Invalidate all drawing caches associated with drawing message list items.
+ * This is an expensive operation, and should be done rarely, such as when system font size
+ * changes occurs.
+ */
+ public static void resetDrawingCaches() {
+ MessageListItemCoordinates.resetCaches();
+ sInit = false;
+ }
+
+ /**
* Sets message subject and snippet safely, ensuring the cache is invalidated.
*/
public void setText(String subject, String snippet, boolean forceUpdate) {
diff --git a/src/com/android/email/activity/MessageListItemCoordinates.java b/src/com/android/email/activity/MessageListItemCoordinates.java
index b453193..97ab048 100644
--- a/src/com/android/email/activity/MessageListItemCoordinates.java
+++ b/src/com/android/email/activity/MessageListItemCoordinates.java
@@ -225,6 +225,13 @@
}
/**
+ * Reset the caches associated with the coordinate layouts.
+ */
+ static void resetCaches() {
+ mCache.clear();
+ }
+
+ /**
* Returns coordinates for elements inside a conversation header view given
* the view width.
*/
diff --git a/src/com/android/email/activity/MessageOrderManager.java b/src/com/android/email/activity/MessageOrderManager.java
index 6e5cacb..fffcf7c 100644
--- a/src/com/android/email/activity/MessageOrderManager.java
+++ b/src/com/android/email/activity/MessageOrderManager.java
@@ -16,6 +16,14 @@
package com.android.email.activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.os.Handler;
+
+import com.android.email.MessageListContext;
+import com.android.email.activity.MessageOrderManager.Callback;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.Mailbox;
@@ -25,12 +33,6 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.os.Handler;
-
/**
* Used by {@link MessageView} to determine the message-id of the previous/next messages.
*
@@ -55,7 +57,7 @@
private final Context mContext;
private final ContentResolver mContentResolver;
- private final long mMailboxId;
+ private final MessageListContext mListContext;
private final ContentObserver mObserver;
private final Callback mCallback;
private final DelayedOperations mDelayedOperations;
@@ -121,18 +123,18 @@
}
}
- public MessageOrderManager(Context context, long mailboxId, Callback callback) {
- this(context, mailboxId, callback, new DelayedOperations(Utility.getMainThreadHandler()));
+ public MessageOrderManager(Context context, MessageListContext listContext, Callback callback) {
+ this(context, listContext, callback, new DelayedOperations(Utility.getMainThreadHandler()));
}
@VisibleForTesting
- MessageOrderManager(Context context, long mailboxId, Callback callback,
+ MessageOrderManager(Context context, MessageListContext listContext, Callback callback,
DelayedOperations delayedOperations) {
- Preconditions.checkArgument(mailboxId != Mailbox.NO_MAILBOX);
+ Preconditions.checkArgument(listContext.getMailboxId() != Mailbox.NO_MAILBOX);
mContext = context.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mDelayedOperations = delayedOperations;
- mMailboxId = mailboxId;
+ mListContext = listContext;
mCallback = new PostingCallback(callback);
mObserver = new ContentObserver(getHandlerForContentObserver()) {
@Override public void onChange(boolean selfChange) {
@@ -145,8 +147,12 @@
startTask();
}
+ public MessageListContext getListContext() {
+ return mListContext;
+ }
+
public long getMailboxId() {
- return mMailboxId;
+ return mListContext.getMailboxId();
}
/**
@@ -346,7 +352,9 @@
*/
private Cursor openNewCursor() {
final Cursor cursor = mContentResolver.query(EmailContent.Message.CONTENT_URI,
- EmailContent.ID_PROJECTION, Message.buildMessageListSelection(mContext, mMailboxId),
+ EmailContent.ID_PROJECTION,
+ Message.buildMessageListSelection(
+ mContext, mListContext.mAccountId, mListContext.getMailboxId()),
null, EmailContent.MessageColumns.TIMESTAMP + " DESC");
return cursor;
}
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index e46cffb..c3d2836 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -685,10 +685,6 @@
final Intent intent = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT,
mailUri);
- // Pass along full E-mail string for possible create dialog
- intent.putExtra(ContactsContract.Intents.EXTRA_CREATE_DESCRIPTION,
- senderEmail.toString());
-
// Only provide personal name hint if we have one
final String senderPersonal = senderEmail.getPersonal();
if (!TextUtils.isEmpty(senderPersonal)) {
diff --git a/src/com/android/email/activity/MessagesAdapter.java b/src/com/android/email/activity/MessagesAdapter.java
index 0c059c1..2e8b2eb 100644
--- a/src/com/android/email/activity/MessagesAdapter.java
+++ b/src/com/android/email/activity/MessagesAdapter.java
@@ -275,26 +275,28 @@
}
return listContext.isSearch()
? new SearchCursorLoader(context, listContext)
- : new MessagesCursorLoader(context, listContext.getMailboxId());
+ : new MessagesCursorLoader(context, listContext);
}
private static class MessagesCursorLoader extends ThrottlingCursorLoader {
protected final Context mContext;
+ private final long mAccountId;
private final long mMailboxId;
- public MessagesCursorLoader(Context context, long mailboxId) {
+ public MessagesCursorLoader(Context context, MessageListContext listContext) {
// Initialize with no where clause. We'll set it later.
super(context, EmailContent.Message.CONTENT_URI,
MESSAGE_PROJECTION, null, null,
EmailContent.MessageColumns.TIMESTAMP + " DESC");
mContext = context;
- mMailboxId = mailboxId;
+ mAccountId = listContext.mAccountId;
+ mMailboxId = listContext.getMailboxId();
}
@Override
public Cursor loadInBackground() {
// Build the where cause (which can't be done on the UI thread.)
- setSelection(Message.buildMessageListSelection(mContext, mMailboxId));
+ setSelection(Message.buildMessageListSelection(mContext, mAccountId, mMailboxId));
// Then do a query to get the cursor
return loadExtras(super.loadInBackground());
}
@@ -376,7 +378,7 @@
private Mailbox mSearchedMailbox = null;
public SearchCursorLoader(Context context, MessageListContext listContext) {
- super(context, listContext.getMailboxId());
+ super(context, listContext);
Preconditions.checkArgument(listContext.isSearch());
mListContext = listContext;
}
diff --git a/src/com/android/email/activity/UIControllerBase.java b/src/com/android/email/activity/UIControllerBase.java
index 8e4c3a5..e353a27 100644
--- a/src/com/android/email/activity/UIControllerBase.java
+++ b/src/com/android/email/activity/UIControllerBase.java
@@ -206,6 +206,7 @@
if (mNfcHandler != null) {
mNfcHandler.onAccountChanged(); // workaround for email not set on initial load
}
+ Preferences.getPreferences(mActivity).setLastUsedAccountId(getUIAccountId());
}
/**
@@ -556,6 +557,7 @@
if (mNfcHandler != null) {
mNfcHandler.onAccountChanged();
}
+ Preferences.getPreferences(mActivity).setLastUsedAccountId(accountId);
}
/**
@@ -902,10 +904,14 @@
// MessageListFragment.Callback
@Override
- public void onMailboxNotFound() {
+ public void onMailboxNotFound(boolean isFirstLoad) {
// Something bad happened - the account or mailbox we were looking for was deleted.
// Just restart and let the entry flow find a good default view.
- Utility.showToast(mActivity, R.string.toast_mailbox_not_found);
+ if (isFirstLoad) {
+ // Only show this if it's the first load (e.g. a shortcut) rather an a return to
+ // a mailbox (which might be in a just-deleted account)
+ Utility.showToast(mActivity, R.string.toast_mailbox_not_found);
+ }
long accountId = getUIAccountId();
if (accountId != Account.NO_ACCOUNT) {
mActivity.startActivity(Welcome.createOpenAccountInboxIntent(mActivity, accountId));
@@ -980,11 +986,10 @@
}
Preconditions.checkNotNull(mListContext);
- final long mailboxId = mListContext.getMailboxId();
- if (mOrderManager == null || mOrderManager.getMailboxId() != mailboxId) {
+ if (mOrderManager == null || !mOrderManager.getListContext().equals(mListContext)) {
stopMessageOrderManager();
- mOrderManager =
- new MessageOrderManager(mActivity, mailboxId, mMessageOrderManagerCallback);
+ mOrderManager = new MessageOrderManager(
+ mActivity, mListContext, mMessageOrderManagerCallback);
}
mOrderManager.moveTo(getMessageId());
updateNavigationArrows();
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index b06cbe4..b69f927 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -601,7 +601,10 @@
// Refreshable only when an actual account is selected, and message view isn't shown.
// (i.e. only available on the mailbox list or the message view, but not on the combined
// one)
- return isActualAccountSelected() && !isMessageViewInstalled();
+ if (!isActualAccountSelected() || isMessageViewInstalled()) {
+ return false;
+ }
+ return isMailboxListInstalled() || (mListContext.getMailboxId() > 0);
}
@Override
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index 6327f8f..5940818 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -287,9 +287,8 @@
*/
@Override
protected boolean isRefreshEnabled() {
- // - Don't show for combined inboxes, but
- // - Show even for non-refreshable mailboxes, in which case we refresh the mailbox list
- return getActualAccountId() != Account.NO_ACCOUNT;
+ return getActualAccountId() != Account.NO_ACCOUNT
+ && (mListContext.getMailboxId() > 0);
}
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index bfa8afc..e777461 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -30,6 +30,7 @@
import android.view.ViewGroup.LayoutParams;
import com.android.email.Email;
+import com.android.email.Preferences;
import com.android.email.R;
import com.android.email.activity.setup.AccountSettings;
import com.android.email.activity.setup.AccountSetupBasics;
@@ -314,8 +315,18 @@
}
} else {
// Neither an accountID or a UUID is specified.
- // Use the default, without showing the "account removed?" toast.
- accountId = Account.getDefaultAccountId(context);
+ // Use the last account used, falling back to the default.
+ long lastUsedId = Preferences.getPreferences(context).getLastUsedAccountId();
+ if (lastUsedId != Account.NO_ACCOUNT) {
+ if (!Account.isValidId(context, lastUsedId)) {
+ // The last account that was used has since been deleted.
+ lastUsedId = Account.NO_ACCOUNT;
+ Preferences.getPreferences(context).setLastUsedAccountId(Account.NO_ACCOUNT);
+ }
+ }
+ accountId = (lastUsedId == Account.NO_ACCOUNT)
+ ? Account.getDefaultAccountId(context)
+ : lastUsedId;
}
if (accountId != Account.NO_ACCOUNT) {
// Okay, the given account is valid.
diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index a549492..cc48a7a 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -97,17 +97,18 @@
* Direct access for forcing account creation
* For use by continuous automated test system (e.g. in conjunction with monkey tests)
*/
- private final String ACTION_CREATE_ACCOUNT = "com.android.email.CREATE_ACCOUNT";
- private final String EXTRA_CREATE_ACCOUNT_EMAIL = "EMAIL";
- private final String EXTRA_CREATE_ACCOUNT_USER = "USER";
- private final String EXTRA_CREATE_ACCOUNT_INCOMING = "INCOMING";
- private final String EXTRA_CREATE_ACCOUNT_OUTGOING = "OUTGOING";
- private final Boolean DEBUG_ALLOW_NON_TEST_HARNESS_CREATION = false;
+ private static final String ACTION_CREATE_ACCOUNT = "com.android.email.CREATE_ACCOUNT";
+ private static final String EXTRA_FLOW_MODE = "FLOW_MODE";
+ private static final String EXTRA_CREATE_ACCOUNT_EMAIL = "EMAIL";
+ private static final String EXTRA_CREATE_ACCOUNT_USER = "USER";
+ private static final String EXTRA_CREATE_ACCOUNT_INCOMING = "INCOMING";
+ private static final String EXTRA_CREATE_ACCOUNT_OUTGOING = "OUTGOING";
+ private static final Boolean DEBUG_ALLOW_NON_TEST_HARNESS_CREATION = false;
- private final static String STATE_KEY_PROVIDER = "AccountSetupBasics.provider";
+ private static final String STATE_KEY_PROVIDER = "AccountSetupBasics.provider";
// NOTE: If you change this value, confirm that the new interval exists in arrays.xml
- private final static int DEFAULT_ACCOUNT_CHECK_INTERVAL = 15;
+ private static final int DEFAULT_ACCOUNT_CHECK_INTERVAL = 15;
// Support for UI
private TextView mWelcomeView;
@@ -126,8 +127,9 @@
FutureTask<String> mOwnerLookupTask;
public static void actionNewAccount(Activity fromActivity) {
- SetupData.init(SetupData.FLOW_MODE_NORMAL);
- fromActivity.startActivity(new Intent(fromActivity, AccountSetupBasics.class));
+ Intent i = new Intent(fromActivity, AccountSetupBasics.class);
+ i.putExtra(EXTRA_FLOW_MODE, SetupData.FLOW_MODE_NORMAL);
+ fromActivity.startActivity(i);
}
/**
@@ -135,8 +137,9 @@
* for exchange accounts.
*/
public static Intent actionSetupExchangeIntent(Context context) {
- SetupData.init(SetupData.FLOW_MODE_ACCOUNT_MANAGER_EAS);
- return new Intent(context, AccountSetupBasics.class);
+ Intent i = new Intent(context, AccountSetupBasics.class);
+ i.putExtra(EXTRA_FLOW_MODE, SetupData.FLOW_MODE_ACCOUNT_MANAGER_EAS);
+ return i;
}
/**
@@ -144,11 +147,16 @@
* for pop/imap accounts.
*/
public static Intent actionSetupPopImapIntent(Context context) {
- SetupData.init(SetupData.FLOW_MODE_ACCOUNT_MANAGER_POP_IMAP);
- return new Intent(context, AccountSetupBasics.class);
+ Intent i = new Intent(context, AccountSetupBasics.class);
+ i.putExtra(EXTRA_FLOW_MODE, SetupData.FLOW_MODE_ACCOUNT_MANAGER_POP_IMAP);
+ return i;
}
public static void actionAccountCreateFinishedAccountFlow(Activity fromActivity) {
+ // TODO: handle this case - modifying state on SetupData when instantiating an Intent
+ // is not safe, since it's not guaranteed that an Activity will run with the Intent, and
+ // information can get lost.
+
Intent i= new Intent(fromActivity, AccountSetupBasics.class);
// If we're in the "account flow" (from AccountManager), we want to return to the caller
// (in the settings app)
@@ -183,7 +191,15 @@
SetupData.init(SetupData.FLOW_MODE_FORCE_CREATE);
}
- int flowMode = SetupData.getFlowMode();
+ int flowMode = getIntent().getIntExtra(EXTRA_FLOW_MODE, SetupData.FLOW_MODE_UNSPECIFIED);
+ if (flowMode != SetupData.FLOW_MODE_UNSPECIFIED) {
+ SetupData.init(flowMode);
+ } else {
+ // TODO: get rid of this case. It's not safe to rely on this global static state. It
+ // should be specified in the Intent always.
+ flowMode = SetupData.getFlowMode();
+ }
+
if (flowMode == SetupData.FLOW_MODE_RETURN_TO_CALLER) {
// Return to the caller who initiated account creation
finish();
diff --git a/src/com/android/email/activity/setup/SetupData.java b/src/com/android/email/activity/setup/SetupData.java
index 4606884..dcc907d 100644
--- a/src/com/android/email/activity/setup/SetupData.java
+++ b/src/com/android/email/activity/setup/SetupData.java
@@ -30,6 +30,7 @@
// NORMAL is the standard entry from the Email app; EAS and POP_IMAP are used when entering via
// Settings -> Accounts
+ public static final int FLOW_MODE_UNSPECIFIED = -1;
public static final int FLOW_MODE_NORMAL = 0;
public static final int FLOW_MODE_ACCOUNT_MANAGER_EAS = 1;
public static final int FLOW_MODE_ACCOUNT_MANAGER_POP_IMAP = 2;
diff --git a/src/com/android/email/mail/Store.java b/src/com/android/email/mail/Store.java
index 27c9492..bdf9039 100644
--- a/src/com/android/email/mail/Store.java
+++ b/src/com/android/email/mail/Store.java
@@ -88,6 +88,8 @@
public synchronized static Store getInstance(Account account, Context context)
throws MessagingException {
HostAuth hostAuth = account.getOrCreateHostAuthRecv(context);
+ // An existing account might have been deleted
+ if (hostAuth == null) return null;
Store store = sStores.get(hostAuth);
if (store == null) {
Context appContext = context.getApplicationContext();
diff --git a/src/com/android/email/provider/ContentCache.java b/src/com/android/email/provider/ContentCache.java
index 11ad179..d18c3ee 100644
--- a/src/com/android/email/provider/ContentCache.java
+++ b/src/com/android/email/provider/ContentCache.java
@@ -396,7 +396,7 @@
@Override
public boolean onMove(int oldPosition, int newPosition) {
- return ((CrossProcessCursor)mCursor).onMove(oldPosition, newPosition);
+ return true;
}
}
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 18fe33f..9f7fc85 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -16,11 +16,6 @@
package com.android.email.provider;
-import com.android.email.Email;
-import com.android.email.widget.EmailWidget;
-import com.android.email.widget.WidgetManager;
-import com.android.emailcommon.Logging;
-
import android.app.Service;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
@@ -29,6 +24,11 @@
import android.util.Log;
import android.widget.RemoteViewsService;
+import com.android.email.Email;
+import com.android.email.widget.EmailWidget;
+import com.android.email.widget.WidgetManager;
+import com.android.emailcommon.Logging;
+
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -56,7 +56,7 @@
Log.d(EmailWidget.TAG, "onUpdate");
}
super.onUpdate(context, appWidgetManager, appWidgetIds);
- WidgetManager.getInstance().createWidgets(context, appWidgetIds);
+ WidgetManager.getInstance().updateWidgets(context, appWidgetIds);
}
@Override
diff --git a/src/com/android/email/view/NonLockingScrollView.java b/src/com/android/email/view/NonLockingScrollView.java
index d5098a3..832136c 100644
--- a/src/com/android/email/view/NonLockingScrollView.java
+++ b/src/com/android/email/view/NonLockingScrollView.java
@@ -18,10 +18,16 @@
package com.android.email.view;
import android.content.Context;
+import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
import android.widget.ScrollView;
+import java.util.ArrayList;
+
/**
* A {@link ScrollView} that will never lock scrolling in a particular direction.
*
@@ -44,31 +50,90 @@
}
/**
- * Whether or not this view is in the middle of a drag.
+ * Whether or not the contents of this view is being dragged by one of the children in
+ * {@link #mChildrenNeedingAllTouches}.
*/
- private boolean mInDrag = false;
+ private boolean mInCustomDrag = false;
+
+ /**
+ * The list of children who should always receive touch events, and not have them intercepted.
+ */
+ private final ArrayList<View> mChildrenNeedingAllTouches = new ArrayList<View>();
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
final int action = ev.getActionMasked();
final boolean isUp = action == MotionEvent.ACTION_UP;
- if (isUp && mInDrag) {
+ if (isUp && mInCustomDrag) {
// An up event after a drag should be intercepted so that child views don't handle
// click events falsely after a drag.
- mInDrag = false;
+ mInCustomDrag = false;
onTouchEvent(ev);
return true;
}
+ if (!mInCustomDrag && !isEventOverChild(ev, mChildrenNeedingAllTouches)) {
+ return super.onInterceptTouchEvent(ev);
+ }
+
// Note the normal scrollview implementation is to intercept all touch events after it has
// detected a drag starting. We will handle this ourselves.
- mInDrag = super.onInterceptTouchEvent(ev);
- if (mInDrag) {
+ mInCustomDrag = super.onInterceptTouchEvent(ev);
+ if (mInCustomDrag) {
onTouchEvent(ev);
}
// Don't intercept events - pass them on to children as normal.
return false;
}
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ excludeChildrenFromInterceptions(this);
+ }
+
+ /**
+ * Traverses the view tree for {@link WebView}s so they can be excluded from touch
+ * interceptions and receive all events.
+ */
+ private void excludeChildrenFromInterceptions(View node) {
+ // If additional types of children should be excluded (e.g. horizontal scrolling banners),
+ // this needs to be modified accordingly.
+ if (node instanceof WebView) {
+ mChildrenNeedingAllTouches.add(node);
+ } else if (node instanceof ViewGroup) {
+ ViewGroup viewGroup = (ViewGroup) node;
+ final int childCount = viewGroup.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ final View child = viewGroup.getChildAt(i);
+ excludeChildrenFromInterceptions(child);
+ }
+ }
+ }
+
+ private static final Rect sHitFrame = new Rect();
+ private static boolean isEventOverChild(MotionEvent ev, ArrayList<View> children) {
+ final int actionIndex = ev.getActionIndex();
+ final float x = ev.getX(actionIndex);
+ final float y = ev.getY(actionIndex);
+
+ for (View child : children) {
+ if (!canViewReceivePointerEvents(child)) {
+ continue;
+ }
+ child.getHitRect(sHitFrame);
+
+ // child can receive the motion event.
+ if (sHitFrame.contains((int) x, (int) y)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean canViewReceivePointerEvents(View child) {
+ return child.getVisibility() == VISIBLE || (child.getAnimation() != null);
+ }
}
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index af5808a..a46a290 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -16,19 +16,6 @@
package com.android.email.widget;
-import com.android.email.Email;
-import com.android.email.R;
-import com.android.email.ResourceHelper;
-import com.android.email.activity.MessageCompose;
-import com.android.email.activity.UiUtilities;
-import com.android.email.activity.Welcome;
-import com.android.email.provider.WidgetProvider.WidgetService;
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.utility.EmailAsyncTask;
-
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.content.Context;
@@ -53,6 +40,19 @@
import android.widget.RemoteViews;
import android.widget.RemoteViewsService;
+import com.android.email.Email;
+import com.android.email.R;
+import com.android.email.ResourceHelper;
+import com.android.email.activity.MessageCompose;
+import com.android.email.activity.UiUtilities;
+import com.android.email.activity.Welcome;
+import com.android.email.provider.WidgetProvider.WidgetService;
+import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.utility.EmailAsyncTask;
+
import java.util.List;
/**
@@ -95,8 +95,6 @@
private static final int MAX_MESSAGE_LIST_COUNT = 25;
private static String sSubjectSnippetDivider;
- @SuppressWarnings("unused")
- private static String sConfigureText;
private static int sSenderFontSize;
private static int sSubjectFontSize;
private static int sDateFontSize;
@@ -150,7 +148,6 @@
sDefaultTextColor = res.getColor(R.color.widget_default_text_color);
sDefaultTextColor = res.getColor(R.color.widget_default_text_color);
sLightTextColor = res.getColor(R.color.widget_light_text_color);
- sConfigureText = res.getString(R.string.widget_other_views);
}
mResourceHelper = ResourceHelper.getInstance(mContext);
}
@@ -171,6 +168,14 @@
mLoader.load(mAccountId, mailboxId);
}
+ /**
+ * Resets the data in the widget and forces a reload.
+ */
+ public void reset() {
+ mLoader.reset();
+ start();
+ }
+
private boolean isCursorValid() {
return mCursor != null && !mCursor.isClosed();
}
@@ -265,18 +270,21 @@
});
}
+ private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {
+ views.setTextViewText(id, text);
+ views.setContentDescription(id, text);
+ }
+
private void setupTitleAndCount(RemoteViews views) {
// Set up the title (view type + count of messages)
- views.setTextViewText(R.id.widget_title, mMailboxName);
- // TODO Temporary UX; need to make this visible and create the correct UX
- //views.setTextViewText(R.id.widget_tap, sConfigureText);
+ setTextViewTextAndDesc(views, R.id.widget_title, mMailboxName);
views.setViewVisibility(R.id.widget_tap, View.VISIBLE);
- views.setTextViewText(R.id.widget_tap, mAccountName);
+ setTextViewTextAndDesc(views, R.id.widget_tap, mAccountName);
String count = "";
if (isCursorValid()) {
count = UiUtilities.getMessageCountForUi(mContext, mCursor.getMessageCount(), false);
}
- views.setTextViewText(R.id.widget_count, count);
+ setTextViewTextAndDesc(views, R.id.widget_count, count);
}
/**
@@ -312,6 +320,7 @@
views.setViewVisibility(R.id.tap_to_configure, View.GONE);
// Create click intent for "compose email" target
intent = MessageCompose.getMessageComposeIntent(mContext, mAccountId);
+ intent.putExtra(MessageCompose.EXTRA_FROM_WIDGET, true);
setActivityIntent(views, R.id.widget_compose, intent);
// Create click intent for logo to open inbox
intent = Welcome.createOpenAccountInboxIntent(mContext, mAccountId);
@@ -405,16 +414,17 @@
views.setInt(R.id.widget_message, "setBackgroundResource", drawableId);
// Add style to sender
- String cursorString =
+ String rawSender =
mCursor.isNull(EmailWidgetLoader.WIDGET_COLUMN_DISPLAY_NAME)
? "" // an empty string
: mCursor.getString(EmailWidgetLoader.WIDGET_COLUMN_DISPLAY_NAME);
- SpannableStringBuilder from = new SpannableStringBuilder(cursorString);
+ SpannableStringBuilder from = new SpannableStringBuilder(rawSender);
from.setSpan(
isUnread ? new StyleSpan(Typeface.BOLD) : new StyleSpan(Typeface.NORMAL), 0,
from.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
CharSequence styledFrom = addStyle(from, sSenderFontSize, sDefaultTextColor);
views.setTextViewText(R.id.widget_from, styledFrom);
+ views.setContentDescription(R.id.widget_from, rawSender);
long timestamp = mCursor.getLong(EmailWidgetLoader.WIDGET_COLUMN_TIMESTAMP);
// Get a nicely formatted date string (relative to today)
@@ -422,12 +432,14 @@
// Add style to date
CharSequence styledDate = addStyle(date, sDateFontSize, sDefaultTextColor);
views.setTextViewText(R.id.widget_date, styledDate);
+ views.setContentDescription(R.id.widget_date, date);
// Add style to subject/snippet
String subject = mCursor.getString(EmailWidgetLoader.WIDGET_COLUMN_SUBJECT);
String snippet = mCursor.getString(EmailWidgetLoader.WIDGET_COLUMN_SNIPPET);
CharSequence subjectAndSnippet = getStyledSubjectSnippet(subject, snippet, !isUnread);
views.setTextViewText(R.id.widget_subject, subjectAndSnippet);
+ views.setContentDescription(R.id.widget_subject, subject);
int messageFlags = mCursor.getInt(EmailWidgetLoader.WIDGET_COLUMN_FLAGS);
boolean hasInvite = (messageFlags & Message.FLAG_INCOMING_MEETING_INVITE) != 0;
diff --git a/src/com/android/email/widget/WidgetManager.java b/src/com/android/email/widget/WidgetManager.java
index 87d0259..d2cb171 100644
--- a/src/com/android/email/widget/WidgetManager.java
+++ b/src/com/android/email/widget/WidgetManager.java
@@ -16,15 +16,15 @@
package com.android.email.widget;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
import com.android.email.Email;
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.Mailbox;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Log;
-
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.Map;
@@ -69,6 +69,18 @@
}
}
+ public synchronized void updateWidgets(Context context, int[] widgetIds) {
+ for (int widgetId : widgetIds) {
+ // Find the widget in the map
+ final EmailWidget widget = WidgetManager.getInstance().get(widgetId);
+ if (widget != null) {
+ widget.reset();
+ } else {
+ getOrCreateWidget(context, widgetId);
+ }
+ }
+ }
+
public synchronized EmailWidget getOrCreateWidget(Context context, int widgetId) {
EmailWidget widget = WidgetManager.getInstance().get(widgetId);
if (widget == null) {
@@ -76,7 +88,7 @@
Log.d(EmailWidget.TAG, "Create email widget; ID: " + widgetId);
}
widget = new EmailWidget(context, widgetId);
- WidgetManager.getInstance().put(widgetId, widget);
+ put(widgetId, widget);
widget.start();
}
return widget;
diff --git a/tests/src/com/android/email/activity/MessageOrderManagerTest.java b/tests/src/com/android/email/activity/MessageOrderManagerTest.java
index 3bbc1f7..da78627 100644
--- a/tests/src/com/android/email/activity/MessageOrderManagerTest.java
+++ b/tests/src/com/android/email/activity/MessageOrderManagerTest.java
@@ -16,10 +16,6 @@
package com.android.email.activity;
-import com.android.email.provider.EmailProvider;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.utility.DelayedOperations;
-
import android.content.Context;
import android.database.AbstractCursor;
import android.database.Cursor;
@@ -27,6 +23,11 @@
import android.test.ProviderTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.email.MessageListContext;
+import com.android.email.provider.EmailProvider;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.utility.DelayedOperations;
+
import junit.framework.Assert;
@SmallTest
@@ -256,7 +257,8 @@
public void testWithActualClass() {
// There are not many things we can test synchronously.
// Just open & close just to make sure it won't crash.
- MessageOrderManager mom = new MessageOrderManager(getContext(), 1, new MyCallback());
+ MessageOrderManager mom = new MessageOrderManager(
+ getContext(), MessageListContext.forMailbox(1, 1), new MyCallback());
mom.moveTo(123);
mom.close();
}
@@ -307,7 +309,8 @@
public boolean mStartQueryCalled;
public MessageOrderManagerForTest(Context context, long mailboxId, Callback callback) {
- super(context, mailboxId, callback, new NonDelayedOperations());
+ super(context, MessageListContext.forMailbox(1, mailboxId),
+ callback, new NonDelayedOperations());
}
@Override void startQuery() {
@@ -345,7 +348,7 @@
}
private static class MyCursor extends AbstractCursor {
- private long[] mList;
+ private final long[] mList;
public MyCursor(long... idList) {
mList = (idList == null) ? new long[0] : idList;
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java b/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java
deleted file mode 100644
index da589c6..0000000
--- a/tests/src/com/android/email/activity/setup/AccountSetupNamesTests.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-// TODO Test crashes. Fix it.
-
-/*
-The problem is that this test creates a partial account which will be
-used by the activity, but the account is picked up by MailService too
-(which is probably not intentional), which crashes because the account
-is not properly constructed. (empty address)
- */
-
-//
-//package com.android.email.activity.setup;
-//
-//import com.android.email.R;
-//import com.android.email.provider.EmailContent;
-//
-//import android.content.ContentUris;
-//import android.content.Context;
-//import android.content.Intent;
-//import android.net.Uri;
-//import android.test.ActivityInstrumentationTestCase2;
-//import android.test.suitebuilder.annotation.MediumTest;
-//import android.widget.Button;
-//
-///**
-// * Tests of basic UI logic in the AccountSetupNamesTest screen.
-// * You can run this entire test case with:
-// * runtest -c com.android.email.activity.setup.AccountSetupNamesTests email
-// */
-//@MediumTest
-//public class AccountSetupNamesTests extends ActivityInstrumentationTestCase2<AccountSetupNames> {
-// private long mAccountId;
-// private EmailContent.Account mAccount;
-//
-// private Context mContext;
-// private AccountSetupNames mActivity;
-// private Button mDoneButton;
-//
-// public AccountSetupNamesTests() {
-// super(AccountSetupNames.class);
-// }
-//
-// /**
-// * Common setup code for all tests.
-// */
-// @Override
-// protected void setUp() throws Exception {
-// super.setUp();
-//
-// mContext = this.getInstrumentation().getTargetContext();
-// }
-//
-// /**
-// * Delete any dummy accounts we set up for this test
-// */
-// @Override
-// protected void tearDown() throws Exception {
-// if (mAccount != null) {
-// Uri uri = ContentUris.withAppendedId(
-// EmailContent.Account.CONTENT_URI, mAccountId);
-// mContext.getContentResolver().delete(uri, null, null);
-// }
-//
-// // must call last because it scrubs member variables
-// super.tearDown();
-// }
-//
-// /**
-// * Test a "good" account name (enables the button)
-// */
-// public void testGoodAccountName() {
-// Intent i = getTestIntent("imap", "GoodName");
-// this.setActivityIntent(i);
-//
-// getActivityAndFields();
-//
-// assertTrue(mDoneButton.isEnabled());
-// }
-//
-// /**
-// * Test a "bad" account name (disables the button)
-// */
-// public void testBadAccountName() {
-// Intent i = getTestIntent("imap", "");
-// this.setActivityIntent(i);
-//
-// getActivityAndFields();
-//
-// assertFalse(mDoneButton.isEnabled());
-// }
-//
-// /**
-// * Test a "bad" account name (disables the button)
-// */
-// public void testEasAccountName() {
-// Intent i = getTestIntent("eas", "");
-// this.setActivityIntent(i);
-//
-// getActivityAndFields();
-//
-// assertTrue(mDoneButton.isEnabled());
-// }
-//
-// /**
-// * Get the activity (which causes it to be started, using our intent) and get the UI fields
-// */
-// private void getActivityAndFields() {
-// mActivity = getActivity();
-// mDoneButton = (Button) mActivity.findViewById(R.id.done);
-// }
-//
-// /**
-// * Create an intent with the Account in it, using protocol as the protocol and name as the
-// * user's sender name
-// */
-// private Intent getTestIntent(String protocol, String name) {
-// mAccount = new EmailContent.Account();
-// mAccount.setSenderName(name);
-// HostAuth hostAuth = new HostAuth();
-// hostAuth.mProtocol = protocol;
-// mAccount.mHostAuthRecv = hostAuth;
-// mAccount.save(mContext);
-// mAccountId = mAccount.mId;
-// SetupData.init(SetupData.FLOW_MODE_NORMAL, mAccount);
-// return new Intent(Intent.ACTION_MAIN);
-// }
-//}
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
index 8c2473c..ebf3243 100644
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -2298,38 +2298,6 @@
assertEquals(b34, testMailbox);
}
- public void testBuildMessageListSelection() {
- final Context c = mMockContext;
-
- assertEquals(Message.ALL_INBOX_SELECTION, Message.buildMessageListSelection(c,
- Mailbox.QUERY_ALL_INBOXES));
-
- assertEquals(Message.ALL_DRAFT_SELECTION, Message.buildMessageListSelection(c,
- Mailbox.QUERY_ALL_DRAFTS));
-
- assertEquals(Message.ALL_OUTBOX_SELECTION, Message.buildMessageListSelection(c,
- Mailbox.QUERY_ALL_OUTBOX));
-
- assertEquals(Message.ALL_UNREAD_SELECTION, Message.buildMessageListSelection(c,
- Mailbox.QUERY_ALL_UNREAD));
-
- assertEquals(Message.ALL_FAVORITE_SELECTION, Message.buildMessageListSelection(c,
- Mailbox.QUERY_ALL_FAVORITES));
-
- final Account account = ProviderTestUtils.setupAccount("1", true, mMockContext);
- final Mailbox in = ProviderTestUtils.setupMailbox("i", account.mId, true, c,
- Mailbox.TYPE_INBOX);
- final Mailbox out = ProviderTestUtils.setupMailbox("o", account.mId, true, c,
- Mailbox.TYPE_OUTBOX);
-
- assertEquals(Message.MAILBOX_KEY + "=" + in.mId + " AND " + Message.FLAG_LOADED_SELECTION,
- Message.buildMessageListSelection(c, in.mId));
-
- // No LOADED check for outboxes.
- assertEquals(Message.MAILBOX_KEY + "=" + out.mId,
- Message.buildMessageListSelection(c, out.mId));
- }
-
/**
* Determine whether a list of AccountManager accounts includes a given EmailProvider account
* @param amAccountList a list of AccountManager accounts
diff --git a/tests/src/com/android/emailcommon/utility/UtilityMediumTests.java b/tests/src/com/android/emailcommon/utility/UtilityMediumTests.java
index 976b072..96d2a8f 100644
--- a/tests/src/com/android/emailcommon/utility/UtilityMediumTests.java
+++ b/tests/src/com/android/emailcommon/utility/UtilityMediumTests.java
@@ -39,7 +39,7 @@
* complete - no server(s) required.
*
* You can run this entire test case with:
- * runtest -c com.android.email.UtilityMediumTests email
+ * runtest -c com.android.emailcommon.utility.UtilityMediumTests email
*/
@MediumTest
public class UtilityMediumTests extends ProviderTestCase2<EmailProvider> {
@@ -80,6 +80,16 @@
// Try to find account1, excluding account1
acct = Utility.findExistingAccount(mMockContext, account1.mId, "address-ha1", "login-ha1");
assertNull(acct);
+
+ // Make sure we properly handle an underscore in the login name
+ Account account3 = ProviderTestUtils.setupAccount("account3", false, mMockContext);
+ account3.mHostAuthRecv = ProviderTestUtils.setupHostAuth("foo_ba", -1, false, mMockContext);
+ account3.mHostAuthSend = ProviderTestUtils.setupHostAuth("foo_ba", -1, false, mMockContext);
+ account3.save(mMockContext);
+ acct = Utility.findExistingAccount(mMockContext, -1, "address-foo_ba", "login-foo.ba");
+ assertNull(acct);
+ acct = Utility.findExistingAccount(mMockContext, -1, "address-foo_ba", "login-foo_ba");
+ assertNotNull(acct);
}
public void testAttachmentExists() throws IOException {
