From 101ee5587a464254b69181d327f780df32d7f75e Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Thu, 2 Apr 2009 16:39:22 -0700
Subject: [PATCH 1/4] AI 144335: Import US Spanish translations, and a few
 Japanese changes.

Automated import of CL 144335
---
 res/values-es-rUS/strings.xml | 333 ++++++++++++++++++++++++++++++++++
 1 file changed, 333 insertions(+)
 create mode 100644 res/values-es-rUS/strings.xml

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
new file mode 100644
index 000000000..c95b922b3
--- /dev/null
+++ b/res/values-es-rUS/strings.xml
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for read_attachment_label (1300286008047638726) -->
+    <skip />
+    <!-- no translation found for read_attachment_desc (7594746717616308643) -->
+    <skip />
+    <!-- no translation found for app_name (5815426892327290362) -->
+    <skip />
+    <!-- no translation found for accounts_title (7249537449234892146) -->
+    <skip />
+    <!-- no translation found for compose_title (427986915662706899) -->
+    <skip />
+    <!-- no translation found for debug_title (5175710493691536719) -->
+    <skip />
+    <!-- no translation found for next_action (3931301986364184415) -->
+    <skip />
+    <!-- no translation found for okay_action (8365197396795675617) -->
+    <skip />
+    <!-- no translation found for cancel_action (6967435583794021865) -->
+    <skip />
+    <!-- no translation found for send_action (1729766205562446418) -->
+    <skip />
+    <!-- no translation found for reply_action (4262472229221507619) -->
+    <skip />
+    <!-- no translation found for reply_all_action (6192179825726332152) -->
+    <skip />
+    <!-- no translation found for delete_action (8421026208288857155) -->
+    <skip />
+    <!-- no translation found for forward_action (669174181042344116) -->
+    <skip />
+    <!-- no translation found for done_action (7497990549515580249) -->
+    <skip />
+    <!-- no translation found for discard_action (6532206074859505968) -->
+    <skip />
+    <!-- no translation found for save_draft_action (812855865552028622) -->
+    <skip />
+    <!-- no translation found for refresh_action (5951383001436708175) -->
+    <skip />
+    <!-- no translation found for add_account_action (8835736309476033727) -->
+    <skip />
+    <!-- no translation found for compose_action (4045702519637388045) -->
+    <skip />
+    <!-- no translation found for search_action (6325101454876682308) -->
+    <skip />
+    <!-- no translation found for open_action (936766723989190816) -->
+    <skip />
+    <!-- no translation found for account_settings_action (4494079183315085171) -->
+    <skip />
+    <!-- no translation found for remove_account_action (3789169090601376209) -->
+    <skip />
+    <!-- no translation found for accounts_action (901105887272231493) -->
+    <skip />
+    <!-- no translation found for mark_as_read_action (5031651846998842419) -->
+    <skip />
+    <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
+    <skip />
+    <!-- no translation found for add_cc_bcc_action (5569074812077509737) -->
+    <skip />
+    <!-- no translation found for add_attachment_action (2696013743130573897) -->
+    <skip />
+    <!-- no translation found for dump_settings_action (4478192525236169829) -->
+    <skip />
+    <!-- no translation found for accounts_context_menu_title (1053701760934475027) -->
+    <skip />
+    <!-- no translation found for status_loading_more (1580386959044617884) -->
+    <skip />
+    <!-- no translation found for status_network_error (6045933332005067021) -->
+    <skip />
+    <!-- no translation found for status_loading_more_failed (1629172047185323) -->
+    <skip />
+    <!-- no translation found for notification_new_title (2200257910380529139) -->
+    <skip />
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+    <!-- no translation found for special_mailbox_name_inbox (6549604962520041083) -->
+    <skip />
+    <!-- no translation found for accounts_welcome (7365378109109495588) -->
+    <skip />
+    <!-- no translation found for debug_version_fmt (6160213145745376955) -->
+    <skip />
+    <!-- no translation found for debug_enable_debug_logging_label (2715742416050944774) -->
+    <skip />
+    <!-- no translation found for debug_enable_sensitive_logging_label (9010809457943556126) -->
+    <skip />
+    <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
+    <skip />
+    <!-- no translation found for message_compose_to_hint (2891895306418177013) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_hint (8481884461031434144) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_hint (9177337492358841680) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_hint (6993487234024160782) -->
+    <skip />
+    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
+    <skip />
+    <!-- no translation found for message_compose_fwd_header_fmt (5181300290654579434) -->
+    <skip />
+    <!-- no translation found for message_compose_reply_header_fmt (8815624773273454573) -->
+    <skip />
+    <!-- no translation found for message_compose_quoted_text_label (5722467956990009520) -->
+    <skip />
+    <!-- no translation found for message_compose_error_no_recipients (4903715888250785486) -->
+    <skip />
+    <!-- no translation found for message_compose_attachments_skipped_toast (5611815773808423460) -->
+    <skip />
+    <string name="message_compose_attachment_size">"El archivo es demasiado grande para adjuntarlo."</string>
+    <!-- no translation found for message_view_to_label (6485191743265527381) -->
+    <skip />
+    <!-- no translation found for message_view_cc_label (6322992216371163122) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_view_action (5353550848340829134) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_download_action (7552530274014544406) -->
+    <skip />
+    <!-- no translation found for message_view_status_attachment_saved (2802843795251453632) -->
+    <skip />
+    <!-- no translation found for message_view_status_attachment_not_saved (5039599647697750874) -->
+    <skip />
+    <!-- no translation found for message_view_show_pictures_instructions (1156525837417031085) -->
+    <skip />
+    <!-- no translation found for message_view_show_pictures_action (5059936981743072545) -->
+    <skip />
+    <!-- no translation found for message_view_fetching_attachment_toast (8812363375155391184) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast (1554845060991758649) -->
+    <skip />
+    <!-- no translation found for message_discarded_toast (3891461729325584026) -->
+    <skip />
+    <!-- no translation found for message_saved_toast (8443125659172627665) -->
+    <skip />
+    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
+    <skip />
+    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
+    <skip />
+    <!-- no translation found for message_view_display_attachment_toast (6096315816776330821) -->
+    <!-- no translation found for message_view_display_attachment_toast (2079093904785941494) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_title (3969856368228940980) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_instructions (3580847367201161979) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_email_hint (7414269319207261120) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_hint (410210049040536870) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_default_label (5924790142029806711) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_manual_setup_action (8053852205391155912) -->
+    <skip />
+    <!-- no translation found for account_setup_username_password_toast (4441448542557889481) -->
+    <skip />
+    <!-- no translation found for account_setup_check_settings_retr_info_msg (4121970450267725664) -->
+    <skip />
+    <!-- no translation found for account_setup_check_settings_check_incoming_msg (5356212700221438863) -->
+    <skip />
+    <!-- no translation found for account_setup_check_settings_check_outgoing_msg (4033015234096725343) -->
+    <skip />
+    <!-- no translation found for account_setup_check_settings_canceling_msg (5077315503721883906) -->
+    <skip />
+    <!-- no translation found for account_setup_names_title (8875040521875381849) -->
+    <skip />
+    <!-- no translation found for account_setup_names_instructions (2880279273965835007) -->
+    <skip />
+    <!-- no translation found for account_setup_names_account_name_label (8033895024273259196) -->
+    <skip />
+    <!-- no translation found for account_setup_names_user_name_label (8967410178488604770) -->
+    <skip />
+    <!-- no translation found for account_setup_account_type_title (6645576356752495504) -->
+    <skip />
+    <!-- no translation found for account_setup_account_type_instructions (114515540798408760) -->
+    <skip />
+    <!-- no translation found for account_setup_account_type_pop_action (3958144865724586762) -->
+    <skip />
+    <!-- no translation found for account_setup_account_type_imap_action (3471220237309488124) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_title (6862032674547580337) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_username_label (5700581386104070302) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (6365327603172559859) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_pop_server_label (4917504440057879152) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_imap_server_label (8685076830847734322) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (8214738923690447796) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (2110260791086007424) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_none_label (8300169413118264895) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_ssl_optional_label (8550650266852041870) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_ssl_label (1239685754472907538) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_tls_optional_label (9140597901978722104) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_tls_label (8930532576790946912) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_delete_policy_label (9213590134693857912) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_delete_policy_never_label (3222897501875871041) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_delete_policy_7days_label (5091246829453195520) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_delete_policy_delete_label (222216840911785631) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_imap_path_prefix_label (401167247072926810) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_imap_path_prefix_hint (9190845919067906033) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_title (7437215562885986394) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (6035137446691195177) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (7573207437835827876) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (911398071120720589) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_require_login_label (6371514297854287948) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_username_label (3309680794731596981) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (227844585493317550) -->
+    <skip />
+    <!-- no translation found for account_setup_options_title (8995162193118880993) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_label (4598023962234986194) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_never (287951859480505416) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_5min (6388939895878539307) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_10min (5344463157247877480) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_15min (5052776740089741793) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_30min (1097088928685931864) -->
+    <skip />
+    <!-- no translation found for account_setup_options_mail_check_frequency_1hour (3767715356039692899) -->
+    <skip />
+    <!-- no translation found for account_setup_options_default_label (8869166381331276697) -->
+    <skip />
+    <!-- no translation found for account_setup_options_notify_label (1247525794828820038) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_title (7827583313117521383) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_auth_message (42827150104879570) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_auth_message_fmt (8598560266430207606) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_certificate_message (961843413600482906) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_certificate_message_fmt (2609150986774736900) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_server_message (1828270369532779265) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_server_message_fmt (5956976504788732779) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_tls_required (307030406688611327) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_auth_required (1676242821459638150) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_security (6142264248671379943) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_ioerror (7391458717708933095) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_edit_details_action (5355993309841479360) -->
+    <skip />
+    <!-- no translation found for account_settings_title_fmt (1702058877284382340) -->
+    <skip />
+    <!-- no translation found for account_settings_default_label (3575963379680943640) -->
+    <skip />
+    <!-- no translation found for account_settings_default_summary (1531901438624688482) -->
+    <skip />
+    <!-- no translation found for account_settings_notify_label (1630001017303007974) -->
+    <skip />
+    <!-- no translation found for account_settings_notify_summary (6609224590300639887) -->
+    <skip />
+    <!-- no translation found for account_settings_mail_check_frequency_label (2067835530563849675) -->
+    <skip />
+    <!-- no translation found for account_settings_incoming_label (7858928031806297542) -->
+    <skip />
+    <!-- no translation found for account_settings_outgoing_label (4464829249980026745) -->
+    <skip />
+    <!-- no translation found for account_settings_add_account_label (63971622405360050) -->
+    <skip />
+    <!-- no translation found for account_settings_description_label (8894815221204511715) -->
+    <skip />
+    <!-- no translation found for account_settings_name_label (8186406122590008449) -->
+    <skip />
+    <!-- no translation found for account_settings_notifications (1042620094281375043) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_enable (8045133290388856478) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_summary (3690631050585589365) -->
+    <skip />
+    <!-- no translation found for account_settings_ringtone (7922187231467500404) -->
+    <skip />
+    <!-- no translation found for account_settings_servers (4925493817981624242) -->
+    <skip />
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
+    <!-- no translation found for account_delete_dlg_instructions_fmt (8236846322040271280) -->
+    <skip />
+    <!-- no translation found for provider_note_yahoo (8762024183024261236) -->
+    <skip />
+    <!-- no translation found for provider_note_yahoo_uk (2055976404478603298) -->
+    <skip />
+    <!-- no translation found for provider_note_live (3584841823811425060) -->
+    <skip />
+    <!-- no translation found for provider_note_t_online (1973701903400232774) -->
+    <skip />
+</resources>

