From 6d69fb7c577f49558e8431564e3700913a9c1ac5 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Wed, 2 Dec 2009 17:43:43 -0800
Subject: [PATCH] Fix 2266119: Simplify account creation strings and remove
 translation requirement

This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
---
 res/values-cs/strings.xml     |  3 ---
 res/values-da/strings.xml     |  3 ---
 res/values-de/strings.xml     |  3 ---
 res/values-el/strings.xml     |  3 ---
 res/values-es-rUS/strings.xml |  3 ---
 res/values-es/strings.xml     |  3 ---
 res/values-fr/strings.xml     |  3 ---
 res/values-it/strings.xml     |  3 ---
 res/values-ja/strings.xml     |  3 ---
 res/values-ko/strings.xml     |  3 ---
 res/values-nb/strings.xml     |  3 ---
 res/values-nl/strings.xml     |  3 ---
 res/values-pl/strings.xml     |  3 ---
 res/values-pt-rPT/strings.xml |  3 ---
 res/values-pt/strings.xml     |  3 ---
 res/values-ru/strings.xml     |  3 ---
 res/values-sv/strings.xml     |  3 ---
 res/values-tr/strings.xml     |  3 ---
 res/values-zh-rCN/strings.xml |  3 ---
 res/values-zh-rTW/strings.xml |  3 ---
 res/values/strings.xml        | 17 +++++++++++------
 21 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2f8133901..711d0ca53 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované v odchozích zprávách)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Přidat nový e-mailový účet"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O jaký typ účtu se jedná?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Účet POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Účet IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Účet Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Nastavení serveru příchozí pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uživatelské jméno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8b1f2ece4..5a40b3356 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vises på udgående beskeder)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Tilføj ny e-mail-konto"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-konto"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-konto"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange-konto"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6f1c4138b..98a43a349 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird für ausgehende Nachrichten angezeigt)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Neues E-Mail-Konto hinzufügen"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-Konto"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-Konto"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange-Konto"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Einstellungen für Eingangsserver"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 117b803de..970014295 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Το όνομά σας (προβάλλεται στα εξερχόμενα μηνύματα)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Προσθήκη νέου λογαριασμού ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Τι τύπος λογαριασμού είναι αυτός;"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Λογαριασμός POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Λογαριασμός IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Λογαριασμός Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Όνομα χρήστη"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Κωδικός πρόσβασης"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fb6e1d285..49e732dbe 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Agregar nueva cuenta de correo electrónico"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Cuenta POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Cuenta IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Cuenta de Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configuración entrante de servidor"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a0a28b717..fcf3aff6d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Añadir una cuenta de correo electrónico nueva"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es ésta?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Cuenta POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Cuenta IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Cuenta de Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configuración del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 90c1ef426..9a3d00c75 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Ajouter un compte de messagerie"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Compte POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Compte IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Compte Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Paramètres de serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 48bfb7952..55dcc88f3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Il tuo nome (visualizzato nei messaggi in uscita)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Aggiungi un nuovo account email"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Di quale tipo di account si tratta?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Account POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Account IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Account Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Impostazioni server della Posta in arrivo"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome utente"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 306cdf3ad..75e42929e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"あなたの名前（送信メールに表示されます）"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"新しいメールアカウントを追加"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"このアカウントのタイプ"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3アカウント"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAPアカウント"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchangeアカウント"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"受信サーバーの設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"パスワード"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 39040fba1..347a55e30 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"새 이메일 계정 추가"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3 계정"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP 계정"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange 계정"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8e379dbbb..e8565309b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Navnet ditt (vises i utgående meldinger)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Legg til ny e-postkonto"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hva slags konto er dette?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-konto"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-konto"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange/ActiveSync"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Tjenerinnstillinger for inngående e-post"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 60fe97839..a247aa5c6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Nieuwe e-mailaccount toevoegen"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Welk type account is dit?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-account"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-account"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange-account"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Serverinstellingen inkomende e-mail"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wachtwoord"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0c12bec50..4f9f9e286 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoje nazwisko (wyświetlane w wiadomościach wychodzących)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Dodaj nowe konto e-mail"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jakiego typu jest to konto?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Konto POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Konto IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Konto Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ustawienia serwera poczty przychodzącej"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nazwa użytkownika"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Hasło"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 719fd518f..b017340d7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Conta POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Conta IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Conta do Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Definições do servidor de recepção"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 51274428a..7233e37ae 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Seu nome (exibido nas mensagens enviadas)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é esta?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Conta POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Conta IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Conta do Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configurações de entrada do servidor"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de usuário"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Senha"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ed3a6333f..518937555 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше имя (показывается в исходящих сообщениях)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Добавить новый аккаунт электронной почты"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Что это за аккаунт?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"Аккаунт POP3"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"Аккаунт IMAP"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Аккаунт Exchange"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Настройки сервера входящих сообщений"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Имя пользователя"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5b3c268f8..cdb5a33c4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ditt namn (visas för utgående meddelanden)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Lägg till nytt konto"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Vilken typ av konto är det här?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-konto"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-konto"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange-konto"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Inkommande serverinställningar"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d768a452e..5ad4337d0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Adınız (giden iletilerde görüntülenir)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Yeni e-posta hesabı ekle"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Bu hesabın türü nedir?"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3 hesabı"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP hesabı"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange hesabı"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Gelen sunucu ayarları"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kullanıcı adı"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65d7180cb..6f29ae9f3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名（显示在外发邮件上）"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"添加新电子邮件帐户"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户？"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3 帐户"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP 帐户"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange 帐户"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"接收服务器设置"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密码"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 65817fe26..a28a5afef 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -145,9 +145,6 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名 (顯示於外寄郵件)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"新增電子郵件帳戶"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"帳戶類型為何？"</string>
-    <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3 帳戶"</string>
-    <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP 帳戶"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange 帳戶"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"收信伺服器設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 991bd95b2..ff6d2ba74 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -346,12 +346,17 @@
     <string name="account_setup_account_type_title">Add new email account</string>
     <!-- "Add new email account" screen, text that appears on screen -->
     <string name="account_setup_account_type_instructions">What type of account is this?</string>
-    <!-- "Add new email account" screen, button name in response to what type of account this is -->
-    <string name="account_setup_account_type_pop_action">POP3 account</string>
-    <!-- "Add new email account" screen, button name in response to what type of account this is -->
-    <string name="account_setup_account_type_imap_action">IMAP account</string>
-    <!-- "Add new email account" screen, button name in response to what type of account this is -->
-    <string name="account_setup_account_type_exchange_action">Exchange account</string>
+
+    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
+         type of account this is -->
+    <string name="account_setup_account_type_pop_action">POP3</string>
+    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
+         type of account this is -->
+    <string name="account_setup_account_type_imap_action">IMAP</string>
+    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
+         type of account this is -->
+    <string name="account_setup_account_type_exchange_action">Exchange</string>
+
     <!-- "Incoming server settings" screen, label for text field -->
     <string name="account_setup_incoming_title">Incoming server settings</string>
     <!-- "Incoming server settings" screen, label for text field -->