diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 8ecb4d197..ca47a6e8f 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string>
   <string name="actfm_OLA_prompt">Entreu:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Edita</string>
   <string name="TAd_contextEditTask">Editeu la tasca</string>
   <string name="TAd_contextCopyTask">Copia la tasca</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Recupera la tasca</string>
   <string name="TAd_contextPurgeTask">Purgar tasques</string>
   <string name="SSD_title">Ordenació, subtasques, i ocultació</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 50380f8e2..9f928f53d 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Vyberte, který účet Google chcete použít:</string>
   <string name="actfm_OLA_prompt">Prosím připojte se do Googlu:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Upravit</string>
   <string name="TAd_contextEditTask">Upravit úkol</string>
   <string name="TAd_contextCopyTask">Kopírovat úkol</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Obnovit úkol</string>
   <string name="TAd_contextPurgeTask">Smazat úkol</string>
   <string name="SSD_title">Tříděné a skryté úkoly</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index 93a57a09c..d9e857a50 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Login på Astrid.com</string>
   <string name="actfm_GAA_title">Select the Google account you want to use:</string>
   <string name="actfm_OLA_prompt">Forbind venligst til Google:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Rediger</string>
   <string name="TAd_contextEditTask">Rediger opgave</string>
   <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Gendan opgave</string>
   <string name="TAd_contextPurgeTask">Ryd opgave</string>
   <string name="SSD_title">Sortering og skjulte opgaver</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 2253d77dc..d0966d782 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Anmelden</string>
   <string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string>
   <string name="actfm_OLA_prompt">Log dich bitte ein:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Liste kopieren</string>
   <string name="actfm_feat_list_suffix">(Kopie)</string>
   <string name="actfm_feat_list_cloning">Kopiere...</string>
@@ -160,7 +162,7 @@
   <string name="TLA_custom">Benutzerdefiniert</string>
   <string name="TLA_quick_add_hint">Aufgabe hinzufügen</string>
   <string name="TLA_quick_add_hint_assign">Etwas hinzufügen für %s</string>
-  <string name="TLA_notification_volume_low">Erinnerungen sind stummgeschaltet. Du wirst Astrid nicht hören!</string>
+  <string name="TLA_notification_volume_low">Erinnerungen sind stummgeschaltet. Du wirst Astrid nicht höhren!</string>
   <string name="TLA_notification_disabled">Astrids Erinnerungen sind ausgeschaltet! Du wirst keine Erinnerungen mehr erhalten!</string>
   <string-array name="TLA_filters">
     <item>Aktiviert</item>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Bearbeiten</string>
   <string name="TAd_contextEditTask">Aufgabe bearbeiten</string>
   <string name="TAd_contextCopyTask">Aufgabe kopieren</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Aufgabe wiederherstellen</string>
   <string name="TAd_contextPurgeTask">Aufgabe löschen</string>
   <string name="SSD_title">Sortierung, Teilaufgaben und Versteckte</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 1a2a9dcb1..b32e56231 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Iniciar sesión</string>
   <string name="actfm_GAA_title">Elija la cuenta de Google que quiere usar:</string>
   <string name="actfm_OLA_prompt">Inicie sesión:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copiar lista</string>
   <string name="actfm_feat_list_suffix">Copiar</string>
   <string name="actfm_feat_list_cloning">Copiando...</string>
@@ -82,8 +84,8 @@
   <string name="account_type_summary_not_logged_in">Accede a tus tareas en línea, comparte listas y delega</string>
   <string name="actfm_account_premium">Premium</string>
   <string name="actfm_account_basic">Básica</string>
-  <string name="actfm_inapp_billing">Upgrade to Premium</string>
-  <string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp; more</string>
+  <string name="actfm_inapp_billing">Actualizar a Premium</string>
+  <string name="actfm_inapp_billing_summary">Adjuntar archivos, respaldos de voz, soporte premium y más</string>
   <string name="share_with_facebook">Comparte en Facebook</string>
   <string name="share_with_twitter">Síguenos en Twitter</string>
   <string name="share_with_google">Comparte en Google+</string>
@@ -109,7 +111,7 @@
   <string name="backup_BAc_title">Gestionar sus copias de seguridad</string>
   <string name="backup_BAc_import">Importar tareas</string>
   <string name="backup_BAc_export">Exportar tareas</string>
-  <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
+  <string name="backup_BAc_cloud">Presiona para respaldar gratis en la nube en Astrid.com</string>
   <string name="backup_TXI_error">Error al importar</string>
   <string name="export_toast">Respaldadas %1$s a %2$s.</string>
   <string name="export_toast_no_tasks">No hay tareas para exportar</string>
@@ -153,9 +155,9 @@
   <string name="TLA_menu_search">Búsqueda</string>
   <string name="TLA_menu_lists">Listas</string>
   <string name="TLA_menu_friends">Gente</string>
-  <string name="TLA_menu_featured_lists">Featured Lists</string>
+  <string name="TLA_menu_featured_lists">Listas destacadas</string>
   <string name="TLA_menu_suggestions">Sugerencias</string>
-  <string name="TLA_menu_settings">Account &amp; Settings</string>
+  <string name="TLA_menu_settings">Configuración y cuenta</string>
   <string name="TLA_menu_support">Soporte</string>
   <string name="TLA_custom">Personalizar</string>
   <string name="TLA_quick_add_hint">Añadir una tarea</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Editar</string>
   <string name="TAd_contextEditTask">Editar tarea</string>
   <string name="TAd_contextCopyTask">Copiar tarea</string>
+  <string name="TAd_contextDeleteTask">Eliminar tarea</string>
   <string name="TAd_contextUndeleteTask">Restaurar Tarea</string>
   <string name="TAd_contextPurgeTask">Purgar Tareas</string>
   <string name="SSD_title">Clasificar y Filtrar Tareas</string>
@@ -301,15 +304,15 @@
   <string name="UpS_updates_title">Últimas Noticias de Astrid</string>
   <string name="UpS_no_activity_log_in">Ingresa para ver un registro de\ntu progreso así como la\nactividad en listas compartidas.</string>
   <string name="EPr_title">Astrid: Preferencias</string>
-  <string name="EPr_title_short">Settings</string>
-  <string name="EPr_share_astrid">Tell others about Astrid</string>
-  <string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network</string>
+  <string name="EPr_title_short">Configuración</string>
+  <string name="EPr_share_astrid">Háblales a otros sobre Astrid</string>
+  <string name="EPr_share_astrid_summary">Comparte algo de Astrid en tu red social favorita</string>
   <string name="EPr_deactivated">desactivada</string>
   <string name="EPr_appearance_header">Apariencia</string>
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
-  <string name="EPr_faq_title">FAQ</string>
-  <string name="EPr_account_title">Account: %s</string>
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
+  <string name="EPr_appearance_summary">Temas, widgets, líneas de tareas, editar pantalla</string>
+  <string name="EPr_faq_title">FAQ (Preguntas frecuentes)</string>
+  <string name="EPr_account_title">Cuenta: %s</string>
+  <string name="EPr_support_summary">Tutorial, FAQ (Preguntas frecuentes), Acerca de...</string>
   <string name="EPr_fontSize_title">Tamaño de la lista de tareas</string>
   <string name="EPr_showSmartConfirmation_title">Mostrar confirmación para recordatorios inteligentes</string>
   <string name="EPr_fontSize_desc">Tamaño de letra en el listado de la página principal</string>
@@ -327,10 +330,10 @@
   <string name="EPr_ideaAuto_title">Auto cargar la pestaña Ideas</string>
   <string name="EPr_ideaAuto_desc_enabled">La búsqueda para la pestaña Ideas se realizará cuando a la pestaña se le de clic</string>
   <string name="EPr_ideaAuto_desc_disabled">La búsqueda para la pestaña Ideas se realizará solo cuando sea pedida manualmente</string>