From 42bd0590209853f70c62f445c7ba162d31e97023 Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Thu, 2 Apr 2009 21:42:06 -0700
Subject: [PATCH 2/4] AI 144355: Automated g4 rollback of changelist 144335.  
 *** Reason for rollback ***   Roll back US Spanish import because it made the
 build too big.   *** Original change description ***   Import US Spanish
 translations, and a few Japanese changes.

Automated import of CL 144355
---
 res/values-es-rUS/strings.xml | 333 ----------------------------------
 1 file changed, 333 deletions(-)
 delete mode 100644 res/values-es-rUS/strings.xml

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index c95b922b3..000000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1300286008047638726) -->
-    <skip />
-    <!-- no translation found for read_attachment_desc (7594746717616308643) -->
-    <skip />
-    <!-- no translation found for app_name (5815426892327290362) -->
-    <skip />
-    <!-- no translation found for accounts_title (7249537449234892146) -->
-    <skip />
-    <!-- no translation found for compose_title (427986915662706899) -->
-    <skip />
-    <!-- no translation found for debug_title (5175710493691536719) -->
-    <skip />
-    <!-- no translation found for next_action (3931301986364184415) -->
-    <skip />
-    <!-- no translation found for okay_action (8365197396795675617) -->
-    <skip />
-    <!-- no translation found for cancel_action (6967435583794021865) -->
-    <skip />
-    <!-- no translation found for send_action (1729766205562446418) -->
-    <skip />
-    <!-- no translation found for reply_action (4262472229221507619) -->
-    <skip />
-    <!-- no translation found for reply_all_action (6192179825726332152) -->
-    <skip />
-    <!-- no translation found for delete_action (8421026208288857155) -->
-    <skip />
-    <!-- no translation found for forward_action (669174181042344116) -->
-    <skip />
-    <!-- no translation found for done_action (7497990549515580249) -->
-    <skip />
-    <!-- no translation found for discard_action (6532206074859505968) -->
-    <skip />
-    <!-- no translation found for save_draft_action (812855865552028622) -->
-    <skip />
-    <!-- no translation found for refresh_action (5951383001436708175) -->
-    <skip />
-    <!-- no translation found for add_account_action (8835736309476033727) -->
-    <skip />
-    <!-- no translation found for compose_action (4045702519637388045) -->
-    <skip />
-    <!-- no translation found for search_action (6325101454876682308) -->
-    <skip />
-    <!-- no translation found for open_action (936766723989190816) -->
-    <skip />
-    <!-- no translation found for account_settings_action (4494079183315085171) -->
-    <skip />
-    <!-- no translation found for remove_account_action (3789169090601376209) -->
-    <skip />
-    <!-- no translation found for accounts_action (901105887272231493) -->
-    <skip />
-    <!-- no translation found for mark_as_read_action (5031651846998842419) -->
-    <skip />
-    <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
-    <skip />
-    <!-- no translation found for add_cc_bcc_action (5569074812077509737) -->
-    <skip />
-    <!-- no translation found for add_attachment_action (2696013743130573897) -->
-    <skip />
-    <!-- no translation found for dump_settings_action (4478192525236169829) -->
-    <skip />
-    <!-- no translation found for accounts_context_menu_title (1053701760934475027) -->
-    <skip />
-    <!-- no translation found for status_loading_more (1580386959044617884) -->
-    <skip />
-    <!-- no translation found for status_network_error (6045933332005067021) -->
-    <skip />
-    <!-- no translation found for status_loading_more_failed (1629172047185323) -->
-    <skip />
-    <!-- no translation found for notification_new_title (2200257910380529139) -->
-    <skip />
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
-    <!-- no translation found for special_mailbox_name_inbox (6549604962520041083) -->
-    <skip />
-    <!-- no translation found for accounts_welcome (7365378109109495588) -->
-    <skip />
-    <!-- no translation found for debug_version_fmt (6160213145745376955) -->
-    <skip />
-    <!-- no translation found for debug_enable_debug_logging_label (2715742416050944774) -->
-    <skip />
-    <!-- no translation found for debug_enable_sensitive_logging_label (9010809457943556126) -->
-    <skip />
-    <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
-    <skip />
-    <!-- no translation found for message_compose_to_hint (2891895306418177013) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_hint (8481884461031434144) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_hint (9177337492358841680) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_hint (6993487234024160782) -->
-    <skip />
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
-    <!-- no translation found for message_compose_fwd_header_fmt (5181300290654579434) -->
-    <skip />
-    <!-- no translation found for message_compose_reply_header_fmt (8815624773273454573) -->
-    <skip />
-    <!-- no translation found for message_compose_quoted_text_label (5722467956990009520) -->
-    <skip />
-    <!-- no translation found for message_compose_error_no_recipients (4903715888250785486) -->
-    <skip />
-    <!-- no translation found for message_compose_attachments_skipped_toast (5611815773808423460) -->
-    <skip />
-    <string name="message_compose_attachment_size">"El archivo es demasiado grande para adjuntarlo."</string>
-    <!-- no translation found for message_view_to_label (6485191743265527381) -->
-    <skip />
-    <!-- no translation found for message_view_cc_label (6322992216371163122) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_view_action (5353550848340829134) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_download_action (7552530274014544406) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (2802843795251453632) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_not_saved (5039599647697750874) -->
-    <skip />
-    <!-- no translation found for message_view_show_pictures_instructions (1156525837417031085) -->
-    <skip />
-    <!-- no translation found for message_view_show_pictures_action (5059936981743072545) -->
-    <skip />
-    <!-- no translation found for message_view_fetching_attachment_toast (8812363375155391184) -->
-    <skip />
-    <!-- no translation found for message_deleted_toast (1554845060991758649) -->
-    <skip />
-    <!-- no translation found for message_discarded_toast (3891461729325584026) -->
-    <skip />
-    <!-- no translation found for message_saved_toast (8443125659172627665) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
-    <!-- no translation found for message_view_display_attachment_toast (6096315816776330821) -->
-    <!-- no translation found for message_view_display_attachment_toast (2079093904785941494) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_title (3969856368228940980) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_instructions (3580847367201161979) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_email_hint (7414269319207261120) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_password_hint (410210049040536870) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_default_label (5924790142029806711) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_manual_setup_action (8053852205391155912) -->
-    <skip />
-    <!-- no translation found for account_setup_username_password_toast (4441448542557889481) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_retr_info_msg (4121970450267725664) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_check_incoming_msg (5356212700221438863) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_check_outgoing_msg (4033015234096725343) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_canceling_msg (5077315503721883906) -->
-    <skip />
-    <!-- no translation found for account_setup_names_title (8875040521875381849) -->
-    <skip />
-    <!-- no translation found for account_setup_names_instructions (2880279273965835007) -->
-    <skip />
-    <!-- no translation found for account_setup_names_account_name_label (8033895024273259196) -->
-    <skip />
-    <!-- no translation found for account_setup_names_user_name_label (8967410178488604770) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_title (6645576356752495504) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_instructions (114515540798408760) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_pop_action (3958144865724586762) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_imap_action (3471220237309488124) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_title (6862032674547580337) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_username_label (5700581386104070302) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_password_label (6365327603172559859) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_pop_server_label (4917504440057879152) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_server_label (8685076830847734322) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_port_label (8214738923690447796) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_label (2110260791086007424) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_none_label (8300169413118264895) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_optional_label (8550650266852041870) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (1239685754472907538) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_optional_label (9140597901978722104) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8930532576790946912) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_label (9213590134693857912) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_never_label (3222897501875871041) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_7days_label (5091246829453195520) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_delete_label (222216840911785631) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_label (401167247072926810) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_hint (9190845919067906033) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_title (7437215562885986394) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_smtp_server_label (6035137446691195177) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_port_label (7573207437835827876) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_security_label (911398071120720589) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_require_login_label (6371514297854287948) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_username_label (3309680794731596981) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_password_label (227844585493317550) -->
-    <skip />
-    <!-- no translation found for account_setup_options_title (8995162193118880993) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (4598023962234986194) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_never (287951859480505416) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_5min (6388939895878539307) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_10min (5344463157247877480) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_15min (5052776740089741793) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_30min (1097088928685931864) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_1hour (3767715356039692899) -->
-    <skip />
-    <!-- no translation found for account_setup_options_default_label (8869166381331276697) -->
-    <skip />
-    <!-- no translation found for account_setup_options_notify_label (1247525794828820038) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_title (7827583313117521383) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_auth_message (42827150104879570) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_auth_message_fmt (8598560266430207606) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_certificate_message (961843413600482906) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_certificate_message_fmt (2609150986774736900) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_server_message (1828270369532779265) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_server_message_fmt (5956976504788732779) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_tls_required (307030406688611327) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_auth_required (1676242821459638150) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_security (6142264248671379943) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_ioerror (7391458717708933095) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_edit_details_action (5355993309841479360) -->
-    <skip />
-    <!-- no translation found for account_settings_title_fmt (1702058877284382340) -->
-    <skip />
-    <!-- no translation found for account_settings_default_label (3575963379680943640) -->
-    <skip />
-    <!-- no translation found for account_settings_default_summary (1531901438624688482) -->
-    <skip />
-    <!-- no translation found for account_settings_notify_label (1630001017303007974) -->
-    <skip />
-    <!-- no translation found for account_settings_notify_summary (6609224590300639887) -->
-    <skip />
-    <!-- no translation found for account_settings_mail_check_frequency_label (2067835530563849675) -->
-    <skip />
-    <!-- no translation found for account_settings_incoming_label (7858928031806297542) -->
-    <skip />
-    <!-- no translation found for account_settings_outgoing_label (4464829249980026745) -->
-    <skip />
-    <!-- no translation found for account_settings_add_account_label (63971622405360050) -->
-    <skip />
-    <!-- no translation found for account_settings_description_label (8894815221204511715) -->
-    <skip />
-    <!-- no translation found for account_settings_name_label (8186406122590008449) -->
-    <skip />
-    <!-- no translation found for account_settings_notifications (1042620094281375043) -->
-    <skip />
-    <!-- no translation found for account_settings_vibrate_enable (8045133290388856478) -->
-    <skip />
-    <!-- no translation found for account_settings_vibrate_summary (3690631050585589365) -->
-    <skip />
-    <!-- no translation found for account_settings_ringtone (7922187231467500404) -->
-    <skip />
-    <!-- no translation found for account_settings_servers (4925493817981624242) -->
-    <skip />
-    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
-    <skip />
-    <!-- no translation found for account_delete_dlg_instructions_fmt (8236846322040271280) -->
-    <skip />
-    <!-- no translation found for provider_note_yahoo (8762024183024261236) -->
-    <skip />
-    <!-- no translation found for provider_note_yahoo_uk (2055976404478603298) -->
-    <skip />
-    <!-- no translation found for provider_note_live (3584841823811425060) -->
-    <skip />
-    <!-- no translation found for provider_note_t_online (1973701903400232774) -->
-    <skip />
-</resources>

