From 9a9e42e69f70a8e2a42769e2a5c72f5fda25e1e5 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Fri, 28 Apr 2017 14:27:47 -0700
Subject: [PATCH] Automatic translation import

Change-Id: Iced85a67cb7b08a437b0081421ce25aed22f56bd
---
 res/values-ast-rES/strings.xml   | 227 ++-----------------------------
 res/values-ca/cm_strings.xml     |   2 +-
 res/values-en-rAU/cm_strings.xml |   8 ++
 res/values-en-rGB/cm_strings.xml |   8 ++
 res/values-es-rUS/cm_strings.xml |   8 +-
 res/values-sq-rAL/cm_strings.xml |   8 ++
 6 files changed, 41 insertions(+), 220 deletions(-)

diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 749db1fa2..0db0f0e20 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -18,42 +18,25 @@
   <!-- Names of packages and authorities that are common to all apps
     and read from resources -->
   <!-- Permissions label for reading attachments -->
-  <string name="permission_read_attachment_label">Lleer ficheros axuntos de correos-e</string>
   <!-- Permissions description for reading attachments -->
-  <string name="permission_read_attachment_desc">Permite que l\'aplicación consulte los ficheros axuntos de los correos electrónicos.</string>
   <!-- Permissions label for accessing the main provider -->
-  <string name="permission_access_provider_label">Acceder a los datos del fornidor de corréu electrónicu</string>
   <!-- Permissions description for accessing the main provider -->
-  <string name="permission_access_provider_desc">Permite que l\'aplicación acceda a la base de datos del to corréu electrónicu, incluyíos los mensaxes recibíos, los mensaxes unviaos, los nomes d\'usuariu y les contraseñes.</string>
   <!-- Name of application on Home screen -->
-  <string name="app_name">Corréu</string>
   <!-- Actions will be used as buttons and in menu items -->
   <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
-  <string name="create_action">Crear nueva</string>
   <!-- Message informing user when a list that would contain quick responses
             is empty [CHAR_LIMIT=80] -->
-  <string name="quick_responses_empty_view">Nun hai rempuestes rápides.</string>
   <!-- Menu item -->
-  <string name="account_settings_action">Axustes de la cuenta</string>
   <!-- The next set of strings are used in local display and may be localized. -->
   <!-- In the UI, the inbox will be displayed with this name -->
-  <string name="mailbox_name_display_inbox">Recibíos</string>
   <!-- In the UI, the outbox will be displayed with this name -->
-  <string name="mailbox_name_display_outbox">Por Unviar</string>
   <!-- In the UI, the drafts will be displayed with this name -->
-  <string name="mailbox_name_display_drafts">Borradores</string>
   <!-- In the UI, the trash will be displayed with this name -->
-  <string name="mailbox_name_display_trash">Papelera</string>
   <!-- In the UI, the sent will be displayed with this name -->
-  <string name="mailbox_name_display_sent">Unviaos</string>
   <!-- In the UI, the junk will be displayed with this name -->
-  <string name="mailbox_name_display_junk">Corréu puxarra</string>
   <!-- In the UI, the starred will be displayed with this name -->
-  <string name="mailbox_name_display_starred">Destacaos</string>
   <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
-  <string name="mailbox_name_display_unread">Ensin lleer</string>
   <!-- Title of debug screen -->
-  <string name="debug_title">Depurar</string>
   <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
   <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
   <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
@@ -63,460 +46,274 @@
   <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
   <!-- Label shown in the account selector to select "Combined view", which contains
          Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
-  <string name="mailbox_list_account_selector_combined_view">Vista combinada</string>
   <!-- Header for forwarded original messages -->
-  <string name="message_compose_fwd_header_fmt">\n\n\"-------- Mensaxe Orixinal --------\nAsuntu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPa: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n</string>
   <!-- Title for dialog containing list of quick responses that user may insert
             into message body. [CHAR_LIMIT=30] -->
-  <string name="message_compose_insert_quick_response_list_title">Usar rempuesta rápida</string>
   <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
-  <string name="message_compose_insert_quick_response_menu_title">Usar rempuesta rápida</string>
   <!-- Toast upon using "send" when one or more attachments will need to be background loaded
       [CHAR LIMIT=none]-->
-  <string name="message_view_attachment_background_load">Ún o dellos de los ficheros axuntos del mensaxe reunviáu van descargase enantes d\'unviase.</string>
   <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
          data was received.) [CHAR LIMIT=none] -->
-  <string name="message_decode_error">Hebo un fallu al decodificar el mensaxe.</string>
   <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