-  <string name="EPr_task_row_style_title_simple">Row style: Simple</string>
-  <string name="EPr_task_row_style_title_legacy">Row style: Original</string>
-  <string name="EPr_task_row_style_summary_simple">Truncate title to one line with date and lists below</string>
-  <string name="EPr_task_row_style_summary_legacy">Truncate title to two lines with date on right</string>
+  <string name="EPr_task_row_style_title_simple">Tipo de renglón: Simple</string>
+  <string name="EPr_task_row_style_title_legacy">Tipo de renglón: Original</string>
+  <string name="EPr_task_row_style_summary_simple">Truncar el título a una línea con la fecha y listas debajo</string>
+  <string name="EPr_task_row_style_summary_legacy">Truncar el título a dos líneas con la fecha a la derecha</string>
   <string name="EPr_theme_title">Combinación de colores</string>
   <string name="EPr_theme_desc">Actualmente: %s</string>
   <string name="EPr_theme_desc_unsupported">La configuración requiere Android 2.0+</string>
@@ -339,16 +342,16 @@
   <string name="EPr_use_contact_picker">Usar selector de contactos</string>
   <string name="EPr_use_contact_picker_desc_enabled">La opción del sistema de elector de contactos será mostrada en la ventana de asignación de tareas</string>
   <string name="EPr_use_contact_picker_desc_disabled">La opción del sistema de elector de contactos no será mostrada</string>
-  <string name="EPr_third_party_addons">Enable third party add-ons</string>
+  <string name="EPr_third_party_addons">Activar complementos de terceros</string>
   <string name="EPr_third_party_addons_desc_enabled">Complementos hechos por terceros estarán habilitados</string>
   <string name="EPr_third_party_addons_desc_disabled">Complementos hechos por terceros estarán deshabilitados</string>
-  <string name="EPr_ideas_tab_enabled">Task ideas</string>
+  <string name="EPr_ideas_tab_enabled">Ideas de tareas</string>
   <string name="EPr_ideas_tab_description">Obtener idead para ayudarte a completar tus tareas</string>
   <string name="EPr_cal_end_or_start_at_due_time">Tiempo del calendario de eventos</string>
   <string name="EPr_cal_end_at_due_time">Finalizar eventos del calendario al tiempo debido</string>
   <string name="EPr_cal_start_at_due_time">Iniciar eventos del calendario al tiempo debido</string>
-  <string name="EPr_force_phone_layout">Use phone layout</string>
-  <string name="EPr_show_featured_lists">Show featured lists</string>
+  <string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
+  <string name="EPr_show_featured_lists">Mostrar listas destacadas</string>
   <string name="EPr_swipe_lists_performance_title">Deslizar entre las listas</string>
   <string-array name="EPr_swipe_lists_performance_mode">
     <item>Sin deslizar</item>
@@ -362,9 +365,9 @@
     <item>Configuración predeterminada</item>
     <item>Usar mas recursos del sistema</item>
   </string-array>
-  <string name="swipe_lists_helper_title">Swipe between lists</string>
-  <string name="swipe_lists_helper_header">Swipe left or right to quickly move between lists</string>
-  <string name="swipe_lists_helper_subtitle">Change settings in Settings -&gt; Appearance</string>
+  <string name="swipe_lists_helper_title">Deslizar entre listas</string>
+  <string name="swipe_lists_helper_header">Deslizr a la izquierda o derecha para moverse rápidamente entre listas</string>
+  <string name="swipe_lists_helper_subtitle">Cambiar configuración en Configuración -&gt; Apariencia</string>
   <string-array name="EPr_themes">
     <item>Día - Azul</item>
     <item>Día - Rojo</item>
@@ -405,9 +408,9 @@
   <string name="AOA_free">Gratuito</string>
   <string name="AOA_no_addons">¡Lista vacía!</string>
   <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Astrid Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to send you notifications based on filter conditions. Requires Locale.</string>
+  <string name="AOA_ppack_description">Apoya a Astrid y sé más productivo con el Astrid Power Pack. Widgets de 4x2 y 4x4 e integración de voz. ¡Actualiza hoy!</string>
+  <string name="AOA_locale_title">Complemento Astrid Locale</string>
+  <string name="AOA_locale_description">Permite a Astrid utilizar la aplicación Locale para enviarte notificaciones basadas en filtros configurados. Requiere la aplicación Locale.</string>
   <string name="TWi_loading">Cargando...</string>
   <string name="WCA_title">Seleccione las tareas que ver...</string>
   <string name="p_about">Sobre Astrid</string>
@@ -419,10 +422,10 @@
   <string name="task_killer_help_ok">No mataré Astrid!</string>
   <string name="marketplace_description">Astrid es el administrador de listas tareas de código abierto más querido diseñado para ayudarte a conseguir acabar tus quehaceres. Entre sus características se incluye recordatorios, etiquetas, sincronización, un complemento para Locale, un widget y mucho más.</string>
   <string name="DB_corrupted_title">Base de datos corrupta</string>
-  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Astrid.</string>
-  <string name="market_unavailable">Unfortunately the market is not available for your system.</string>
+  <string name="DB_corrupted_body">"¡Oh-oh! Es posible que tu base de datos esté corrupta. Si ves éste error con frecuencia, te sugerimos que limpies toda la información  (Configuración-&gt;Sincronización y respaldos-&gt;Administrar tareas pasadas-&gt;Limpiar toda la información) y recuperar tus tareas de un respaldo (Configuración-&gt;Sincronización y respaldos-&gt;Respaldos-&gt;Importar tareas) en Astrid."</string>
+  <string name="market_unavailable">Desafortunadamente el Market no está disponible para tu sistema</string>
   <string name="EPr_defaults_header">Configuración de nuevas tareas por defecto</string>
-  <string name="EPr_defaults_summary">Importance, due date, add to calendar</string>
+  <string name="EPr_defaults_summary">Importancia, fecha límite, agregar al calendario</string>
   <string name="EPr_default_urgency_title">Fecha límite por defecto</string>
   <string name="EPr_default_urgency_desc">Actualmente: %s</string>
   <string name="EPr_default_importance_title">Importancia por defecto</string>
@@ -531,13 +534,13 @@
   <string name="help_popover_add_task">Comienza añadiendo una tarea o dos</string>
   <string name="help_popover_tap_task">Toca tarea para editar y compartir</string>
   <string name="help_popover_list_settings">Toca para editar o compartir ésta lista</string>
-  <string name="help_popover_collaborators">People you share with can help\nyou build your list or finish tasks</string>
-  <string name="help_popover_add_lists">Tap to add a list</string>
+  <string name="help_popover_collaborators">La gente con quien compartes puede\nayudar a hacer tu lista o completar tareas.</string>
+  <string name="help_popover_add_lists">Presiona para agregar una lista</string>
   <string name="help_popover_switch_lists">Toca para agregar una lista o cambiar entre listas</string>
   <string name="welcome_login_tos_base">Al usar Astrid estás de acuerdo con el</string>
   <string name="welcome_login_tos_link">Términos del servicio</string>
-  <string name="welcome_login_pw">Sign up with email</string>
-  <string name="welcome_sign_in">Sign in</string>
+  <string name="welcome_login_pw">Crear cuenta utulizando correo electrónico</string>
+  <string name="welcome_sign_in">Iniciar sesión</string>
   <string name="welcome_login_later">Conectar mas tarde</string>
   <string name="welcome_login_confirm_later_title">¿Porqué no iniciar seción?</string>
   <string name="welcome_login_confirm_later_ok">¡Lo haré!</string>
@@ -603,8 +606,8 @@
   <string name="CFC_opencrx_in_workspace_name">En el espacio de trabajo...</string>
   <string name="CFC_opencrx_assigned_to_text">Asignado a:</string>
   <string name="CFC_opencrx_assigned_to_name">Asignado a...</string>
-  <string name="EPr_powerpack_header">Premium and misc. settings</string>
-  <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous settings</string>
+  <string name="EPr_powerpack_header">Premium y configuraciones varias</string>
+  <string name="EPr_powerpack_summary">Recordatorios de llamadas perdidas, reconocimiento de voz y configuraciones varias</string>
   <string name="EPr_statistics_title">Estadísticas de uso anónimas</string>
   <string name="EPr_statistics_desc_disabled">No se enviará ninguna información</string>
   <string name="EPr_statistics_desc_enabled">Ayúdanos a mejorar Astrid permitiendo el envío anónimo de datos relacionados con el uso de la aplicación</string>