From 8ff311967016212bed4d413f6db8f16ddcfe2728 Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Tue, 7 Apr 2009 11:48:29 -0700
Subject: [PATCH 3/4] AI 144891: Import a bunch of revised translations.

Automated import of CL 144891
---
 res/values-cs/strings.xml |  8 ++---
 res/values-de/strings.xml | 10 +++---
 res/values-es/strings.xml |  2 +-
 res/values-fr/strings.xml |  2 +-
 res/values-it/strings.xml | 12 +++----
 res/values-ko/strings.xml |  2 +-
 res/values-nl/strings.xml | 66 +++++++++++++++++++--------------------
 res/values-pl/strings.xml |  4 +--
 res/values-ru/strings.xml |  2 +-
 9 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e4dca24f..6f40b181b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -144,7 +144,7 @@
     <string name="account_setup_options_mail_check_frequency_30min">"Každých 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour">"Každou hodinu"</string>
     <string name="account_setup_options_default_label">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
-    <string name="account_setup_options_notify_label">"Upozornit mě na příchod e-mailu"</string>
+    <string name="account_setup_options_notify_label">"Upozornit mě na příchozí e-mail"</string>
     <string name="account_setup_failed_dlg_title">"Nastavení nelze dokončit"</string>
     <string name="account_setup_failed_dlg_auth_message">"Uživatelské jméno nebo heslo není správné"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
