From d4017d24fed27cd01a6241b64e7d92022e281640 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sun, 15 Dec 2013 16:54:41 +0100
Subject: [PATCH 1/3] Fix Ukrainian translation

Fixes issue 6101
---
 res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 00a92cc3d..fffb9b920 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -163,7 +163,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
     <!-- NEW: <string name="message_view_theme_action_light">Switch to light theme</string>-->
 
-    <string name="mark_as_unread_action">Відмітити як прочитаний</string>
+    <string name="mark_as_unread_action">Відмітити як непрочитаний</string>
     <string name="add_cc_bcc_action">Додати копію/приховану</string>
     <string name="read_receipt">Повідомлення про прочитання</string>
     <string name="read_receipt_enabled">Включити запит повідомлень про прочитання</string>

From b06e912b2071b022eac8a26f9df93c75e57366f1 Mon Sep 17 00:00:00 2001
From: Marcio Zomb13 <marciomusicultd@gmail.com>
Date: Mon, 11 Nov 2013 22:28:20 -0200
Subject: [PATCH 2/3] Update Brazilian Portuguese translation

---
 res/values-pt-rBR/strings.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3b29abd57..1b73a040a 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -868,7 +868,7 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="flagged_modifier"> - Favorito</string>
     <string name="unread_modifier"> - Não lido</string>
 
-    <string name="search_all_messages_title">Todas as mensagens</string>
+    <string name="search_all_messages_title">Todas as Mensagens</string>
     <string name="search_all_messages_detail">Todas as mensagens em pastas pesquisáveis</string>
 
     <string name="integrated_inbox_title">Entrada Unificada</string>
@@ -1032,18 +1032,16 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
         <item quantity="one">senha do servidor</item>
         <item quantity="other">senhas do servidor</item>
     </plurals>
-    <!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW:
+    <string name="settings_import_incoming_server">Servidor de entrada (<xliff:g id="hostname">%s</xliff:g>):</string>
+    <string name="settings_import_outgoing_server">Servidor de saída (<xliff:g id="hostname">%s</xliff:g>):</string>
     <plurals name="settings_import_setting_passwords">
-        <item quantity="one">Setting password…</item>
-        <item quantity="other">Setting passwords…</item>
+        <item quantity="one">Definindo senha…</item>
+        <item quantity="other">Definindo senhas…</item>
     </plurals>
-    -->
-    <!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>-->
-    <!-- NEW: <string name="activate_account_action">Activate</string>-->
+    <string name="settings_import_use_incoming_server_password">Usar a senha do servidor de entrada</string>
+    <string name="activate_account_action">Ativar</string>
 
-    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>-->
+    <string name="account_unavailable">A conta \"<xliff:g id="account">%s</xliff:g>\" está indisponível; verifique o armazenamento</string>
 
     <string name="settings_attachment_default_path">Salvar anexos para…</string>
     <string name="attachment_save_title">Salvar anexo</string>
@@ -1139,13 +1137,13 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="mark_all_as_read">Marcar todas como lidas</string>
 
     <string name="global_settings_colorize_missing_contact_pictures_label">Colorir contatos sem foto</string>
-    <!-- NEW: <string name="global_settings_colorize_missing_contact_pictures_summary">Colorize missing contact pictures</string>-->
+    <string name="global_settings_colorize_missing_contact_pictures_summary">Usar cores em contatos que não tiverem foto</string>
 
     <string name="global_settings_messageview_visible_refile_actions_title">Ações de mensagens visíveis</string>
     <string name="global_settings_messageview_visible_refile_actions_summary">Exibir as ações selecionadas na tela de mensagem</string>
 
-    <!-- NEW: <string name="loading_attachment">Loading attachment…</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_title_send">Sending message</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_title_save">Saving draft</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_message">Fetching attachment…</string>-->
+    <string name="loading_attachment">Carregando anexo…</string>
+    <string name="fetching_attachment_dialog_title_send">Enviando mensagem</string>
+    <string name="fetching_attachment_dialog_title_save">Salvando rascunho</string>
+    <string name="fetching_attachment_dialog_message">Buscando anexo…</string>
 </resources>

From 388ee8e27d4945a1baf766bdef06d224b77c862b Mon Sep 17 00:00:00 2001
From: Erkan <rk4an@users.noreply.github.com>
Date: Fri, 29 Nov 2013 06:51:51 +0100
Subject: [PATCH 3/3] Update French translation

---
 res/values-fr/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c10d7d021..0b3dcabc6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1163,13 +1163,13 @@ de plus</string>
     <string name="mark_all_as_read">Marquer tous comme lus</string>
 
     <string name="global_settings_colorize_missing_contact_pictures_label">Colorier les images de contact manquantes</string>
-    <!-- NEW: <string name="global_settings_colorize_missing_contact_pictures_summary">Colorize missing contact pictures</string>-->
+    <string name="global_settings_colorize_missing_contact_pictures_summary">Coloriser les images de contact manquantes</string>
 
     <string name="global_settings_messageview_visible_refile_actions_title">Actions disponibles dans les messages</string>
     <string name="global_settings_messageview_visible_refile_actions_summary">Afficher les actions séléctionnées dans le menu des messages</string>
 
-    <!-- NEW: <string name="loading_attachment">Loading attachment…</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_title_send">Sending message</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_title_save">Saving draft</string>-->
-    <!-- NEW: <string name="fetching_attachment_dialog_message">Fetching attachment…</string>-->
+    <string name="loading_attachment">Chargement pièce jointe…</string>
+    <string name="fetching_attachment_dialog_title_send">Envoi du message</string>
+    <string name="fetching_attachment_dialog_title_save">Enregistrement du brouillon</string>
+    <string name="fetching_attachment_dialog_message">Récupération pièce jointe…</string>
 </resources>