-  <string name="forward_download_failed_ticker">Fallu al unviar ún o varios ficheros axuntos</string>
   <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
-  <string name="forward_download_failed_title">Ficheru axuntu non reunviáu</string>
   <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
-  <string name="login_failed_ticker">Fallu al aniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g></string>
   <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
-  <string name="login_failed_title">Fallu al aniciar sesión</string>
   <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
-  <string name="account_setup_basics_title">Axustes de la cuenta</string>
   <!-- Title of screen when trying to get oauth authentication -->
-  <string name="oauth_authentication_title">Solicitando autorización</string>
   <!-- Title of screen to choose with authentication to use -->
-  <string name="sign_in_title">Aniciar sesión</string>
   <!-- Warning if there is a problem authenticating with oauth -->
-  <string name="oauth_error_description">Nun pudo autenticase</string>
+  <string name="oauth_error_description">Nun pue autenticase</string>
   <!-- Warning label displayed when the email address or password are incorrect -->
-  <string name="password_warning_label">Corréu-e o contraseña incorreutos</string>
   <!-- Label displayed to confirm what email address we are trying to validate -->
-  <string name="email_confirmation_label">Direición de corréu-e:</string>
   <!-- Headline of screen when setting up new email account (large text over divider)
         [CHAR LIMIT=none] -->
-  <string name="account_setup_basics_headline">Cuenta de corréu-e</string>
   <!-- On "Set up email" screen, enthusiastic welcome message. -->
-  <string name="accounts_welcome">Pues configurar la to cuenta en pocos pasos.</string>
   <!-- On "Set up email" screen, hint for account email address text field -->
-  <string name="account_setup_basics_email_label">Direición de corréu-e</string>
   <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
-  <string name="or_label">O</string>
   <!-- Label for signing in with Google using OAuth -->
-  <string name="sign_in_with_google">Aniciar sesión con Google</string>
   <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
-  <string name="account_setup_basics_password_label">CONTRASEÑA</string>
   <!-- hint for account email password text field -->
-  <string name="password_hint">Contraseña</string>
   <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
-  <string name="signed_in_with_service_label">Coneutáu con %s</string>
   <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
-  <string name="authentication_label">AUTENTICACIÓN</string>
   <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
-  <string name="add_authentication_label">Amestar autenticación</string>
   <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
-  <string name="clear_authentication_label">Llimpiar autenticación</string>
   <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
-  <string name="account_setup_basics_manual_setup_action">Axustes manuales</string>
   <!-- Toast when we can't build a URI from the given email & password -->
   <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
         exactly what's wrong. -->
-  <string name="account_setup_username_password_toast">Introduz una direición de corréu-e y una contraseña válides.</string>
   <!-- Title of dialog shown when a duplicate account is created -->
-  <string name="account_duplicate_dlg_title">Cuenta duplicada</string>
   <!-- Message of dialog shown when a duplicate account is created.  The display name of
          the duplicate account is displayed. -->
-  <string name="account_duplicate_dlg_message_fmt">Yá tas usando esti nome d\'usuariu pa la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\".</string>
   <!-- On check-settings screen, this is the initially-displayed message. -->
-  <string name="account_setup_check_settings_retr_info_msg">Recuperando la información de la cuenta...</string>
   <!-- Appears on screen while system is checking incoming server settings -->
-  <string name="account_setup_check_settings_check_incoming_msg">Validando los axustes del sirvidor…</string>
   <!-- Appears on screen while system is checking outgoing server settings -->
-  <string name="account_setup_check_settings_check_outgoing_msg">Validando los axustes de SMTP…</string>
   <!-- Appears on screen while system is creating the account -->
-  <string name="account_setup_creating_account_msg">Creando cuenta…</string>
   <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
-  <string name="account_setup_ab_headline">Confirmar triba de cuenta</string>
   <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
-  <string name="account_setup_ab_instructions_format">Indicasti <xliff:g id="email">%1$s</xliff:g> uses <xliff:g id="userProtocol">%2$s</xliff:g>, pero la cuenta pue usar <xliff:g id="providerProtocol">%3$s</xliff:g></string>
   <!-- Text that appears on "Set up email" screen after successfully setting up an account
         [CHAR LIMIT=none] -->
-  <string name="account_setup_names_headline">La to cuenta yá ta configurada y vas ver el to corréu de secute.</string>
   <!-- On "Set up email" screen, label of text field -->
-  <string name="account_setup_names_account_name_label">Da-y un nome a esta cuenta (opcional)</string>
   <!-- On "Set up email" screen, label of text field -->