@@ -160,8 +160,8 @@
     <string name="account_settings_title_fmt">"Obecná nastavení"</string>
     <string name="account_settings_default_label">"Výchozí účet"</string>
     <string name="account_settings_default_summary">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
-    <string name="account_settings_notify_label">"E-mailová upozornění"</string>
-    <string name="account_settings_notify_summary">"Zobrazit upozornění na příchod e-mailu na stavovém řádku"</string>
+    <string name="account_settings_notify_label">"Upozornění na e-maily"</string>
+    <string name="account_settings_notify_summary">"Zobrazit upozornění na příchozí e-mail na stavovém řádku"</string>
     <string name="account_settings_mail_check_frequency_label">"Četnost kontrol e-mailů"</string>
     <string name="account_settings_incoming_label">"Nastavení příchozí pošty"</string>
     <string name="account_settings_outgoing_label">"Nastavení odchozí pošty"</string>
@@ -170,7 +170,7 @@
     <string name="account_settings_name_label">"Vaše jméno"</string>
     <string name="account_settings_notifications">"Nastavení upozornění"</string>
     <string name="account_settings_vibrate_enable">"Vibrovat"</string>
-    <string name="account_settings_vibrate_summary">"Při příchodu e-mailu také vibrovat"</string>
+    <string name="account_settings_vibrate_summary">"Při obdržení e-mailu také vibrovat"</string>
     <string name="account_settings_ringtone">"Zvolit vyzváněcí tón"</string>
     <string name="account_settings_servers">"Nastavení serveru"</string>
     <string name="account_delete_dlg_title">"Odebrat účet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ce4229b3a..1531f4eb5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -42,7 +42,7 @@
     <string name="accounts_action">"Konten"</string>
     <string name="mark_as_read_action">"Als gelesen markieren"</string>
     <string name="mark_as_unread_action">"Als ungelesen markieren"</string>
