From 017b062b189b029ee3de09528669dbb4c35783de Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 24 Oct 2011 16:49:50 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

Change-Id: I5a3d8ce3b33cfbc3756bdcefa599e4c75f335df6
---
 res/values-da/strings.xml     |  2 +-
 res/values-de/strings.xml     |  6 +++---
 res/values-fr/strings.xml     |  4 ++--
 res/values-it/strings.xml     |  2 +-
 res/values-ko/strings.xml     | 34 +++++++++++++++++-----------------
 res/values-lt/strings.xml     |  2 +-
 res/values-lv/strings.xml     |  2 +-
 res/values-ru/strings.xml     |  2 +-
 res/values-sl/strings.xml     |  2 +-
 res/values-zh-rTW/strings.xml |  6 +++---
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 824b0ae1c..87e9f3aef 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -377,7 +377,7 @@
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hurtige svar"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Rediger tekst, du ofte indsætter, når du skriver e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Vedhæft tekst til beskeder, du sender"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for meddelelser"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for underretninger"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataforbrug"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Rediger hurtigt svar"</string>
     <string name="save_action" msgid="1988862706623227093">"Gem"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 87de27f3b..6b24acb83 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -252,7 +252,7 @@
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoeinrichtung"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Ihr Konto ist nun eingerichtet."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Konto benennen (optional)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird für ausgehende Nachrichten angezeigt)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird bei ausgehenden Nachrichten angezeigt)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dieses Feld darf nicht leer sein."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
@@ -378,7 +378,7 @@
     <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Bearbeiten Sie beim Verfassen von E-Mails oft eingefügten Text."</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text an ausgehende Nachrichten anhängen"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Benachrichtigungseinstellungen"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Datennutzung"</string>
+    <string name="account_settings_data_usage" msgid="6669107430575866736">"Datenverbrauch"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Kurzantwort bearbeiten"</string>
     <string name="save_action" msgid="1988862706623227093">"Speichern"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr"</string>
@@ -411,7 +411,7 @@
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Ordner wurde nicht gefunden. Er wurde möglicherweise entfernt."</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Nur einige \"Plus\"-Konten haben einen POP-Zugang, der diesem Programm ermöglicht, eine Verbindung aufzubauen. Sollten Sie nicht dazu in der Lage sein, sich mit Ihrer korrekten E-Mail-Adresse und dem richtigen Passwort anzumelden, verfügen Sie möglicherweise nicht über ein kostenpflichtiges \"Plus\"-Konto. Starten Sie Ihren Webbrowser, um auf diese Konten zuzugreifen."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Richten Sie vor der Erstellung des E-Mail-Kontos ein Passwort für den POP3-E-Mail-Zugang auf der T-Online-Website ein."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Geschäftlich"</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Microsoft Exchange"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Konto konnte nicht erstellt werden. Bitte versuchen Sie es erneut."</string>
     <string name="device_admin_label" msgid="8680224994637869414">"E-Mail"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 95ff03713..0f7882cad 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -231,7 +231,7 @@
     <string name="message_view_move_to_newer" msgid="2190862552581773765">"Suivant"</string>
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Précédents"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuration du compte"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurer un compte"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de messagerie"</string>
@@ -378,7 +378,7 @@
     <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Modifier texte fréquemment inséré lors de la rédaction d\'e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Ajouter un texte aux messages envoyés"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paramètres de notification"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilisation des données"</string>
+    <string name="account_settings_data_usage" msgid="6669107430575866736">"Consommation des données"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Modifier une réponse rapide"</string>
     <string name="save_action" msgid="1988862706623227093">"Enregistrer"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchroniser les contacts"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index dc80a9115..d4dec48ce 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -247,7 +247,7 @@
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Utilizzi già questo nome utente per l\'account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Questa password inizia o termina con uno o più spazi. Molti server non supportano le password contenenti spazi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica impostazioni server della posta in arrivo..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Impostazione account"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fe3d15d83..365527176 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
     <string name="permission_access_provider_label" msgid="378256653525377586">"이메일 제공업체 데이터 액세스"</string>
     <string name="permission_access_provider_desc" msgid="2221907862438022705">"애플리케이션이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 포함하는 이메일 데이터베이스에 액세스하도록 합니다."</string>
     <string name="app_name" msgid="5815426892327290362">"이메일"</string>