@@ -647,34 +650,34 @@
   <string name="file_err_show">Lo sentimos. El sistema aun no tiene soporte para este tipo de archivo</string>
   <string name="file_dir_dialog_ok">Usar este directorio</string>
   <string name="file_dir_dialog_default">Restaurar a valores por defecto</string>
-  <string name="p_files_dir">Premium downloads directory</string>
+  <string name="p_files_dir">Directorio de descargas Premium</string>
   <string name="p_files_dir_desc">Archivos adjuntos de tareas guardados en: %s</string>
   <string name="p_files_dir_desc_default">Directorio predeterminado</string>
-  <string name="billing_not_supported_title">Can\'t make purchases</string>
-  <string name="billing_not_supported_message">The Market billing service is not available at this time. You can continue to use this app but you won\'t be able to make purchases.</string>
-  <string name="subscriptions_not_supported_title">Can\'t purchase subscriptions</string>
-  <string name="subscriptions_not_supported_message">The Market billing service on this device does not support subscriptions at this time. You can subscribe to Astrid Premium at http://astrid.com/premium.</string>
-  <string name="cannot_connect_title">Can\'t connect to Market</string>
-  <string name="cannot_connect_message">This app cannot connect to Market. Your version of Market may be out of date. You can continue to use this app but you won\'t be able to make purchases.</string>
-  <string name="restoring_transactions">Restoring transactions</string>
-  <string name="subscriptions_learn_more">Learn more</string>
+  <string name="billing_not_supported_title">No se pueden realizar compras</string>
+  <string name="billing_not_supported_message">El servicio de cobro de Market no está disponible en éste momento. Puedes seguir usando la aplicación pero no será posible hacer compras.</string>
+  <string name="subscriptions_not_supported_title">No se pueden comprar suscripciones</string>
+  <string name="subscriptions_not_supported_message">El servicio de cobro de Market en éste dispositivo no permite suscripciones en éste momento. Te puedes suscribir a Astrid Premium desde http://astrid.com/premium.</string>
+  <string name="cannot_connect_title">No es posible conectarse a Market</string>
+  <string name="cannot_connect_message">Ésta app no se puede conectar a Market. Tu versión de Market pue estar desactualizada. Puedes seguir utilizando la aplicación pero no será posible hacer compras.</string>
+  <string name="restoring_transactions">Recuperando transacciones</string>
+  <string name="subscriptions_learn_more">Más información</string>
   <string name="premium_billing_title">Astrid Premium</string>
-  <string name="premium_buy_month">1 Month</string>
-  <string name="premium_buy_year">1 Year</string>
-  <string name="premium_description_header">Do more with premium!</string>
-  <string name="premium_description_1">Attach files to to-dos \n(pdfs, doc, ppt…)</string>
-  <string name="premium_description_2">Syncs files with astrid.com</string>
-  <string name="premium_description_3">Add attachments via email</string>
-  <string name="premium_description_4">Save voice notes as audio files</string>
-  <string name="premium_description_5">Preview upcoming features</string>
-  <string name="premium_description_6">Support the Astrid Team!</string>
-  <string name="premium_speech_bubble_1">Premium will power up your productivity!</string>
-  <string name="premium_speech_bubble_2">Order one year and save 25%%!</string>
-  <string name="premium_already_subscribed">You are already subscribed to Astrid Premium!</string>
-  <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe to premium. Please log in or sign up.</string>
-  <string name="premium_success">Thanks for subscribing to Astrid Premium!</string>
-  <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The new features will be unlocked for you on astrid.com soon, and should be available on your phone right away.</string>
-  <string name="premium_verification_error">The premium subscription for this Google Play account is connected to a different user. To link additional emails to your account, visit astrid.com/users/profile</string>
+  <string name="premium_buy_month">1 mes</string>
+  <string name="premium_buy_year">1 año</string>
+  <string name="premium_description_header">¡Haz más con Premium!</string>
+  <string name="premium_description_1">Adjunta archivos a las tareas \n(pdfs, doc, ppt...)</string>
+  <string name="premium_description_2">Sincroniza archivos con astrid.com</string>
+  <string name="premium_description_3">Agrega adjuntos via correo electrónico</string>
+  <string name="premium_description_4">Guarda notas de voz como archivos de audio</string>
+  <string name="premium_description_5">Prueba funciones nuevas</string>
+  <string name="premium_description_6">¡Apoya al equipo de Astrid!</string>
+  <string name="premium_speech_bubble_1">¡Premium mejorará tu productividad!</string>
+  <string name="premium_speech_bubble_2">¡Ordena un año y ahorra un 25%!</string>
+  <string name="premium_already_subscribed">¡Ya estás suscrito a Astrid Premium!</string>
+  <string name="premium_login_prompt">Necesitas tener una cuenta de Astrid.com para suscribirte a Premium. Por favor inicia sesión o crea una cuenta.</string>
+  <string name="premium_success">¡Gracias por suscribirte a Astrid Premium!</string>
+  <string name="premium_success_with_server_error">¡Gracias por suscribirte a Astrid Premium! Las nuevas funciones se abrirán pronto para ti en astrid.com, y deben estar disponibles en tu teléfono desde éste momento.</string>
+  <string name="premium_verification_error">La suscripción Premium para ésta cuenta de Google Play está conectada a un usuario diferente. Para ligar direcciones de correo electrónico adicionales a tu cuenta, visita astrid.com/users/profile</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">Espacios de trabajo</string>
   <string name="producteev_FEx_responsible_byme">Asignada por mi a</string>
@@ -758,7 +761,7 @@
     <item>¡Es un placer conocerlo!</item>
   </string-array>
   <string name="rmd_EPr_alerts_header">Configurar notificaciones</string>
-  <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
+  <string name="rmd_EPr_alerts_summary">Horas de silencio, opciones para silenciar, nivel de persistencia</string>
   <string name="rmd_EPr_enabled_title">¿Recordatorios habilitados?</string>
   <string name="rmd_EPr_enabled_desc_true">Los recordatorios de Astrid están habilitados (esto es normal)</string>
   <string name="rmd_EPr_enabled_desc_false">Recordatorios de Astrid nunca aparecerán en su teléfono</string>
@@ -782,7 +785,7 @@
   <string name="rmd_EPr_vibrate_title">Vibrar en alerta</string>
   <string name="rmd_EPr_vibrate_desc_true">Astrid vibrará cuando envíe notificaciones</string>
   <string name="rmd_EPr_vibrate_desc_false">Astrid no vibrará en el envío de notificaciones</string>
-  <string name="rmd_EPr_nagging_title">Astrid encouragements</string>
+  <string name="rmd_EPr_nagging_title">Estímulos de Astrid</string>
   <string name="rmd_EPr_nagging_desc_true">Astrid aparecerán para darle un estímulo durante los recordatorios</string>
   <string name="rmd_EPr_nagging_desc_false">Astrid no ofrecerá mensajes de insentivo</string>
   <string name="rmd_EPr_snooze_dialog_title">Diálogo de espera HH:MM</string>
@@ -961,7 +964,7 @@
   <string name="repeat_enabled">Repeticiones</string>
   <string name="repeat_every">Cada %d</string>
   <string name="repeat_interval_prompt">Intervalo de repetición</string>
-  <string name="repeat_never">Make repeating?</string>
+  <string name="repeat_never">¿Repetir?</string>
   <string name="repeat_dont">No repetir</string>
   <string-array name="repeat_interval_short">
     <item>día</item>
@@ -1127,7 +1130,7 @@
   <string name="PPW_color">Color del widget</string>
   <string name="PPW_enable_calendar">Mostrar eventos del calendario</string>
   <string name="PPW_disable_encouragements">Ocultar estímulos</string>