-    <string name="add_cc_bcc_action">"Feld \"Cc\"/\"Bcc\" hinzufügen"</string>
+    <string name="add_cc_bcc_action">"\"Cc\"/\"Bcc\" hinzufügen"</string>
     <string name="add_attachment_action">"Anhang hinzufügen"</string>
     <string name="dump_settings_action">"Einstellungen für Speicherauszug"</string>
     <string name="accounts_context_menu_title">"Kontooptionen"</string>
@@ -160,12 +160,12 @@
     <string name="account_settings_title_fmt">"Allgemeine Einstellungen"</string>
     <string name="account_settings_default_label">"Standardkonto"</string>
     <string name="account_settings_default_summary">"E-Mails standardmäßig von diesem Konto senden"</string>
-    <string name="account_settings_notify_label">"E-Mail-Benachrichtigungen"</string>
+    <string name="account_settings_notify_label">"E-Mail-Benachrichtigung"</string>
     <string name="account_settings_notify_summary">"Bei E-Mail-Eingang Benachrichtigung in der Statusleiste"</string>
     <string name="account_settings_mail_check_frequency_label">"Abrufhäufigkeit"</string>
-    <string name="account_settings_incoming_label">"Einstellungen für eingehende Nachrichten"</string>
-    <string name="account_settings_outgoing_label">"Einstellungen für ausgehende Nachrichten"</string>
-    <string name="account_settings_add_account_label">"Weiteres Konto hinzufügen"</string>
+    <string name="account_settings_incoming_label">"Eingehende Nachrichten"</string>
+    <string name="account_settings_outgoing_label">"Ausgehende Nachrichten"</string>
+    <string name="account_settings_add_account_label">"Konto hinzufügen"</string>
     <string name="account_settings_description_label">"Kontoname"</string>
     <string name="account_settings_name_label">"Ihr Name"</string>
     <string name="account_settings_notifications">"Benachrichtigungseinstellungen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 30f1fd907..2a1e9abdd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Mensaje guardado como borrador"</string>
     <string name="add_contact_dlg_title">"Añadir contacto"</string>
     <string name="add_contact_dlg_message_fmt">"Añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
-    <string name="message_view_display_attachment_toast">"No se puede mostrar este archivo adjunto."</string>
+    <string name="message_view_display_attachment_toast">"No se puede mostrar el archivo adjunto."</string>
     <string name="account_setup_basics_title">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_instructions">"Introduce la dirección de correo electrónico de tu cuenta:"</string>
     <string name="account_setup_basics_email_hint">"Dirección de correo electrónico"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 734d1e65c..558b4c139 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -162,7 +162,7 @@
     <string name="account_settings_default_summary">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_settings_notify_label">"Notifications d\'e-mails"</string>
     <string name="account_settings_notify_summary">"Afficher une notification dans la barre d\'état lors de la réception d\'un e-mail"</string>
-    <string name="account_settings_mail_check_frequency_label">"Fréquence de vérification des e-mails"</string>
+    <string name="account_settings_mail_check_frequency_label">"Fréquence de vérification"</string>
     <string name="account_settings_incoming_label">"Paramètres de réception"</string>
     <string name="account_settings_outgoing_label">"Paramètres d\'envoi"</string>
     <string name="account_settings_add_account_label">"Ajouter un autre compte"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 76743debf..156445902 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Messaggio salvato come bozza."</string>
     <string name="add_contact_dlg_title">"Aggiungi contatto"</string>
     <string name="add_contact_dlg_message_fmt">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti"</string>
-    <string name="message_view_display_attachment_toast">"Impossibile visualizzare l\'allegato."</string>
+    <string name="message_view_display_attachment_toast">"Impossibile visualizzare questo allegato."</string>
     <string name="account_setup_basics_title">"Imposta email"</string>
     <string name="account_setup_basics_instructions">"Digita l\'indirizzo email del tuo account:"</string>
     <string name="account_setup_basics_email_hint">"Indirizzo email"</string>
@@ -117,7 +117,7 @@
     <string name="account_setup_incoming_imap_server_label">"Server IMAP"</string>
     <string name="account_setup_incoming_port_label">"Porta"</string>
     <string name="account_setup_incoming_security_label">"Tipo di protezione"</string>
-    <string name="account_setup_incoming_security_none_label">"Nessuno"</string>
+    <string name="account_setup_incoming_security_none_label">"Nessuna"</string>
     <string name="account_setup_incoming_security_ssl_optional_label">"SSL (se disponibile)"</string>
     <string name="account_setup_incoming_security_ssl_label">"SSL (sempre)"</string>
     <string name="account_setup_incoming_security_tls_optional_label">"TLS (se disponibile)"</string>
@@ -125,7 +125,7 @@
     <string name="account_setup_incoming_delete_policy_label">"Elimina email da server"</string>
     <string name="account_setup_incoming_delete_policy_never_label">"Mai"</string>
     <string name="account_setup_incoming_delete_policy_7days_label">"Dopo 7 giorni"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label">"Quando elimino dalla Posta in arrivo"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">"Quando elimino da Posta in arrivo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label">"Prefisso percorso IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">"Facoltativo"</string>
     <string name="account_setup_outgoing_title">"Impostazioni server posta in uscita"</string>
@@ -163,9 +163,9 @@
     <string name="account_settings_notify_label">"Notifiche email"</string>
     <string name="account_settings_notify_summary">"Notifica sulla barra di stato l\'arrivo di email"</string>
     <string name="account_settings_mail_check_frequency_label">"Frequenza di controllo email"</string>
-    <string name="account_settings_incoming_label">"Impostazioni posta in arrivo"</string>
-    <string name="account_settings_outgoing_label">"Impostazioni posta in uscita"</string>
-    <string name="account_settings_add_account_label">"Aggiungi un altro account"</string>
+    <string name="account_settings_incoming_label">"Impost. posta in arrivo"</string>
+    <string name="account_settings_outgoing_label">"Impost. posta in uscita"</string>
+    <string name="account_settings_add_account_label">"Aggiungi altro account"</string>
     <string name="account_settings_description_label">"Nome account"</string>
     <string name="account_settings_name_label">"Nome"</string>
     <string name="account_settings_notifications">"Impostazioni notifica"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a5c762c73..3ea4feba7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"메일을 임시로 저장했습니다."</string>
     <string name="add_contact_dlg_title">"주소 추가"</string>
     <string name="add_contact_dlg_message_fmt">"주소록에 \'<xliff:g id="EMAIL">%s</xliff:g>\' 추가"</string>