-  <string name="account_setup_names_user_name_label">El to nome (como va vese nos mensaxes unviaos)</string>
   <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
-  <string name="account_setup_account_type_headline">Tipu de cuenta</string>
   <!-- "Add new email account" screen, text that appears on screen -->
-  <string name="account_setup_account_type_instructions">¿Qué tipu de cuenta tienes?</string>
   <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
-  <string name="account_setup_incoming_headline">Axustes del sirvidor d\'entrada</string>
   <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_incoming_username_label">NOME USUARIU</string>
   <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_incoming_password_label">CONTRASEÑA</string>
   <!-- "Incoming server settings" screen, label for text field -->
-  <string name="account_setup_password_subheading">Contraseña</string>
   <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_incoming_server_label">SIRVIDOR</string>
   <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_incoming_port_label">PUERTU</string>
   <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
-  <string name="account_setup_incoming_security_label">TRIBA DE SEGURIDÁ</string>
+  <string name="account_setup_incoming_security_label">TRIBA DE SEGURANZA</string>
   <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
         the desire for an unencrypted session -->
-  <string name="account_setup_incoming_security_none_label">Nenguna</string>
   <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
         the desire for an encrypted session on the selected port, accepting all SSL certificates -->
-  <string name="account_setup_incoming_security_ssl_trust_certificates_label">SSL/TLS (aceutar tolos certif.)</string>
   <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
         the desire for an encrypted session on the selected port, including SSL certificate
         checks -->
-  <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
   <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
         the desire for an encrypted session overlaid on a plain text session using the selected
         port, accepting all SSL certificates -->
-  <string name="account_setup_incoming_security_tls_trust_certificates_label">STARTTLS (aceutar tolos certif.)</string>
   <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
         the desire for an encrypted session overlaid on a plain text session on the selected
         port, including SSL certificate checks -->
-  <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
   <!-- "Incoming server settings" screen, label for pop-up menu -->
-  <string name="account_setup_incoming_delete_policy_label">Desaniciar corréu-e del sirvidor</string>
   <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
-  <string name="account_setup_incoming_delete_policy_never_label">Enxamás</string>
   <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
-  <string name="account_setup_incoming_delete_policy_delete_label">Al desaniciar mensaxes</string>
   <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
-  <string name="account_setup_incoming_imap_path_prefix_label">Prefixu de ruta IMAP</string>
   <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
-  <string name="account_setup_incoming_imap_path_prefix_hint">Opcional</string>
   <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
-  <string name="account_setup_outgoing_headline">Axustes del sirvidor de salida</string>
   <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_outgoing_smtp_server_label">SIRVIDOR SMTP</string>
   <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
-  <string name="account_setup_outgoing_port_label">PUERTU</string>
   <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
-  <string name="account_setup_outgoing_security_label">TRIBA DE SEGURIDÁ</string>
+  <string name="account_setup_outgoing_security_label">TRIBA DE SEGURANZA</string>
   <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
-  <string name="account_setup_outgoing_require_login_label">Solicitar aniciu de sesión</string>
   <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
-  <string name="account_setup_outgoing_username_label">NOME USUARIU</string>
   <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
-  <string name="account_setup_exchange_certificate_title">CERTIFICÁU DE VECERU</string>
   <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
-  <string name="account_setup_exchange_select_certificate">Seleicionar</string>
   <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
-  <string name="account_setup_exchange_use_certificate">Usar certificáu de veceru</string>
   <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_remove_certificate">Desaniciar</string>
   <!-- On "Exchange" setup screen, placeholder text to indicate no client
          certificate is used [CHAR LIMIT=50] -->
-  <string name="account_setup_exchange_no_certificate">Nengún</string>
   <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
-  <string name="account_setup_exchange_device_id_label">ID DEL PRESÉU MÓVIL</string>
   <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
-  <string name="account_setup_options_headline">Opciones de cuenta</string>
   <!-- In Account setup options screen, label for email check frequency selector -->
-  <string name="account_setup_options_mail_check_frequency_label">Frecuencia de sincronización:</string>
   <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_never">Enxamás</string>
   <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_push">Comprobación automática</string>
   <!-- In Account setup options & Account Settings screens, email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_5min">Cada 5 minutos</string>
   <!-- In Account setup options & Account Settings screens, email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_10min">Cada 10 minutos</string>
   <!-- In Account setup options & Account Settings screens, email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_15min">Cada 15 minutos</string>
   <!-- In Account setup options & Account Settings screens, email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_30min">Cada 30 minutos</string>
   <!-- In Account setup options & Account Settings screens, email check frequency option -->