-    <string name="compose_title" msgid="427986915662706899">"메시지작성"</string>
+    <string name="compose_title" msgid="427986915662706899">"편지쓰기"</string>
     <string name="debug_title" msgid="5175710493691536719">"디버그"</string>
     <string name="next_action" msgid="3931301986364184415">"다음"</string>
     <string name="okay_action" msgid="8365197396795675617">"확인"</string>
@@ -46,7 +46,7 @@
     <string name="remove_star_action" msgid="6689770999647007163">"별표 삭제"</string>
     <string name="refresh_action" msgid="5951383001436708175">"새로고침"</string>
     <string name="add_account_action" msgid="8835736309476033727">"계정 추가"</string>
-    <string name="compose_action" msgid="4045702519637388045">"메시지작성"</string>
+    <string name="compose_action" msgid="4045702519637388045">"편지쓰기"</string>
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"계정 설정"</string>
     <string name="settings_action" msgid="6334807007967459412">"설정"</string>
@@ -102,7 +102,7 @@
   </plurals>
     <string name="debug_version_fmt" msgid="6160213145745376955">"버전: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"받은편지함"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"중요편지함"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"별표편지함"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"임시보관함"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"보낼편지함"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"모든 받은편지함 보기"</string>
@@ -113,7 +113,7 @@
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"최근 폴더"</string>
     <string name="message_subject_description" msgid="3597047441062021199">"제목"</string>
     <string name="message_is_empty_description" msgid="4004644319382041459">"(제목 없음)"</string>
-    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메일 표시"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
@@ -129,7 +129,7 @@
     <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_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_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>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"받은메일 포함"</string>
@@ -154,7 +154,7 @@
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"중지"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"첨부파일을 <xliff:g id="FILENAME">%s</xliff:g>(으)로 저장했습니다."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"첨부파일을 저장할 수 없습니다."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 전달된 메시지에서 하나 이상의 첨부파일을 보내기 전에 다운로드합니다."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 메일을 전달하기 전에 첨부파일을 다운로드합니다."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"메일"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"초대"</string>
   <plurals name="message_view_show_attachments_action">
@@ -196,10 +196,10 @@
     <item quantity="other" msgid="4437637377522896262">"이 메일을 삭제하시겠습니까?"</item>
   </plurals>
   <plurals name="message_deleted_toast">
-    <item quantity="one" msgid="710742672464447084">"메시지를 삭제했습니다."</item>
-    <item quantity="other" msgid="6574961322865652255">"메시지를 삭제했습니다."</item>
+    <item quantity="one" msgid="710742672464447084">"메일을 삭제했습니다."</item>
+    <item quantity="other" msgid="6574961322865652255">"메일을 삭제했습니다."</item>
   </plurals>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"메시지를 삭제했습니다."</string>
+    <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>
@@ -240,7 +240,7 @@
     <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"간단한 절차만으로 Exchange ActiveSync 계정을 설정할 수 있습니다."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"이메일 주소"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"비밀번호"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일 보냄(기본값)"</string>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"중복 계정"</string>
@@ -252,7 +252,7 @@
     <string name="account_setup_names_title" msgid="8483517350241119291">"계정 설정"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(메일에 표시)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"이 입력란은 비워 둘 수 없습니다."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"계정 설정"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"계정 유형"</string>
@@ -273,7 +273,7 @@
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"서버에서 이메일 삭제"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"안함"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"받은편지함에서 삭제할 때"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 경로 접두어"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 경로 접두사"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"선택사항"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"계정 설정"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"발신 서버 설정"</string>
@@ -305,11 +305,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15분마다"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30분마다"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"1시간마다"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"이 계정에서 이메일을 보냅니다(기본값)."</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"이메일이 오면 알림"</string>
     <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_sync_email_label" msgid="3930927721878987383">"이메일 동기화"</string>
     <string name="account_setup_options_background_attachments_label" msgid="6759055024748351429">"WiFi에 연결되면 자동으로 첨부파일 다운로드"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"완료할 수 없음"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"동기화할 일 수"</string>
@@ -360,7 +360,7 @@
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"로그인하지 못했습니다."</string>
     <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_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_notify_label" msgid="1630001017303007974">"이메일 알림"</string>