-    <string name="message_view_display_attachment_toast">"이 첨부파일은 표시할 수 없습니다."</string>
+    <string name="message_view_display_attachment_toast">"첨부파일을 표시할 수 없습니다."</string>
     <string name="account_setup_basics_title">"이메일 설정"</string>
     <string name="account_setup_basics_instructions">"계정 이메일 주소 입력:"</string>
     <string name="account_setup_basics_email_hint">"이메일 주소"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0a04cd47c..ef0808724 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,17 +16,17 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"Bijlages van e-mail lezen"</string>
-    <string name="read_attachment_desc">"Staat deze toepassing toe om je E-mail-bijlages te lezen."</string>
+    <string name="read_attachment_desc">"Staat deze toepassing toe om uw E-mail-bijlages te lezen."</string>
     <string name="app_name">"E-mail"</string>
-    <string name="accounts_title">"Je accounts"</string>
+    <string name="accounts_title">"Uw accounts"</string>
     <string name="compose_title">"Opstellen"</string>
     <string name="debug_title">"Foutopsporing"</string>
     <string name="next_action">"Volgende"</string>
     <string name="okay_action">"OK"</string>
     <string name="cancel_action">"Annuleren"</string>
     <string name="send_action">"Verzenden"</string>
-    <string name="reply_action">"Beantwoorden"</string>
-    <string name="reply_all_action">"Allen beantwoorden"</string>
+    <string name="reply_action">"Antwoord"</string>
+    <string name="reply_all_action">"Allen antwoord"</string>
     <string name="delete_action">"Verwijderen"</string>
     <string name="forward_action">"Doorsturen"</string>
     <string name="done_action">"Gereed"</string>
@@ -60,7 +60,7 @@
     <item quantity="other">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
     <string name="special_mailbox_name_inbox">"Postvak IN"</string>
-    <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"Je kunt elke account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
+    <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"U kunt elk account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
     <string name="debug_version_fmt">"Versie: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="debug_enable_debug_logging_label">"Extra logboek voor probleemoplossing bij gevoelige informatie maken?"</string>
     <string name="debug_enable_sensitive_logging_label">"Probleemoplossing bij gevoelige informatie vastleggen? (Mogelijk worden er wachtwoorden weergegeven in de logboeken.)"</string>
@@ -73,7 +73,7 @@
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Van: <xliff:g id="SENDER">%s</xliff:g>"\n"Aan: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
-    <string name="message_compose_error_no_recipients">"Je moet minstens één ontvanger toevoegen."</string>
+    <string name="message_compose_error_no_recipients">"U moet minstens één ontvanger toevoegen."</string>
     <string name="message_compose_attachments_skipped_toast">"Sommige bijlages kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
     <string name="message_compose_attachment_size">"Bestand is te groot om bij te voegen."</string>
     <string name="message_view_to_label">"Aan:"</string>
@@ -88,34 +88,34 @@
     <string name="message_deleted_toast">"Bericht verwijderd."</string>
     <string name="message_discarded_toast">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast">"Bericht opgeslagen als concept."</string>
-    <string name="add_contact_dlg_title">"Contactpersoon toevoegen"</string>
-    <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contactpersonen"</string>
-    <string name="message_view_display_attachment_toast">"Deze bijlage kan niet worden verwijderd."</string>
+    <string name="add_contact_dlg_title">"Contact toevoegen"</string>
+    <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contacten"</string>
+    <string name="message_view_display_attachment_toast">"Deze bijlage kan niet worden weergegeven."</string>
     <string name="account_setup_basics_title">"E-mail instellen"</string>
-    <string name="account_setup_basics_instructions">"Typ het e-mailadres van je account:"</string>
+    <string name="account_setup_basics_instructions">"Typ het e-mailadres van uw account:"</string>
     <string name="account_setup_basics_email_hint">"E-mailadres"</string>
     <string name="account_setup_basics_password_hint">"Wachtwoord"</string>
-    <string name="account_setup_basics_default_label">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_setup_basics_default_label">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_setup_basics_manual_setup_action">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast">"Typ een geldig e-mailadres en wachtwoord"</string>
     <string name="account_setup_check_settings_retr_info_msg">"Accountinformatie ophalen..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg">"Serverinstellingen voor binnenkomende e-mail controleren..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg">"Serverinstellingen voor uitgaande e-mail controleren..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg">"Serverinstellingen inkomende e-mail controleren..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">"Serverinstellingen uitgaande e-mail controleren..."</string>
     <string name="account_setup_check_settings_canceling_msg">"Annuleren..."</string>
     <string name="account_setup_names_title">"E-mail instellen"</string>
-    <string name="account_setup_names_instructions">"Je account is ingesteld en er is e-mail onderweg."</string>
-    <string name="account_setup_names_account_name_label">"Geef deze account een naam (optioneel)"</string>
-    <string name="account_setup_names_user_name_label">"Je naam (wordt weergegeven in uitgaande berichten)"</string>
+    <string name="account_setup_names_instructions">"Uw account is ingesteld en er is e-mail onderweg."</string>
+    <string name="account_setup_names_account_name_label">"Geef dit account een naam (optioneel)"</string>
+    <string name="account_setup_names_user_name_label">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
     <string name="account_setup_account_type_title">"Nieuwe e-mailaccount toevoegen"</string>
     <string name="account_setup_account_type_instructions">"Welk type account is dit?"</string>
     <string name="account_setup_account_type_pop_action">"POP3-account"</string>
     <string name="account_setup_account_type_imap_action">"IMAP-account"</string>
-    <string name="account_setup_incoming_title">"Serverinstellingen voor binnenkomende e-mail"</string>
+    <string name="account_setup_incoming_title">"Serverinstellingen inkomende e-mail"</string>
     <string name="account_setup_incoming_username_label">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label">"Wachtwoord"</string>
     <string name="account_setup_incoming_pop_server_label">"POP3-server"</string>
     <string name="account_setup_incoming_imap_server_label">"IMAP-server"</string>
-    <string name="account_setup_incoming_port_label">"Port"</string>
+    <string name="account_setup_incoming_port_label">"Poort"</string>
     <string name="account_setup_incoming_security_label">"Beveiligingstype"</string>
     <string name="account_setup_incoming_security_none_label">"Geen"</string>
     <string name="account_setup_incoming_security_ssl_optional_label">"SSL (indien beschikbaar)"</string>