-  <string name="account_setup_options_mail_check_frequency_1hour">Cada hora</string>
   <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
-  <string name="account_setup_options_notify_label">Notificame cuando aporte un corréu</string>
   <!-- In Account setup options screen, optional check box to also sync contacts -->
-  <string name="account_setup_options_sync_contacts_label">Sincronizar contautos d\'esta cuenta</string>
   <!-- In Account setup options screen, optional check box to also sync contacts -->
-  <string name="account_setup_options_sync_calendar_label">Sincronizar calendariu d\'esta cuenta</string>
   <!-- In Account setup options screen, check box to sync email -->
-  <string name="account_setup_options_sync_email_label">Sincronizar corréu d\'esta cuenta</string>
   <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
-  <string name="account_setup_options_background_attachments_label">Descargar axuntos automáticamente al coneutar a una rede Wi-Fi</string>
   <!-- Dialog title when "setup" could not finish -->
-  <string name="account_setup_failed_dlg_title">Fallu al completar la configuración</string>
   <!-- In Account setup options screen, label for email lookback selector -->
-  <string name="account_setup_options_mail_window_label">Sincronizar correos dende:</string>
   <!-- In account setup options & account settings screens (exchange), sync window length; this
         implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
-  <string name="account_setup_options_mail_window_auto">Automática</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_1day">Caberu día</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_3days">Los caberos trés díes</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_1week">La cabera pasada</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_2weeks">Les caberes dos selmanes</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_1month">El mes pasáu</string>
   <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-  <string name="account_setup_options_mail_window_all">Too</string>
   <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
-  <string name="account_setup_options_mail_window_default">Usar valores predeterminaos de la cuenta</string>
   <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
-  <string name="account_setup_failed_dlg_auth_message">Nome d\'usuariu o contraseña incorreutos</string>
   <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
         an "access denied" server error, which could imply incorrect username/password or that no
         autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
-  <string name="account_setup_autodiscover_dlg_authfail_title">Problema al configurar la cuenta</string>
   <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
         an "access denied" server error, which could imply incorrect username/password or that no
         autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
-  <string name="account_setup_autodiscover_dlg_authfail_message">Los axustes de cuenta, contraseña y nome d\'usuariu de confirmación son correutos.</string>
   <!-- An error message presented to the user when the server's identity
          cannot be established or trusted [CHAR LIMIT=NONE] -->
-  <string name="account_setup_failed_dlg_certificate_message">Nun pue afitase una conexón de mou seguru col sirvidor.</string>
   <!-- An error message presented to the user when the server's identity
          cannot be established or trusted [CHAR LIMIT=NONE] -->
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Nun pue afitase conexón de mou seguru col sirvidor.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
   <!-- An error message presented to the user when the server requires a
          client certificate to connect [CHAR LIMIT=NONE] -->
-  <string name="account_setup_failed_certificate_required">Necesítase un certificáu de veceru. ¿Quies coneutate al sirvidor con un certificáu de veceru?</string>
   <!-- An error message presented to the user when the certificate they
          specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
-  <string name="account_setup_failed_certificate_inaccessible">El certificáu nun ye válidu o nun pue accedese a él.</string>
   <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
-  <string name="account_setup_failed_check_credentials_message">El sirvidor devolvió un fallu. Comprueba\'l nome d\'usuariu y la to contraseña y vuelvi a intentalo.</string>
   <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
-  <string name="account_setup_failed_dlg_server_message">Nun pue afitase conexón col sirvidor.</string>
   <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
-  <string name="account_setup_failed_dlg_server_message_fmt">Nun pue afitase conexón col sirvidor.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
   <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
-  <string name="account_setup_failed_tls_required">El protocolu TLS ye obligatoriu, pero\'l sirvidor nun lu almite.</string>
   <!-- Additional diagnostic text when server does not support any of our authentication methods -->
-  <string name="account_setup_failed_auth_required">El sirvidor nun almite métodos d\'autenticación.</string>
   <!-- Additional diagnostic text when server connection failed due to security error -->
-  <string name="account_setup_failed_security">Nun pudo afitase conexón col sirvidor por un fallu de seguranza.</string>
+  <string name="account_setup_failed_security">Nun pudo abrise la conexón del sirvidor pola mor d\'un fallu de seguranza.</string>
   <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