-  <string name="PPW_show_dates">Show due dates</string>
+  <string name="PPW_show_dates">Mostrar fechas límite</string>
   <string name="PPW_filter">Seleccionar filtro</string>
   <string name="PPW_due">Vence:</string>
   <string name="PPW_past_due">Vencido:</string>
@@ -1174,7 +1177,7 @@
   <string name="PPW_unlock_howto">¡Comparta listas con sus amigos! Desbloquee el Power Pack gratuito una vez que 3 amigos se registren en Astrid.</string>
   <string name="PPW_check_button">¡Obtenga gratis el Power Pack!</string>
   <string name="PPW_check_share_lists">¡Comparta listas!</string>
-  <string name="PPW_api_level">Sorry! This widget is only supported on Android 3.0 or higher.</string>
-  <string name="EPr_widget_enabled_title">Enable/Disable Widgets</string>
-  <string name="PPW_restart_for_enabled_state">You may need to restart your phone for this change to take effect.</string>
+  <string name="PPW_api_level">¡Lo sentimos! Éste widget sólo se puede utilizar en Android 3.0 o superior.</string>
+  <string name="EPr_widget_enabled_title">Activar/Desactivar widgets</string>
+  <string name="PPW_restart_for_enabled_state">Es probable que necesites reiniciar tu teléfono para que éste cambio tenga efecto.</string>
 </resources>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 163c94e04..6370e2491 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Connexion</string>
   <string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string>
   <string name="actfm_OLA_prompt">Veuillez vous connecter sur Google :</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copier la liste</string>
   <string name="actfm_feat_list_suffix">(Copier)</string>
   <string name="actfm_feat_list_cloning">Copie en cours...</string>
@@ -75,8 +77,8 @@
   <string name="actfm_https_enabled">HTTPS activé (plus lent)</string>
   <string name="actfm_https_disabled">HTTPS désactivé (plus rapide)</string>
   <string name="actfm_dual_sync_warning">Vous êtes actuellement synchronisé avec Google Task. La synchronisation avec les deux services peut provoquer des résultats inattendus. Êtes-vous sûr de vouloir vous synchroniser avec Astrid.com ?</string>
-  <string name="actfm_account_type">Account type</string>
-  <string name="actfm_account_info">Account info</string>
+  <string name="actfm_account_type">Type de compte</string>
+  <string name="actfm_account_info">Informations du compte</string>
   <string name="actfm_account_info_summary">Infos et options</string>
   <string name="account_type_title_not_logged_in">Inscrivez-vous gratuitement</string>
   <string name="account_type_summary_not_logged_in">Accédez à vos tâches en ligne, partagez vos listes et déléguez</string>
@@ -97,11 +99,11 @@
   <string name="backup_BPr_header">Sauvegardes</string>
   <string name="backup_BPr_group_status">Statut</string>
   <string name="backup_status_success">Dernière sauvegarde : \n%s</string>