@@ -128,7 +128,7 @@
     <string name="account_setup_incoming_delete_policy_delete_label">"Als ik verwijder uit mijn Postvak IN"</string>
     <string name="account_setup_incoming_imap_path_prefix_label">"Voorvoegsel IMAP-pad"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">"Optioneel"</string>
-    <string name="account_setup_outgoing_title">"Serverinstellingen voor uitgaande e-mail"</string>
+    <string name="account_setup_outgoing_title">"Serverinstellingen uitgaande e-mail"</string>
     <string name="account_setup_outgoing_smtp_server_label">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label">"Poort"</string>
     <string name="account_setup_outgoing_security_label">"Beveiligingstype"</string>
@@ -136,14 +136,14 @@
     <string name="account_setup_outgoing_username_label">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label">"Wachtwoord"</string>
     <string name="account_setup_options_title">"Accountopties"</string>
-    <string name="account_setup_options_mail_check_frequency_label">"Frequentie voor het controleren op nieuwe berichten"</string>
+    <string name="account_setup_options_mail_check_frequency_label">"Frequentie voor controle op nieuwe berichten"</string>
     <string name="account_setup_options_mail_check_frequency_never">"Nooit"</string>
     <string name="account_setup_options_mail_check_frequency_5min">"Elke 5 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_10min">"Elke 10 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_15min">"Elke 15 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_30min">"Elke 30 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_1hour">"Elk uur"</string>
-    <string name="account_setup_options_default_label">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_setup_options_default_label">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_setup_options_notify_label">"Stuur me een melding wanneer er e-mail binnenkomt."</string>
     <string name="account_setup_failed_dlg_title">"Instellen is niet voltooid"</string>
     <string name="account_setup_failed_dlg_auth_message">"Gebruikersnaam of wachtwoord onjuist"</string>
@@ -159,24 +159,24 @@
     <string name="account_setup_failed_dlg_edit_details_action">"Details bewerken"</string>
     <string name="account_settings_title_fmt">"Algemene instellingen"</string>
     <string name="account_settings_default_label">"Standaardaccount"</string>
-    <string name="account_settings_default_summary">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_settings_default_summary">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_settings_notify_label">"Meldingen via e-mail"</string>
-    <string name="account_settings_notify_summary">"Melding in statusbalk wanneer er e-mail binnenkomt"</string>
-    <string name="account_settings_mail_check_frequency_label">"Frequentie voor het controleren op nieuwe e-mail"</string>
-    <string name="account_settings_incoming_label">"Instellingen voor binnenkomende e-mail"</string>
-    <string name="account_settings_outgoing_label">"Instellingen voor uitgaande e-mail"</string>
-    <string name="account_settings_add_account_label">"Nieuwe account toevoegen"</string>
+    <string name="account_settings_notify_summary">"Melding in statusbalk als e-mail binnenkomt"</string>
+    <string name="account_settings_mail_check_frequency_label">"Frequentie voor controle op nieuwe e-mail"</string>
+    <string name="account_settings_incoming_label">"Instellingen inkomende e-mail"</string>
+    <string name="account_settings_outgoing_label">"Instellingen uitgaande e-mail"</string>
+    <string name="account_settings_add_account_label">"Nieuw account toevoegen"</string>
     <string name="account_settings_description_label">"Accountnaam"</string>
-    <string name="account_settings_name_label">"Je naam"</string>
+    <string name="account_settings_name_label">"Uw naam"</string>
     <string name="account_settings_notifications">"Instellingen voor meldingen"</string>
     <string name="account_settings_vibrate_enable">"Trillen"</string>
     <string name="account_settings_vibrate_summary">"Ook trillen bij ontvangst van e-mail"</string>
     <string name="account_settings_ringtone">"Beltoon selecteren"</string>
     <string name="account_settings_servers">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title">"Account verwijderen"</string>
-    <string name="account_delete_dlg_instructions_fmt">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
-    <string name="provider_note_yahoo">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, ga je naar yahoo.com voor meer informatie."</string>
-    <string name="provider_note_yahoo_uk">"Ga voordat je deze e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor deze account."</string>
-    <string name="provider_note_live">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als je je niet kunt aanmelden met het juiste e-mailadres en wachtwoord, heb je mogelijk niet betaald voor je Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
-    <string name="provider_note_t_online">"Voordat je deze e-mailaccount instelt, ga je naar de website van T-Online en maak je een wachtwoord voor toegang tot e-mail via POP3."</string>
+    <string name="account_delete_dlg_instructions_fmt">"Het account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
+    <string name="provider_note_yahoo">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, gaat u naar yahoo.com voor meer informatie."</string>
+    <string name="provider_note_yahoo_uk">"Ga voordat u dit e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor dit account."</string>
+    <string name="provider_note_live">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als u zich niet kunt aanmelden met het juiste e-mailadres en wachtwoord, heeft u mogelijk niet betaald voor uw Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
+    <string name="provider_note_t_online">"Voordat u dit e-mailaccount instelt, gaat u naar de website van T-Online en maakt u een wachtwoord voor toegang tot e-mail via POP3."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 24c30d3ab..f68ef751c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,7 +17,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"odczyt załączników w wiadomościach e-mail"</string>
     <string name="read_attachment_desc">"Umożliwia tej aplikacji odczyt załączników poczty e-mail."</string>
-    <string name="app_name">"Poczta e-mail"</string>
+    <string name="app_name">"Poczta"</string>
     <string name="accounts_title">"Twoje konta"</string>
     <string name="compose_title">"Utwórz"</string>
     <string name="debug_title">"Debuguj"</string>
@@ -41,7 +41,7 @@
     <string name="remove_account_action">"Usuń konto"</string>
     <string name="accounts_action">"Konta"</string>
     <string name="mark_as_read_action">"Oznacz jako przeczytane"</string>
-    <string name="mark_as_unread_action">"Oznacz jako nieprzeczytane"</string>
+    <string name="mark_as_unread_action">"Oznacz jako nieprzeczyt."</string>
     <string name="add_cc_bcc_action">"Dodaj DW/UDW"</string>
     <string name="add_attachment_action">"Dodaj załącznik"</string>
     <string name="dump_settings_action">"Zrzut ustawień"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 295a7d0a9..32de2e413 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Письмо сохранено как черновик."</string>
     <string name="add_contact_dlg_title">"Добавить контакт"</string>
     <string name="add_contact_dlg_message_fmt">"Добавить адрес <xliff:g id="EMAIL">%s</xliff:g> в контакты"</string>