@@ -411,7 +411,7 @@
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"폴더를 찾을 수 없습니다. 삭제되었을 수 있습니다."</string>
     <string name="provider_note_live" msgid="2995297671709325333">"일부 \'Plus\' 계정에만 이 프로그램에 연결할 수 있는 POP 액세스 권한이 있습니다. 올바른 이메일 주소와 비밀번호를 입력해도 로그인이 되지 않으면 유료 \'Plus\' 계정이 없기 때문일 수 있습니다. 이러한 이메일 계정에 액세스하려면 웹브라우저를 실행하세요."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"이메일 계정을 설정하기 전에 T-Online 웹사이트를 방문하고 POP3 이메일 액세스용 비밀번호를 만드세요."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"회사"</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Exchange 계정"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"계정을 만들지 못했습니다. 다시 시도해 주세요."</string>
     <string name="device_admin_label" msgid="8680224994637869414">"이메일"</string>
@@ -455,7 +455,7 @@
     <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>
+    <string name="widget_starred" msgid="8290352707134011791">"별표편지함"</string>
     <string name="widget_loading" msgid="2340962056927255554">"로드 중..."</string>
     <string name="widget_touch_to_configure" msgid="7062039013915225323">"설정하려면 터치하세요."</string>
     <string name="widget_no_accounts" msgid="2412482205591224408">"아직 이메일 계정을 설정하지 않았습니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0fb6b1bcf..2ba0b4d6d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -241,7 +241,7 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"El. pašto adresas"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Slaptažodis"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros."</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Nustatymas rankiniu būdu"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Neaut. nustat."</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Įveskite galiojantį el. pašto adresą ir slaptažodį."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Kopijuoti paskyrą"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jau naudojate šį naudotojo vardą „<xliff:g id="DUPLICATE">%s</xliff:g>“ paskyroje."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dc3e43873..3129476b0 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -235,7 +235,7 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange konta pievienošana"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pievienot Exchange ActiveSync kontu"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-pasta konts"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Varat iestatīt e-pastu lielākajā daļā kontu, veicot tikai dažas darbības."</string>
+    <string name="accounts_welcome" msgid="1491126253077950685">"E-pasts atbalsts lielāko daļu populārāko pasta klientu."</string>
     <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Varat iestatīt Exchange kontu, veicot tikai dažas darbības."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Varat iestatīt Exchange ActiveSync kontu, veicot tikai dažas darbības."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-pasta adrese"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bf9e5ba56..6fc5a1de4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -202,7 +202,7 @@
     <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_load_attachment_failed_toast" msgid="3623598332367932461">"Не удалось загрузить файл \"<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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 59275485f..b619cbf99 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,7 +23,7 @@
     <string name="app_name" msgid="5815426892327290362">"E-pošta"</string>
     <string name="compose_title" msgid="427986915662706899">"Novo"</string>
     <string name="debug_title" msgid="5175710493691536719">"Odpravljanje napak"</string>
-    <string name="next_action" msgid="3931301986364184415">"Naslednji"</string>
+    <string name="next_action" msgid="3931301986364184415">"Naprej"</string>
     <string name="okay_action" msgid="8365197396795675617">"V redu"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Prekliči"</string>
     <string name="previous_action" msgid="5181616311579820981">"Nazaj"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2637d40a4..ebdba44ad 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -235,7 +235,7 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"新增 Exchange 帳戶"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"新增 Exchange ActiveSync 帳戶"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"電子郵件帳戶"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"只要幾個步驟，就可以為絕大多數的帳戶設定電子郵件。"</string>
+    <string name="accounts_welcome" msgid="1491126253077950685">"只要幾個步驟，就能設妥許多帳戶的電子郵件。"</string>
     <string name="accounts_welcome_exchange" msgid="4432917203403596617">"只要幾個步驟，就可以設定 Exchange 帳戶。"</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"只要幾個步驟，就可以設定 Exchange ActiveSync 帳戶。"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"電子郵件地址"</string>
@@ -297,7 +297,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"行動裝置 ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件匣頻率"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"收件匣檢查頻率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"不要檢查"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自動 (預先載入)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每 5 分鐘檢查一次"</string>
@@ -366,7 +366,7 @@
     <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>
-    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"查看收件匣頻率"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"收件匣檢查頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"使用者名稱、密碼和其他內送伺服器設定"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外寄設定"</string>