-  <string name="backup_status_failed">Dernière sauvegarde échouée</string>
+  <string name="backup_status_failed">La dernière sauvegarde a échoué</string>
   <string name="backup_status_failed_subtitle">(appuyer pour afficher l\'erreur)</string>
   <string name="backup_status_never">Jamais sauvegardé !</string>
   <string name="backup_BPr_group_options">Options</string>
-  <string name="backup_BPr_auto_title">Sauvegardes automatiques</string>
+  <string name="backup_BPr_auto_title">Sauvegarde automatique</string>
   <string name="backup_BPr_auto_disabled">Sauvegardes automatiques désactivées</string>
   <string name="backup_BPr_auto_enabled">Une sauvegarde sera effectuée quotidiennement.</string>
   <string name="backup_BPr_cloud_already_logged_in">Vous possédez déjà une sauvegarde à distance sur Astrid.com !</string>
@@ -110,17 +112,17 @@
   <string name="backup_BAc_import">Importer des tâches</string>
   <string name="backup_BAc_export">Exporter des tâches</string>
   <string name="backup_BAc_cloud">Cliquez ici pour une sauvegarde à distance gratuite sur Astrid.com</string>
-  <string name="backup_TXI_error">Erreur d\'importation</string>
-  <string name="export_toast">Sauvegardé %1$s dans %2$s.</string>
-  <string name="export_toast_no_tasks">Pas de tâche à exporter.</string>
+  <string name="backup_TXI_error">Erreur lors de l\'importation</string>
+  <string name="export_toast">Sauvegarde de %1$s à %2$s</string>
+  <string name="export_toast_no_tasks">Pas de tâche à exporter</string>
   <string name="export_progress_title">Exportation en cours…</string>
-  <string name="import_summary_title">Restauration de l\'index</string>
+  <string name="import_summary_title">Résumé de la restoration</string>
   <string name="import_summary_message">Le fichier %1$s contenait %2$s.\n\n %3$s importées,\n %4$s existent déjà\n %5$s avaient des erreurs\n</string>
   <string name="import_progress_title">Importation en cours…</string>
   <string name="import_progress_read">Lecture de la tâche %d…</string>
   <string name="DLG_error_sdcard">Impossible d\'accéder au dossier : %s</string>
   <string name="DLG_error_sdcard_general">Impossible d\'accéder à la carte SD !</string>
-  <string name="import_file_prompt">Sélectionnez un fichier à restaurer</string>
+  <string name="import_file_prompt">Choisissez un fichier à restorer</string>
   <string name="app_name">Tâches d\'Astrid</string>
   <string name="read_permission_label">Permission d\'Astrid</string>
   <string name="read_permission_desc">lire les tâches, afficher les filtres de tâches</string>
@@ -153,7 +155,7 @@
   <string name="TLA_menu_search">Rechercher</string>
   <string name="TLA_menu_lists">Listes</string>
   <string name="TLA_menu_friends">Contacts</string>
-  <string name="TLA_menu_featured_lists">Featured Lists</string>
+  <string name="TLA_menu_featured_lists">Listes favorites</string>
   <string name="TLA_menu_suggestions">Suggestions</string>
   <string name="TLA_menu_settings">Comptes &amp; Paramètres</string>
   <string name="TLA_menu_support">Assistance</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Modifier</string>
   <string name="TAd_contextEditTask">Modifier la tâche</string>
   <string name="TAd_contextCopyTask">Copier la tâche</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Récupérer la tâche</string>
   <string name="TAd_contextPurgeTask">Purger la tâche</string>
   <string name="SSD_title">Tri et tâches cachées</string>
@@ -306,43 +309,43 @@
   <string name="EPr_share_astrid_summary">Partagez Astrid sur vos réseaux sociaux préférés</string>
   <string name="EPr_deactivated">désactivé</string>
   <string name="EPr_appearance_header">Apparence</string>
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
+  <string name="EPr_appearance_summary">Thèmes, gadgets, ligne de tâche, écran d\'édition</string>
   <string name="EPr_faq_title">FAQ</string>
   <string name="EPr_account_title">Compte : %s</string>
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
-  <string name="EPr_fontSize_title">Task list size</string>
+  <string name="EPr_support_summary">Didactitiel, FAQ, À propos</string>
+  <string name="EPr_fontSize_title">Taillede la liste de tâche</string>
   <string name="EPr_showSmartConfirmation_title">Montrer une confirmation pour les rappels intelligents</string>
   <string name="EPr_fontSize_desc">Taille de la police pour la page principale des listes</string>
-  <string name="EPr_showNotes_title">Afficher les notes des tâches</string>
-  <string name="EPr_beastMode_title">Personnaliser l\'écran de modification de tâches</string>
-  <string name="EPr_beastMode_desc">Personnaliser l\'agencement de l\'écran de modification de tâches</string>
+  <string name="EPr_showNotes_title">Afficher les notes de la tâche</string>
+  <string name="EPr_beastMode_title">Personnaliser l\'écran d\'édition de tâche</string>
+  <string name="EPr_beastMode_desc">Personnaliser la disposition de l\'écran d\'édition de tâche</string>
   <string name="EPr_beastMode_reset">Rétablir les valeurs par défaut</string>
-  <string name="EPr_showNotes_desc_disabled">Les notes seront affichées dans la barre d\'action rapide</string>
+  <string name="EPr_showNotes_desc_disabled">Les notes seront accessible depuis l\'écran d\'édition de tâche</string>
   <string name="EPr_showNotes_desc_enabled">Les notes seront toujours affichées</string>
-  <string name="EPr_compressTaskRows_title">Réduire la taille d\'une tâche</string>
+  <string name="EPr_compressTaskRows_title">Compresser la ligne de tâche</string>
   <string name="EPr_compressTaskRows_desc">Réduire la taille d\'une tâche pour s\'adapter au titre</string>
   <string name="EPr_fullTask_title">Voir le titre complet de la tâche</string>
   <string name="EPr_fullTask_desc_enabled">Le titre entier de la tâche sera montré</string>
   <string name="EPr_fullTask_desc_disabled">Les deux premières lignes du titre de la tâche seront montrées</string>
-  <string name="EPr_ideaAuto_title">Charger automatiquement l\'onglet idée</string>
-  <string name="EPr_ideaAuto_desc_enabled">L\'onglet d\'idées de recherches web sera affiché quand l\'onglet sera cliqué.</string>
-  <string name="EPr_ideaAuto_desc_disabled">L\'onglet d\'idées de recherches web ne sera affiché que lorsqu’il sera manuellement requis.</string>
-  <string name="EPr_task_row_style_title_simple">Row style: Simple</string>
-  <string name="EPr_task_row_style_title_legacy">Row style: Original</string>
-  <string name="EPr_task_row_style_summary_simple">Truncate title to one line with date and lists below</string>
-  <string name="EPr_task_row_style_summary_legacy">Truncate title to two lines with date on right</string>
-  <string name="EPr_theme_title">Apparence</string>
+  <string name="EPr_ideaAuto_title">Charger automatiquement l\'onglet d\'idées</string>
+  <string name="EPr_ideaAuto_desc_enabled">Les recherches web pour l\'onglet d\'idées seront effectuées quand vous cliquerez sur l\'onglet</string>
+  <string name="EPr_ideaAuto_desc_disabled">Les recherches web pour l\'onglet d\'idées seront effectuées quand vous le demanderez</string>
+  <string name="EPr_task_row_style_title_simple">Style de ligne : simple</string>
+  <string name="EPr_task_row_style_title_legacy">Style de ligne : original</string>
+  <string name="EPr_task_row_style_summary_simple">Tronquer le titre en une ligne avec la date et les listes en dessous</string>
+  <string name="EPr_task_row_style_summary_legacy">Tronquer le titre en deux lignes avec la date sur la droite</string>
+  <string name="EPr_theme_title">Thème de couleur</string>
   <string name="EPr_theme_desc">Actuellement : %s</string>
   <string name="EPr_theme_desc_unsupported">Ce paramètre requiert Android 2.0+.</string>
-  <string name="EPr_theme_widget_title">Apparence du widget</string>
-  <string name="EPr_taskRowPrefs_title">Apparance de la colonne des tâches.</string>
+  <string name="EPr_theme_widget_title">Thème de gadget</string>
+  <string name="EPr_taskRowPrefs_title">Style des lignes de tâche</string>
   <string name="EPr_use_contact_picker">Utiliser le selecteur de contacts.</string>
   <string name="EPr_use_contact_picker_desc_enabled">L\'option de sélection de contacts sera affiché dans la fenêtre d\'assignation des tâches.</string>
   <string name="EPr_use_contact_picker_desc_disabled">L\'option de sélection de contacts ne sera pas affichée.</string>
-  <string name="EPr_third_party_addons">Enable third party add-ons</string>
+  <string name="EPr_third_party_addons">Autoriser les greffons extérieurs</string>
   <string name="EPr_third_party_addons_desc_enabled">Les extensions tierces seront activées</string>
   <string name="EPr_third_party_addons_desc_disabled">Les extensions tierces seront désactivées</string>
-  <string name="EPr_ideas_tab_enabled">Task ideas</string>
+  <string name="EPr_ideas_tab_enabled">Idées pour la tâche</string>
   <string name="EPr_ideas_tab_description">Recevez des idées pour finir vos tâches</string>
   <string name="EPr_cal_end_or_start_at_due_time">Heure de l\'evènement</string>
   <string name="EPr_cal_end_at_due_time">Terminer les événements du calendrier à l\'échéance</string>
@@ -390,12 +393,12 @@
   <string name="EPr_manage_purge_deleted_message">Voulez vous vraiment purger toutes vos tâches supprimées ?\n\nCes tâches seront perdues pour toujours !</string>
   <string name="EPr_manage_purge_deleted_status">%d tâches purgées!</string>
   <string name="EPr_manage_purge_deleted_summary">Attention! Les tâches purgées ne peuvent pas être restaurées sans fichier de sauvegarde!</string>
-  <string name="EPr_manage_clear_all">Purger toutes les données</string>
+  <string name="EPr_manage_clear_all">Effacer toutes les données</string>
   <string name="EPr_manage_clear_all_message">Supprimer toutes les tâches et configuration?\n\nAttention: cela est irréversible!</string>
-  <string name="EPr_manage_delete_completed_gcal">Supprimer les évènements du calendrier pour les tâches complétées</string>
+  <string name="EPr_manage_delete_completed_gcal">Supprimer les entrées de calendrier des tâches terminées</string>
   <string name="EPr_manage_delete_completed_gcal_message">Voulez-vous réellement supprimer tous les évènements pour les tâches complétées?</string>
   <string name="EPr_manage_delete_completed_gcal_status">Supprimer %d évènements du calendrier.</string>
-  <string name="EPr_manage_delete_all_gcal">Supprimer tous les évènement du calendrier pour Tasks</string>
+  <string name="EPr_manage_delete_all_gcal">Supprimer toutes les entrées de calendrier des tâches</string>
   <string name="EPr_manage_delete_all_gcal_message">Voulez vous vraiment supprimer tous les évènement du calendrier pour Tasks</string>
   <string name="EPr_manage_delete_all_gcal_status">Supprimer %d évènements du calendrier.</string>
   <string name="AOA_title">Greffons</string>
@@ -404,10 +407,10 @@
   <string name="AOA_tab_available">Disponible</string>
   <string name="AOA_free">Gratuit</string>
   <string name="AOA_no_addons">Liste vide !</string>
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Astrid Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to send you notifications based on filter conditions. Requires Locale.</string>
+  <string name="AOA_ppack_title">Power Pack Astrid</string>
+  <string name="AOA_ppack_description">Aidez Astrid et augmentez votre productivité avec le Power Pack Astrid. Gadgets en 4x2 et 4x4 et utilisation de la voix. Montez en puissance aujourd\'hui !</string>
+  <string name="AOA_locale_title">Greffon Astrid de localisation</string>
+  <string name="AOA_locale_description">Autorise Astrid à utiliser l\'application de localisation pour vous envoyer des notifications en fonction de filtres. Nécessite la localisation</string>
   <string name="TWi_loading">Chargement…</string>
   <string name="WCA_title">Sélectionnez les tâches à afficher…</string>
   <string name="p_about">À propos d\'Astrid</string>
@@ -419,22 +422,22 @@
   <string name="task_killer_help_ok">Je n\'éliminerai pas Astrid !</string>
   <string name="marketplace_description">Astrid est le très aimé gestionnaire de tâches open-source, conçu pour vous faciliter la vie. Il intègre des rappels, des étiquettes, la synchronisation, un plugin Locale, un widget et plus encore.</string>
   <string name="DB_corrupted_title">Base de donnée corrompue</string>
-  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Astrid.</string>
+  <string name="DB_corrupted_body">Oh oh ! On dirait que vous avez une base de données corrompues. Si vous voyez souvent cette erreur, nous vous suggérons d\'effacer toutes vos données (Paramètres-&gt;Synchronisation et sauvegarde-&gt;Gérer les anciennes tâches-&gt;Effacer toutes les données) et restaurer vos tâches d\'une sauvegarde (Paramètres-&gt;Synchronisation et sauvegarde-&gt;Sauvegarde-&gt;Importer des tâches) dans Astrid</string>
   <string name="market_unavailable">Malheureusement le Play Store n\'est pas disponible sur votre système</string>
-  <string name="EPr_defaults_header">Paramètres par défaut de la tâche</string>
-  <string name="EPr_defaults_summary">Importance, due date, add to calendar</string>
-  <string name="EPr_default_urgency_title">Urgence par défaut</string>
+  <string name="EPr_defaults_header">Valeurs par défaut pour une nouvelle tâche</string>
+  <string name="EPr_defaults_summary">Priorité, échéance, ajout au calendrier</string>
+  <string name="EPr_default_urgency_title">Échéance par défaut</string>
   <string name="EPr_default_urgency_desc">Actuellement : %s</string>
-  <string name="EPr_default_importance_title">Priorité par défaut</string>
+  <string name="EPr_default_importance_title">Priorié par défaut</string>
   <string name="EPr_default_importance_desc">Actuellement : %s</string>
   <string name="EPr_default_hideUntil_title">Masquer par défaut jusqu\'à</string>
   <string name="EPr_default_hideUntil_desc">Actuellement : %s</string>
   <string name="EPr_default_reminders_title">Rappels par défaut</string>
   <string name="EPr_default_reminders_desc">Actuellement : %s</string>
-  <string name="EPr_default_addtocalendar_title">Ajouter au calendrier oar défaut.</string>
+  <string name="EPr_default_addtocalendar_title">Ajout au calendrier par défaut</string>
   <string name="EPr_default_addtocalendar_desc_disabled">Les nouvelles tâches ne vont pas créer d\'évènement dans Google Calendar</string>
   <string name="EPr_default_addtocalendar_desc">Les nouvelles tâches seront dans le calendrier \"%s\"</string>
-  <string name="EPr_default_reminders_mode_title">Sonnerie/Vibration par défaut</string>
+  <string name="EPr_default_reminders_mode_title">Type de sonnerie/vibration par défaut</string>
   <string name="EPr_default_reminders_mode_desc">Actuellement : %s</string>
   <string-array name="EPr_default_importance">
     <item>!!! (la plus haute)</item>
@@ -447,7 +450,7 @@
     <item>Aujourd\'hui</item>
     <item>Demain</item>
     <item>Après-demain</item>
-    <item>Semaine prochaine</item>
+    <item>La semaine prochaine</item>
   </string-array>
   <string-array name="EPr_default_hideUntil">
     <item>Ne pas masquer</item>
@@ -603,9 +606,9 @@
   <string name="CFC_opencrx_in_workspace_name">Dans l\'espace de travail...</string>
   <string name="CFC_opencrx_assigned_to_text">Attribué à : ?</string>
   <string name="CFC_opencrx_assigned_to_name">Attribué à...</string>
-  <string name="EPr_powerpack_header">Premium and misc. settings</string>
+  <string name="EPr_powerpack_header">Premium et réglages divers</string>
   <string name="EPr_powerpack_summary">Rappel des appels manqués, commande vocale et paramètres divers</string>
-  <string name="EPr_statistics_title">Anonymous usage stats</string>
+  <string name="EPr_statistics_title">Statistiques d\'utilisation anonymes</string>
   <string name="EPr_statistics_desc_disabled">Aucune donnée d\'utilisation ne sera signalée</string>
   <string name="EPr_statistics_desc_enabled">Aidez-nous à améliorer Astrid en envoyant des données d\'utilisation anonymes</string>
   <string name="speech_err_network">Problème de connexion réseau. La reconaissance vocale demande une connexion internet pour fonctionner.</string>
@@ -647,7 +650,7 @@
   <string name="file_err_show">Désolé, le système ne prend pas encore en charge ce type de fichier</string>
   <string name="file_dir_dialog_ok">Utiliser ce dossier</string>
   <string name="file_dir_dialog_default">Rétablir les valeurs par défaut</string>
-  <string name="p_files_dir">Premium downloads directory</string>
+  <string name="p_files_dir">Dossier de téléchargements premium</string>
   <string name="p_files_dir_desc">Les fichiers joints des tâches sont sauvegardés vers : %s</string>
   <string name="p_files_dir_desc_default">Dossier par défaut</string>
   <string name="billing_not_supported_title">Vous ne pouvez pas faire d\'achats</string>
@@ -711,14 +714,14 @@
   <string name="CFC_producteev_assigned_to_text">Attribué à : ?</string>
   <string name="CFC_producteev_assigned_to_name">Attribué à...</string>
   <string name="TEA_reminders_group_label">Rappels</string>
-  <string name="TEA_reminder_label">Remind me:</string>
+  <string name="TEA_reminder_label">Rappel moi :</string>
   <string name="TEA_reminder_due">... lorsque la tâche est échue</string>
   <string name="TEA_reminder_overdue">... lorsque la tâche est en retard</string>
   <string name="TEA_reminder_randomly">Une fois aléatoirement</string>
-  <string name="TEA_reminder_alarm_label">Ring/vibrate type:</string>
-  <string name="TEA_reminder_mode_once">Sonner une fois</string>
-  <string name="TEA_reminder_mode_five">Sonner cinq fois</string>
-  <string name="TEA_reminder_mode_nonstop">Sonner jusqu\'à ce que je l\'interrompe</string>
+  <string name="TEA_reminder_alarm_label">Type de sonnerie/vibration :</string>
+  <string name="TEA_reminder_mode_once">Sonne une fois</string>
+  <string name="TEA_reminder_mode_five">Sonne cing fois</string>
+  <string name="TEA_reminder_mode_nonstop">Sonne jusqu\'à désactivation</string>
   <string-array name="TEA_reminder_random">
     <item>Une heure</item>
     <item>Un jour</item>
@@ -759,13 +762,13 @@
   </string-array>
   <string name="rmd_EPr_alerts_header">Paramètres de rappel</string>
   <string name="rmd_EPr_alerts_summary">Heures silencieuses, options de délai, niveau d\'insistance</string>
-  <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
+  <string name="rmd_EPr_enabled_title">Activer les rappels ?</string>
   <string name="rmd_EPr_enabled_desc_true">Les rappels d\'Astrid sont activés (c\'est normal)</string>
   <string name="rmd_EPr_enabled_desc_false">Les rappels d\'Astrid n\' apparaîtront jamais sur votre téléphone</string>
-  <string name="rmd_EPr_quiet_hours_start_title">Début de période silencieuse</string>
-  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the Vibrate on alert setting</string>
+  <string name="rmd_EPr_quiet_hours_start_title">Début des heures silencieuses</string>
+  <string name="rmd_EPr_quiet_hours_start_desc">Les notifications seront silencieuses après %s.\nNote : les vibrations sont contrôlées par le paramètre Vibrations</string>
   <string name="rmd_EPr_quiet_hours_desc_none">Période silencieuse désactivée</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Fin de période silencieuse</string>
+  <string name="rmd_EPr_quiet_hours_end_title">Fin des heures silencieuses</string>
   <string name="rmd_EPr_quiet_hours_end_desc">Les notifications ne seront plus silencieuses à partir de %s</string>
   <string name="rmd_EPr_rmd_time_title">Rappel par défaut</string>
   <string name="rmd_EPr_rmd_time_desc">Les notifications pour les tâches sans échéances apparaîtront à %s</string>
@@ -773,19 +776,19 @@
   <string name="rmd_EPr_ringtone_desc_custom">La sonnerie personnalisée a été configurée</string>
   <string name="rmd_EPr_ringtone_desc_silent">Configurer la sonnerie en mode silencieux</string>
   <string name="rmd_EPr_ringtone_desc_default">La sonnerie par défaut sera utilisée</string>
-  <string name="rmd_EPr_persistent_title">Persistence de la notification</string>
+  <string name="rmd_EPr_persistent_title">Persistance de la notification</string>
   <string name="rmd_EPr_persistent_desc_true">Les notifications doivent être affichées séparément afin d\'être purgées</string>
   <string name="rmd_EPr_persistent_desc_false">Les notifications peuvent être purgées grâce au bouton « Tout purger »</string>
   <string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi sonneries</string>
   <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid va maximiser le volume de multiples anneaux rappels</string>
   <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid utilisera les réglages du système pour le volume</string>
-  <string name="rmd_EPr_vibrate_title">Vibrer lors des alertes.</string>
+  <string name="rmd_EPr_vibrate_title">Vibre lors d\'une alerte</string>
   <string name="rmd_EPr_vibrate_desc_true">Astrid vibrera lors de l\'envoi de notifications</string>
   <string name="rmd_EPr_vibrate_desc_false">Astrid ne vibrera pas lors de l\'envoi de notifications</string>
-  <string name="rmd_EPr_nagging_title">Encouragements Astrid</string>
+  <string name="rmd_EPr_nagging_title">Encouragements d\'Astrid</string>
   <string name="rmd_EPr_nagging_desc_true">Astrid s\'affichera afin de vous encourager lors des rappels</string>
   <string name="rmd_EPr_nagging_desc_false">Astrid ne vous donnera pas les messages d\'encouragements</string>
-  <string name="rmd_EPr_snooze_dialog_title">Dialogue de report HH:MM</string>
+  <string name="rmd_EPr_snooze_dialog_title">Info-bulle de report HH:MM</string>
   <string name="rmd_EPr_snooze_dialog_desc_true">Reporter en sélectionnant un nouvel horaire de report (HH:MM)</string>
   <string name="rmd_EPr_snooze_dialog_desc_false">Reporter en sélectionnant # jours/heures à reporter</string>
   <string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
@@ -961,7 +964,7 @@
   <string name="repeat_enabled">Répétitions</string>
   <string name="repeat_every">Tous les %d</string>
   <string name="repeat_interval_prompt">Interval de répétition</string>
-  <string name="repeat_never">Make repeating?</string>
+  <string name="repeat_never">Répéter?</string>
   <string name="repeat_dont">Ne pas répéter</string>
   <string-array name="repeat_interval_short">
     <item>j</item>
@@ -1089,20 +1092,20 @@
   <string name="EPr_voiceInputInstall_dlg">La reconnaissance vocale n\'est pas installé.\nVoulez-vous l\'installer depuis le market ?</string>
   <string name="EPr_voiceInputUnavailable_dlg">Malheureusement, la reconnaissance vocale n\'est pas disponible pour votre système.\nSi possible, faites une mise à jour vers Android 2.1 ou ultérieur.</string>
   <string name="EPr_marketUnavailable_dlg">Malheureusement, le market n\'est pas accessible sur votre système.\nSi possible, essayez de télécharger le module de reconnaissance vocale depuis une autre source.</string>
-  <string name="EPr_voiceInputEnabled_title">Voice input</string>
+  <string name="EPr_voiceInputEnabled_title">Entrée voix</string>
   <string name="EPr_voiceInputEnabled_desc_enabled">Le bouton de la reconnaissance vocale sera affiché sur la page d\'accueil</string>
   <string name="EPr_voiceInputEnabled_desc_disabled">Le bouton de la reconnaissance vocale ne sera pas affiché sur la page d\'accueil</string>
-  <string name="EPr_voiceInputCreatesTask_title">Créer directement les tâches</string>
+  <string name="EPr_voiceInputCreatesTask_title">Créer les tâches directement</string>
   <string name="EPr_voiceInputCreatesTask_desc_enabled">Les tâches seront crées automatiquement à partir de la reconnaissance vocale</string>
   <string name="EPr_voiceInputCreatesTask_desc_disabled">Editer le titre de la tâche après la reconnaissance vocale</string>
   <string name="EPr_voiceRemindersEnabled_title">Rappels vocaux</string>
   <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid donnera le nom de la tâche</string>
   <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid sonnera pendant les rappels</string>
-  <string name="EPr_voice_header">Paramètres de la reconnaissance vocale</string>
-  <string name="welcome_setting">Show tutorial</string>
+  <string name="EPr_voice_header">Paramètres de l\'entrée voix</string>
+  <string name="welcome_setting">Regarder le didactitiel</string>
   <string name="welcome_title_1">Bienvenue dans Astrid !</string>
   <string name="welcome_title_2">Créez des listes</string>
-  <string name="welcome_title_3">Switch between lists</string>
+  <string name="welcome_title_3">Changer de liste</string>
   <string name="welcome_title_4">Partagez des listes</string>
   <string name="welcome_title_5">Divisez les tâches</string>
   <string name="welcome_title_6">Apportez des détails</string>
@@ -1121,8 +1124,8 @@
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Premium 4x4</string>
   <string name="PPW_widget_v11_label">Astrid Premium défilant</string>
-  <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
-  <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
+  <string name="PPW_widget_custom_label">Lanceur personnalisé Astrid Premium</string>
+  <string name="PPW_widget_custom_launcherpro_label">Lanceur Pro Astrid Premium</string>
   <string name="PPW_configure_title">Configurer le widget</string>
   <string name="PPW_color">Couleur du widget</string>
   <string name="PPW_enable_calendar">Afficher les évènements de calendrier</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 8d7f92b60..5de8b6d08 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Accedi</string>
   <string name="actfm_GAA_title">Seleziona l\'account di Google che vuoi utilizzare:</string>
   <string name="actfm_OLA_prompt">Accedi, per piacere:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copia lista</string>
   <string name="actfm_feat_list_suffix">(Copia)</string>
   <string name="actfm_feat_list_cloning">Copia...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Modifica</string>
   <string name="TAd_contextEditTask">Modifica attività</string>
   <string name="TAd_contextCopyTask">Copia Attività</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Ripristina Attività</string>
   <string name="TAd_contextPurgeTask">Elimina Attività</string>
   <string name="SSD_title">Ordinamento e Attività Nascoste</string>
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index ae8ce8ef2..0de582fdf 100644
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">התחברות</string>
   <string name="actfm_GAA_title">בחר חשבון גוגל</string>
   <string name="actfm_OLA_prompt">אנא התחבר למערכת</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">העתקת רשימה</string>
   <string name="actfm_feat_list_suffix">(העתק)</string>
   <string name="actfm_feat_list_cloning">מעתיקה...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">עריכה</string>
   <string name="TAd_contextEditTask">עריכת משימה</string>
   <string name="TAd_contextCopyTask">העתק משימה</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">החזרת המשימה</string>
   <string name="TAd_contextPurgeTask">אַיֵּן משימה</string>
   <string name="SSD_title">מיון, תתי-משימות, ומשימות מוסתרות</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 42a840523..b10f79fdd 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
   <string name="actfm_OLA_prompt">ログインしてください:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">編集</string>
   <string name="TAd_contextEditTask">タスクを編集</string>
   <string name="TAd_contextCopyTask">タスクをコピー</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">元に戻す</string>
   <string name="TAd_contextPurgeTask">タスクを削除</string>
   <string name="SSD_title">並び順と表示項目</string>
@@ -398,7 +401,7 @@
   <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
   <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
   <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
-  <string name="AOA_title">" アドオン"</string>
+  <string name="AOA_title">アドオン</string>
   <string name="AOA_internal_author">Astrid Team</string>
   <string name="AOA_tab_installed">インストール済</string>
   <string name="AOA_tab_available">追加</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index bf1e0720b..e401be4ed 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">로그인</string>
   <string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string>
   <string name="actfm_OLA_prompt">로그인하세요:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">목록 복사하기</string>
   <string name="actfm_feat_list_suffix">(복사)</string>
   <string name="actfm_feat_list_cloning">복사중...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">편집</string>
   <string name="TAd_contextEditTask">일정 편집</string>
   <string name="TAd_contextCopyTask">일정 복사</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">일정 삭제 취소</string>
   <string name="TAd_contextPurgeTask">일정 비우기</string>
   <string name="SSD_title">정렬, 하위일정 및 숨김</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index a09f55dc9..63d928354 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Select the Google account you want to use:</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Rediger</string>
   <string name="TAd_contextEditTask">Rediger oppgave</string>
   <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Gjenopprett slettet oppgave</string>
   <string name="TAd_contextPurgeTask">Rens ut oppgave</string>
   <string name="SSD_title">Sortering og skjulte oppgaver</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index f82c13bb4..e58c8b278 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string>
   <string name="actfm_OLA_prompt">A.u.b. met Google verbinden:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Bewerken</string>
   <string name="TAd_contextEditTask">Taak bewerken</string>
   <string name="TAd_contextCopyTask">Taak kopiëren</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Taak herstellen</string>
   <string name="TAd_contextPurgeTask">Taak opruimen</string>
   <string name="SSD_title">Sorteren en verborgen taken</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 98eba5c31..556390512 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Zaloguj się</string>
   <string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string>
   <string name="actfm_OLA_prompt">Proszę połączyć się z Google:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Kopiuj listę</string>
   <string name="actfm_feat_list_suffix">(Kopiuj)</string>
   <string name="actfm_feat_list_cloning">Kopiowanie...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Edytuj</string>
   <string name="TAd_contextEditTask">Edytuj zadanie</string>
   <string name="TAd_contextCopyTask">Kopiuj zadanie</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Przywrócone zadanie</string>
   <string name="TAd_contextPurgeTask">Trwale usuń zadanie</string>
   <string name="SSD_title">Ukryte zadania i sortowanie</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 4cbf174eb..a98d29ff3 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Entrar</string>
   <string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string>
   <string name="actfm_OLA_prompt">Por favor conecte ao Google:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copiar lista</string>
   <string name="actfm_feat_list_suffix">(Cópia)</string>
   <string name="actfm_feat_list_cloning">Copiando...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Editar</string>
   <string name="TAd_contextEditTask">Editar tarefa</string>
   <string name="TAd_contextCopyTask">Copiar tarefa</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Restaurar tarefa</string>
   <string name="TAd_contextPurgeTask">Destruir tarefa</string>
   <string name="SSD_title">Ordenando e ocultando tarefas</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 2444bb5a4..e5adde895 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Select the Google account you want to use:</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Editar</string>
   <string name="TAd_contextEditTask">Editar Tarefa</string>
   <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Recuperar Tarefa</string>
   <string name="TAd_contextPurgeTask">Purge Task</string>
   <string name="SSD_title">Sorting and Hidden Tasks</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 51b601a52..840deeae8 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Войти</string>
   <string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
   <string name="actfm_OLA_prompt">Пожалуйста, войдите:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Копировать список</string>
   <string name="actfm_feat_list_suffix">(Копия)</string>
   <string name="actfm_feat_list_cloning">Копирование...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Правка</string>
   <string name="TAd_contextEditTask">Правка задачи</string>
   <string name="TAd_contextCopyTask">Копировать задачу</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Отменить удаление задачи</string>
   <string name="TAd_contextPurgeTask">Очистить задачу</string>
   <string name="SSD_title">Сортировка и скрытые задачи</string>
@@ -711,7 +714,7 @@
   <string name="CFC_producteev_assigned_to_text">Присвоено: ?</string>
   <string name="CFC_producteev_assigned_to_name">Присвоено ...</string>
   <string name="TEA_reminders_group_label">Напоминания</string>
-  <string name="TEA_reminder_label">Remind me:</string>
+  <string name="TEA_reminder_label">Напомнить мне:</string>
   <string name="TEA_reminder_due">… при наступлении срока задания</string>
   <string name="TEA_reminder_overdue">… при завершении намеченного времени</string>
   <string name="TEA_reminder_randomly">Случайно один раз</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index b4f1f872c..3835b94a2 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Logga in på Astrid.com</string>
   <string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string>
   <string name="actfm_OLA_prompt">Logga in:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Redigera</string>
   <string name="TAd_contextEditTask">Redigera uppgift</string>
   <string name="TAd_contextCopyTask">Kopiera uppgift</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Återställ raderad uppgift</string>
   <string name="TAd_contextPurgeTask">Rensa uppgift</string>
   <string name="SSD_title">Sortering och Dolda Uppgifter</string>
@@ -327,6 +330,7 @@
   <string name="EPr_ideaAuto_title">Ladda fliken Idéer automatiskt</string>
   <string name="EPr_ideaAuto_desc_enabled">Webbsökning till fliken Idéer utförs när du klickar på fliken</string>
   <string name="EPr_ideaAuto_desc_disabled">Webbsökning till fliken Idéer utförs manuellt</string>
+  <string name="EPr_task_row_style_title_simple">Row style: Simple</string>
   <string name="EPr_task_row_style_title_legacy">Row style: Original</string>
   <string name="EPr_task_row_style_summary_simple">Truncate title to one line with date and lists below</string>
   <string name="EPr_task_row_style_summary_legacy">Truncate title to two lines with date on right</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index c6202a0ed..2b3966337 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">Select the Google account you want to use:</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">แก้ไข</string>
   <string name="TAd_contextEditTask">แก้ไขงาน</string>
   <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">แผนงานที่ลบไม่ได้</string>
   <string name="TAd_contextPurgeTask">Purge Task</string>
   <string name="SSD_title">จัดเรียง และซ่อนแผนงาน</string>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index ef75d5c59..75643840a 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Oturum Aç</string>
   <string name="actfm_GAA_title">Kullanmak istediğiniz Google hesabını seçin:</string>
   <string name="actfm_OLA_prompt">Lütfen oturum açın:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Listeyi kopyala</string>
   <string name="actfm_feat_list_suffix">(Kopyala)</string>
   <string name="actfm_feat_list_cloning">Kopyalanıyor...</string>
@@ -75,8 +77,8 @@
   <string name="actfm_https_enabled">HTTPS etkin (yavaş)</string>
   <string name="actfm_https_disabled">HTTPS etkin değil (hızlı)</string>
   <string name="actfm_dual_sync_warning">Google Görevleri ile eşleştirme yapıyordunuz. Her iki hizmetle eşleştirme yapmanız istenmeyen sonuçlara sebep olabilir. Astrid.com ile eşleştirmek istediğinize emin misiniz?</string>
-  <string name="actfm_account_type">Account type</string>
-  <string name="actfm_account_info">Account info</string>
+  <string name="actfm_account_type">Hesap Türü</string>
+  <string name="actfm_account_info">Hesap Bilgisi</string>
   <string name="actfm_account_info_summary">Durum ve seçenekler</string>
   <string name="account_type_title_not_logged_in">Ücretsiz bir hesap için üye ol</string>
   <string name="account_type_summary_not_logged_in">Görevlerine çevrimiçi ulaş, listelerini paylaş ve atama yap</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">Düzenle</string>
   <string name="TAd_contextEditTask">Görevi Düzenle</string>
   <string name="TAd_contextCopyTask">Görevi Kopyala</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">Görevi Kurtar</string>
   <string name="TAd_contextPurgeTask">Görevi Temizle</string>
   <string name="SSD_title">Sınıflama, Altgörevler ve Gizli</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 41d9de459..0885d271e 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">选择你要使用的Google账户</string>
   <string name="actfm_OLA_prompt">连接至 Google：</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">编辑</string>
   <string name="TAd_contextEditTask">编辑任务</string>
   <string name="TAd_contextCopyTask">复制任务</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">未删除任务</string>
   <string name="TAd_contextPurgeTask">清除任务</string>
   <string name="SSD_title">排序和隐藏任务</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index bfac96fc6..c700901f8 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -63,6 +63,8 @@
   <string name="actfm_ALA_login_title">Sign In</string>
   <string name="actfm_GAA_title">選擇您要使用的Google帳戶：</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
   <string name="actfm_feat_list_clone">Copy list</string>
   <string name="actfm_feat_list_suffix">(Copy)</string>
   <string name="actfm_feat_list_cloning">Copying...</string>
@@ -189,6 +191,7 @@
   <string name="TAd_actionEditTask">編輯</string>
   <string name="TAd_contextEditTask">編輯工作</string>
   <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextDeleteTask">Delete Task</string>
   <string name="TAd_contextUndeleteTask">還原工作刪除</string>
   <string name="TAd_contextPurgeTask">清除工作</string>
   <string name="SSD_title">排序和隱藏工作</string>