-  <string name="account_setup_failed_ioerror">Nun pudo afitase conexón col sirvidor.</string>
   <!-- Additional diagnostic text when server connection failed due to our inability to support a
          required EAS protocol version [CHAR LIMIT=none] -->
-  <string name="account_setup_failed_protocol_unsupported">Introduxisti una direición de sirvidor incorreuta o\'l sirvidor requier una versión de protocolu non compatible con l\'aplicación Corréu.</string>
   <!-- Additional diagnostic text when server access was denied; the user should contact the
          administrator of the server for more information [CHAR LIMIT=none] -->
-  <string name="account_setup_failed_access_denied">Nun tienes permisu pa facer la sincronización con esti sirvidor. Pa obtener más información, ponte en contautu col alministrador del sirvidor.</string>
   <!-- Dialog title when validation requires security provisioning (e.g. support
          for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
-  <string name="account_setup_security_required_title">Alministración de seguridá remota</string>
   <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
          for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
          [CHAR LIMIT=none] -->
-  <string name="account_setup_security_policies_required_fmt">Ye necesario que permitas que\'l sirvidor <xliff:g id="SERVER">%s</xliff:g> remane de mou remotu dalgunes funciones de seguridá del to preséu Android. ¿Quies terminar de configurar esta cuenta?</string>
   <!-- Additional diagnostic text when validation failed due to required provisioning not
          being supported [CHAR LIMIT=none] -->
-  <string name="account_setup_failed_security_policies_unsupported">Esti sirvidor requier funciones de seguridá que nun son compatibles col to preséu Android (por exemplu: <xliff:g id="ERROR">%s</xliff:g>).</string>
   <!-- Warning given to users when they request disabling device administration (i.e. that their
          administered accounts will be deleted) [CHAR LIMIT=none] -->
-  <string name="disable_admin_warning">AVISU: si desactives el permisu de l\'aplicación Corréu p\'alministrar el to preséu, van desaniciase toles cuentes d\'esta aplicación que requieran el so usu, asina como les direiciones de corréu-e, los contautos, los eventos de calendariu y otra mena de datos.</string>
   <!-- Dialog shown when the account requires some amount of device security provisioning,
          just before jumping into system settings such as Device Policy grant, PIN/password,
          or encryption setup.  [CHAR_LIMIT=40] -->
-  <string name="account_security_dialog_title">Anovamientu de seguridá</string>
+  <string name="account_security_dialog_title">Anovamientu de seguranza</string>
   <!-- Additional diagnostic text when the account requires some amount of device security
          provisioning, just before jumping into system settings such as Device Policy grant,
          PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
-  <string name="account_security_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> necesita qu\'anueves la configuración de seguridá.</string>
   <!-- Notification ticker when device security required (note: unused in Holo XL) -->
-  <string name="security_unsupported_ticker_fmt">Los requisitos de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nun permiten la sincronización.</string>
   <!-- Notification ticker when device security required (note: unused in Holo XL) -->
-  <string name="security_needed_ticker_fmt">Ye necesario anovar la configuración de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\".</string>
   <!-- Notification ticker when device security required (note: unused in Holo XL) -->
-  <string name="security_changed_ticker_fmt">Modificóse la configuración de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" (nun fai falta l\'intervención del usuariu).</string>
   <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
-  <string name="security_notification_content_update_title">Anovamientu seguridá necesariu</string>
+  <string name="security_notification_content_update_title">Ríquense anovamientos de seguranza</string>
   <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
-  <string name="security_notification_content_change_title">Polítiques de seguridá modificaes</string>
   <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
-  <string name="security_notification_content_unsupported_title">Fallu al cumplir polítiques seguridá</string>
   <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
-  <string name="account_security_title">Seguridá del preséu</string>
+  <string name="account_security_title">Seguranza del preséu</string>
   <!-- Additional diagnostic text when the email app asserts control of the phone.
         [CHAR LIMIT=none] -->
-  <string name="account_security_policy_explanation_fmt">Ye necesario que permitas que\'l sirvidor <xliff:g id="SERVER">%s</xliff:g> remane de mou remotu dalgunes funciones de seguridá del to preséu Android.</string>
+  <string name="account_security_policy_explanation_fmt">
+         El sirvidor <xliff:g id="server">%s</xliff:g> rique que-y deas permisu pa controlarrequires that you allow it to remotely control
+         remotamente delles carauterístiques de seguranza del to preséu Android.</string>
   <!-- "Setup could not finish" dialog action button -->
-  <string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string>
   <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
-  <string name="password_expire_warning_ticker_fmt">\"<xliff:g id="ACCOUNT">%s</xliff:g>\" necesita que modifiques la contraseña o\'l PIN de la pantalla de bloquéu.</string>
   <!-- Notification content title when device password is getting ready to expire
             [CHAR_LIMIT=30] -->
-  <string name="password_expire_warning_content_title">Contraseña bloquéu pantalla va caducar</string>
   <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
-  <string name="password_expired_ticker">La contraseña o\'l PIN de la pantalla de bloquéu caducó.</string>
   <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
-  <string name="password_expired_content_title">Contraseña bloquéu caducada</string>
   <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
-  <string name="password_expire_warning_dialog_title">Contraseña bloquéu pantalla va caducar</string>
   <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
-  <string name="password_expire_warning_dialog_content_fmt">Vas tener de modificar la contraseña o\'l PIN de la pantalla de bloquéu aína, o van desaniciase los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Quies camudala agora?</string>
   <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
-  <string name="password_expired_dialog_title">Contraseña bloquéu caducada</string>
   <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
-  <string name="password_expired_dialog_content_fmt">Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> tán desaniciándose del preséu. Pa restauralos, modifica la contraseña o\'l PIN de la pantalla de bloquéu. ¿Quies camudalos agora?</string>
   <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
          without checking/saving [CHAR LIMIT=none]-->
-  <string name="account_settings_exit_server_settings">¿Quies descartar los cambeos non guardaos?</string>
   <!-- On Settings screen, setting option name -->
   <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
-  <string name="account_settings_background_attachments_label">Descargar axuntos</string>
   <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
-  <string name="account_settings_background_attachments_summary">Descargar automáticamente axuntos de correos recientes por Wi-Fi</string>
-  <string name="account_settings_notify_label">Notificaciones de corréu</string>
   <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
         [CHAR LIMIT=50] -->
-  <string name="account_settings_summary">Frecuencia de sincronización, notificaciones, etc.</string>
   <!-- On Settings screen, setting summary text -->
-  <string name="account_settings_notify_summary">Unviar notificación cuando aporte un corréu-e</string>
   <!-- On Settings screen, setting option name and title of dialog box that opens -->
-  <string name="account_settings_mail_check_frequency_label">Frecuencia de sincronización</string>
   <!-- On Settings screen, setting option name -->
   <string name="account_settings_incoming_label">Axustes d\'entrada</string>
   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
-  <string name="account_settings_incoming_summary">Nome d\'usuariu, contraseña y otros axustes del sirvidor d\'entrada</string>
   <!-- On Settings screen, setting option name -->
   <string name="account_settings_outgoing_label">Axustes de salida</string>
   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
-  <string name="account_settings_outgoing_summary">Nome d\'usuariu, contraseña y otros axustes del sirvidor de salida</string>
   <!-- On Settings screen, setting option name -->
-  <string name="account_settings_enforced_label">Polítiques aplicaes</string>
   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
-  <string name="account_settings_enforced_summary">Nengún</string>
   <!-- On Settings screen, setting option name -->
-  <string name="account_settings_unsupported_label">Polítiques non almitíes</string>
   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
-  <string name="account_settings_unsupported_summary">Nengún</string>
   <!-- On Settings screen, label for button that attempts to sync the account -->
-  <string name="account_settings_retry_label">Intentar sincronización</string>
   <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
-  <string name="account_settings_retry_summary">Toca pa sincronizar esta cuenta.</string>
   <!-- On Settings screen, setting option name -->
-  <string name="account_settings_description_label">Nome de la cuenta</string>
   <!-- On Settings screen, setting option name -->
-  <string name="account_settings_name_label">El to nome</string>
   <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
         for insertion in message body. [CHAR_LIMIT=24]-->
-  <string name="account_settings_edit_quick_responses_label">Rempuestes rápides</string>
   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
-  <string name="account_settings_edit_quick_responses_summary">Testu qu\'uses nos tos correos</string>
   <!-- On Settings screen, section heading -->
-  <string name="account_settings_notifications">Axustes de notificaciones</string>
   <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
   <string name="account_settings_data_usage">Usu de datos</string>
   <!-- On Settings screen, section heading -->
-  <string name="account_settings_policies">Polítiques de seguridá</string>
-  <string name="system_folders_title">Carpetes del sistema</string>
-  <string name="system_folders_trash_title">Carpeta de la papelera</string>
-  <string name="system_folders_trash_summary">Esbilla la to carpeta de papelera del sirvidor</string>
-  <string name="system_folders_trash_dlg">Esbilla la to carpeta de papelera del sirvidor</string>
-  <string name="system_folders_sent_title">Carpeta d\'elementos unviaos</string>
-  <string name="system_folders_sent_summary">Esbillar la to carpeta d\'elementos unviaos del sirvidor</string>
-  <string name="system_folders_sent_dlg">Esbillar la to carpeta d\'elementos unviaos del sirvidor</string>
+  <string name="account_settings_policies">Polítiques de seguranza</string>
   <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
-  <string name="edit_quick_response_dialog">Rempuestes rápides</string>
   <!-- On settings screen, edit quick response dialog's "save" button -->
   <string name="save_action">Guardar</string>
   <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
-  <string name="account_settings_sync_contacts_enable">Sincronizar contautos</string>
   <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
-  <string name="account_settings_sync_contacts_summary">Sincronizar contautos d\'esta cuenta</string>
   <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
-  <string name="account_settings_sync_calendar_enable">Sincronizar calendariu</string>
   <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
-  <string name="account_settings_sync_calendar_summary">Sincronizar eventos de calendariu pa esta cuenta</string>
   <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
-  <string name="account_settings_sync_email_enable">Sincronizar corréu</string>
   <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
-  <string name="account_settings_sync_email_summary">Sincronizar corréu d\'esta cuenta</string>
   <!-- On Settings screen, vibrate pop-up menu label -->
   <!-- On Settings screen, setting option name -->
-  <string name="account_settings_ringtone">Esbillar tonu</string>
+  <string name="account_settings_ringtone">Escoyer timbre</string>
   <!-- On Settings screen, section heading -->
-  <string name="account_settings_servers">Axustes del sirvidor</string>
   <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
-  <string name="mailbox_settings_activity_title">Axustes de sincronización</string>
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
-  <string name="mailbox_settings_activity_title_with_mailbox">Axustes de sincronización (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)</string>
   <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
-  <string name="mailbox_settings_sync_enabled_label">Sincronizar esta carpeta</string>
   <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
-  <string name="mailbox_settings_sync_enabled_summary">Los mensaxes van descargase automáticamente al coneutate</string>
   <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
-  <string name="mailbox_settings_mailbox_sync_window_label">Díes pa sincronizar corréu</string>
   <!-- Message that appears when adding a T-Online account -->
-  <string name="provider_note_t_online">Pa configurar esta cuenta de corréu-e, accedi al sitiu web de T-Online y crea una contraseña p\'acceder al corréu electrónicu POP3.</string>
   <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
   <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
-  <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
   <!-- Message that appears if the AccountManager cannot create the system Account -->
-  <string name="system_account_create_failed">Nun pudo crease la cuenta. Inténtalo de nueves.</string>
   <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
   <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
-  <string name="device_admin_label">Corréu-e</string>
   <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
-  <string name="device_admin_description">Permite les polítiques de seguridá especificaes pol sirvidor.</string>
   <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
-  <string name="policy_dont_allow_camera">Nun permitir usar cámara del preséu</string>
   <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
-  <string name="policy_require_password">Solicitar contraseña del preséu</string>
   <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
-  <string name="policy_password_history">Restrinxir nuevu usu contraseñes recientes</string>
   <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
-  <string name="policy_password_expiration">Forciar vencimientu de contraseñes</string>
   <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
         is activated [CHAR LIMIT=50] -->
-  <string name="policy_screen_timeout">Preséu inactivu necesariu pa bloquéu</string>
   <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
-  <string name="policy_calendar_age">Llendar númberu d\'eventos que se sincronicen</string>
   <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
-  <string name="policy_email_age">Llendar númberu de correos que se sincronicen</string>
   <!-- The four strings below represent "quick responses" which the user can insert into a
         message being composed with just a couple of taps.  These four responses MUST be defined,
         but need not include a string (i.e. they are optional).  Further, the responses can be
         customized as necessary by the translator, in case one or more of these is inappropriate in
         a particular locale or if there are better options available. -->
   <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
-  <string name="quick_1">¡Gracies!</string>
   <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
-  <string name="quick_2">Paezme bien, ¡gracies!</string>
   <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
-  <string name="quick_3">Lléolo dempués y respuéndote.</string>
   <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
-  <string name="quick_4">Hai de facer una reunión pa falar d\'esti tema.</string>
   <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
-  <string name="confirm_response">Unviando rempuesta&#8230;</string>
   <!-- Used by AccountManager -->
   <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
   <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
   <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
-  <string name="trash_folder_selection_title">Esbilla la papelera del sirvidor de <xliff:g id="ACCOUNT">%s</xliff:g></string>
   <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
-  <string name="sent_folder_selection_title">Esbillar carpeta sirvidor de <xliff:g id="ACCOUNT">%s</xliff:g></string>
-  <string name="account_waiting_for_folders_msg">Cargando llista de carpetes&#8230;</string>
   <!-- Feedback uri to be used when feedback is enabled -->
   <!-- Content Provider Authority for Eml Attachments -->
   <!-- Provider name for widgets -->
   <!-- This message indicates no quick responses exist to choose from -->
-  <string name="no_quick_responses">Nenguna disponible</string>
   <!-- Activity name of the compose activity that should be reconciled -->
   <!-- Gmail name for redirecting during account setup -->
-  <string name="gmail_name">Gmail</string>
   <!-- Name for preference entry which leads to the per-folder sync settings activity -->
-  <string name="folder_sync_settings_pref_title">Axustes de sync de carpetes</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 53de86fb4..0685d9452 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -26,7 +26,7 @@
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcions de notificació (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
   <!-- Name for preference entry which leads to the per-folder notification settings activity -->
-  <string name="folder_notify_settings_pref_title">Ajustaments de les notificacions de carpeta</string>
+  <string name="folder_notify_settings_pref_title">Configuració de les notificacions de carpeta</string>
   <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Llums</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index a1e9f76b9..533379df0 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -17,8 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Delete account -->
+  <string name="delete_account">Delete account</string>
+  <string name="delete_account_confirmation_msg">This will delete all the settings and emails of the account <xliff:g id="account">%s</xliff:g>. This operation cannot be undone.\n\nContinue?</string>
+  <string name="deleting_account_msg">Deleting account\u2026</string>
+  <string name="delete_account_failed">Couldn\'t delete the account</string>
   <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title">Notification options</string>
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Notification options (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
   <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <string name="folder_notify_settings_pref_title">Folder notification settings</string>
   <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Lights</string>
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index a1e9f76b9..533379df0 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -17,8 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Delete account -->
+  <string name="delete_account">Delete account</string>
+  <string name="delete_account_confirmation_msg">This will delete all the settings and emails of the account <xliff:g id="account">%s</xliff:g>. This operation cannot be undone.\n\nContinue?</string>
+  <string name="deleting_account_msg">Deleting account\u2026</string>
+  <string name="delete_account_failed">Couldn\'t delete the account</string>
   <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title">Notification options</string>
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Notification options (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
   <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <string name="folder_notify_settings_pref_title">Folder notification settings</string>
   <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Lights</string>
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 1a769385c..f8d27fa61 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -17,14 +17,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Delete account -->
-  <string name="delete_account">Eliminar cuenta</string>
-  <string name="delete_account_confirmation_msg">Esto eliminará todas las opciones y correos de la cuenta <xliff:g id="account">%s</xliff:g>. Esta operación no se puede deshacer.\n\n¿Continuar?</string>
+  <string name="delete_account">Borrar cuenta</string>
+  <string name="delete_account_confirmation_msg">Esto borrará todas los ajustes y correos de la cuenta <xliff:g id="account">%s</xliff:g>. Esta operación no se puede deshacer.\n\n¿Continuar?</string>
   <string name="deleting_account_msg">Eliminando cuenta\u2026</string>
-  <string name="delete_account_failed">No se pudo eliminar la cuenta</string>
+  <string name="delete_account_failed">No se pudo borrar la cuenta</string>
   <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opciones de notificación</string>
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
-  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciones de notificación de (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciones de notificación (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
   <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Ajustes de notificación de carpeta</string>
   <!-- On Settings screen, notification lights pop-up menu label -->
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index a1e9f76b9..b0bd5db56 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -17,8 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Delete account -->
+  <string name="delete_account">Fshi llogarinë</string>
+  <string name="delete_account_confirmation_msg">Ky veprim do të fshijë të gjithë parametrat dhe email-et e llogarisë <xliff:g id="account">%s</xliff:g>. Ky veprim nuk mund të zhbëhet.\n\nDëshiron të vazhdosh?</string>
+  <string name="deleting_account_msg">Duke fshirë llogarinë\u2026</string>
+  <string name="delete_account_failed">Llogaria nuk mund të fshihej</string>
   <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title">Opsionet e njoftimeve</string>
   <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opsionet e njoftimeve (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
   <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <string name="folder_notify_settings_pref_title">Parametrat e njoftimeve të dosjeve</string>
   <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Dritat</string>
 </resources>