-    <string name="message_view_display_attachment_toast">"Не удается показать это приложение."</string>
+    <string name="message_view_display_attachment_toast">"Это вложение нельзя просмотреть."</string>
     <string name="account_setup_basics_title">"Настройка электронной почты"</string>
     <string name="account_setup_basics_instructions">"Укажите почтовый адрес своего аккаунта:"</string>
     <string name="account_setup_basics_email_hint">"Адрес электронной почты"</string>

From ff36efb76ef3618707af3f0c2e15435327d02ef6 Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Tue, 7 Apr 2009 18:15:15 -0700
Subject: [PATCH 4/4] AI 144977: Import revised translations.   DO NOT MERGE

Automated import of CL 144977
---
 res/values-es/strings.xml |  4 ++--
 res/values-fr/strings.xml |  2 +-
 res/values-nl/strings.xml | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2a1e9abdd..eb359e152 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -136,7 +136,7 @@
     <string name="account_setup_outgoing_username_label">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label">"Contraseña"</string>
     <string name="account_setup_options_title">"Opciones de cuenta"</string>
-    <string name="account_setup_options_mail_check_frequency_label">"Frecuencia de comprobación del correo electrónico"</string>
+    <string name="account_setup_options_mail_check_frequency_label">"Frecuencia de comprobación"</string>
     <string name="account_setup_options_mail_check_frequency_never">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_5min">"Cada 5 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_10min">"Cada 10 minutos"</string>
@@ -160,7 +160,7 @@
     <string name="account_settings_title_fmt">"Configuración general"</string>
     <string name="account_settings_default_label">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
-    <string name="account_settings_notify_label">"Notificaciones de correo electrónico"</string>
+    <string name="account_settings_notify_label">"Notificaciones de correo"</string>
     <string name="account_settings_notify_summary">"Notificar en la barra de estado cuando llegue un mensaje"</string>
     <string name="account_settings_mail_check_frequency_label">"Frecuencia de comprobación del correo"</string>
     <string name="account_settings_incoming_label">"Configuración entrante"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 558b4c139..d91dd2725 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -42,7 +42,7 @@
     <string name="accounts_action">"Comptes"</string>
     <string name="mark_as_read_action">"Marquer comme lu"</string>
     <string name="mark_as_unread_action">"Marquer comme non lu"</string>
-    <string name="add_cc_bcc_action">"Ajouter les champs Cc/Cci"</string>
+    <string name="add_cc_bcc_action">"Ajouter Cc/Cci"</string>
     <string name="add_attachment_action">"Ajouter une pièce jointe"</string>
     <string name="dump_settings_action">"Paramètres d\'image mémoire"</string>
     <string name="accounts_context_menu_title">"Options de compte"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ef0808724..0b56ee0ba 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="read_attachment_label">"Bijlages van e-mail lezen"</string>
-    <string name="read_attachment_desc">"Staat deze toepassing toe om uw E-mail-bijlages te lezen."</string>
+    <string name="read_attachment_label">"Bijlagen van e-mail lezen"</string>
+    <string name="read_attachment_desc">"Staat deze toepassing toe om uw e-mailbijlagen te lezen."</string>
     <string name="app_name">"E-mail"</string>
     <string name="accounts_title">"Uw accounts"</string>
     <string name="compose_title">"Opstellen"</string>
@@ -45,7 +45,7 @@
     <string name="add_cc_bcc_action">"Cc/Bcc toevoegen"</string>
     <string name="add_attachment_action">"Bijlage toevoegen"</string>
     <string name="dump_settings_action">"Dumpinstellingen"</string>
-    <string name="accounts_context_menu_title">"Acountopties"</string>
+    <string name="accounts_context_menu_title">"Accountopties"</string>
     <string name="status_loading_more">"Berichten laden..."</string>
     <string name="status_network_error">"Verbindingsfout"</string>
     <string name="status_loading_more_failed">"Probeer opnieuw meer berichten te laden"</string>
@@ -74,7 +74,7 @@
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
     <string name="message_compose_error_no_recipients">"U moet minstens één ontvanger toevoegen."</string>
-    <string name="message_compose_attachments_skipped_toast">"Sommige bijlages kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
+    <string name="message_compose_attachments_skipped_toast">"Sommige bijlagen kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
     <string name="message_compose_attachment_size">"Bestand is te groot om bij te voegen."</string>
     <string name="message_view_to_label">"Aan:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
@@ -95,7 +95,7 @@
     <string name="account_setup_basics_instructions">"Typ het e-mailadres van uw account:"</string>
     <string name="account_setup_basics_email_hint">"E-mailadres"</string>
     <string name="account_setup_basics_password_hint">"Wachtwoord"</string>
-    <string name="account_setup_basics_default_label">"E-mail standaard vanaf dit account versturen"</string>
+    <string name="account_setup_basics_default_label">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_basics_manual_setup_action">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast">"Typ een geldig e-mailadres en wachtwoord"</string>
     <string name="account_setup_check_settings_retr_info_msg">"Accountinformatie ophalen..."</string>
@@ -143,7 +143,7 @@
     <string name="account_setup_options_mail_check_frequency_15min">"Elke 15 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_30min">"Elke 30 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_1hour">"Elk uur"</string>
-    <string name="account_setup_options_default_label">"E-mail standaard vanaf dit account versturen"</string>
+    <string name="account_setup_options_default_label">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_options_notify_label">"Stuur me een melding wanneer er e-mail binnenkomt."</string>
     <string name="account_setup_failed_dlg_title">"Instellen is niet voltooid"</string>
     <string name="account_setup_failed_dlg_auth_message">"Gebruikersnaam of wachtwoord onjuist"</string>
@@ -159,7 +159,7 @@
     <string name="account_setup_failed_dlg_edit_details_action">"Details bewerken"</string>
     <string name="account_settings_title_fmt">"Algemene instellingen"</string>
     <string name="account_settings_default_label">"Standaardaccount"</string>
-    <string name="account_settings_default_summary">"E-mail standaard vanaf dit account versturen"</string>
+    <string name="account_settings_default_summary">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_settings_notify_label">"Meldingen via e-mail"</string>
     <string name="account_settings_notify_summary">"Melding in statusbalk als e-mail binnenkomt"</string>
     <string name="account_settings_mail_check_frequency_label">"Frequentie voor controle op nieuwe e-mail"</string>