merging refs/remotes/origin/master into HEAD

res/values-ca/strings.xml

@@ -10,7 +10,7 @@
     <string name="app_revision_fmt">Informació de la revisió: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Fem servir les següents biblioteques de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_emoji_icons">Icones Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">Llegeix adjunts del correu</string>
     <string name="read_attachment_desc">Permet a aquesta aplicació que llegeixi els adjunts del correu.</string>
@@ -920,8 +920,8 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="count_search_title">Compta resultats cerca</string>
     <string name="count_search_summary">Apaga-ho perquè es mostri més ràpid</string>
 
-    <!-- NEW: <string name="hide_special_accounts_title">Hide special accounts</string>-->
+    <string name="hide_special_accounts_title">Amaga comptes especials</string>
-    <!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>-->
+    <string name="hide_special_accounts_summary">Amaga la bústia d\'entrada unificada i tots els missatges dels comptes</string>
 
     <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier">- Senyalat</string>

res/values-de/strings.xml

@@ -9,8 +9,8 @@
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Versionsinformationen: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <string name="app_libraries">Wir benutzen die folgenden externen Bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_emoji_icons">Emoji Bilder: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">Anlagen der Nachricht lesen</string>
     <string name="read_attachment_desc">Dieser Anwendung erlauben die Anlagen Ihrer Nachrichten zu lesen.</string>

res/values-pt-rBR/strings.xml

@@ -139,8 +139,7 @@
     <string name="status_sending">Enviando</string> <!-- Used in Outbox when a message is currently sending -->
 
     <string name="status_loading_more_failed">Repetindo carregamento de mensagens</string>
-
+    <string name="load_more_messages_fmt">Toque para ver mais <xliff:g id="messages_to_load">%d</xliff:g> msgs.</string>
-    <string name="load_more_messages_fmt">Toque para ver mais<xliff:g id="messages_to_load">%d</xliff:g> msgs.</string>
 
     <string name="abbrev_gigabytes">GB</string>
     <string name="abbrev_megabytes">MB</string>
@@ -200,10 +199,10 @@
     <string name="end_of_folder">Sem mais mensagens</string>
 
     <string name="accounts_welcome">
-Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código aberto para Android e é originalemente baseado no cliente de e-mail padrão do Android.
+Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código aberto para Android e é originalmente baseado no cliente de e-mail padrão do Android.
 \n
 \n\nK-9\'s recursor aprimorados incluídos:
-\n * Puchar e-mail usando IMAP IDLE
+\n * Puxar e-mail usando IMAP IDLE
 \n * Melhor performance
 \n * Reclassificação de mensagens
 \n * E-mails com assinaturas
@@ -661,7 +660,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="folder_settings_in_top_group_label">Mostrar no top group</string>
     <string name="folder_settings_in_top_group_summary">Mostrar perto do topo da lista de pastas</string>
 
-    <string name="folder_settings_folder_display_mode_label">Calsse de exibição para pasta</string>
+    <string name="folder_settings_folder_display_mode_label">Classe de exibição para pasta</string>
     <string name="folder_settings_folder_display_mode_normal">Nenhuma</string>
     <string name="folder_settings_folder_display_mode_first_class">Primeira Classe</string>
     <string name="folder_settings_folder_display_mode_second_class">Segunda Classe</string>
@@ -702,7 +701,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="account_settings_led_summary">Piscar LED quando chegar e-mail</string>
 
 
-    <string name="account_settings_servers">Configução de servidor</string>
+    <string name="account_settings_servers">Configuração de servidor</string>
 
     <string name="account_settings_composition_title">Opções para composição de uma mensagem</string>
     <string name="account_settings_composition_label">Composição padrão</string>
@@ -786,10 +785,10 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="account_clear_dlg_title">Limpar conta</string>
     <string name="account_clear_dlg_instructions_fmt">Todas as mensagens de \"<xliff:g id="account">%s</xliff:g>\" serão removidas do K-9 Mail, mas as configurações da conta serão mantidas.</string>
 
-    <string name="provider_note_live">Apenas algumas contas \"Plus\" incluem acesso POP
+    <string name="provider_note_live">Apenas algumas contas \"Plus\" incluem acesso POP,
-        permitindo este programa se conecte. Se não estiver conseguinto logar nela com seu
+        permitindo que este programa se conecte. Se não estiver conseguindo logar nela com seu
         endereço de e-mail e senha corretos, talvez você não tenha uma conta \"Plus\" paga.
-		Por favor, abra seu Web browser para conseguir acesso a estes tipos de contas.</string>
+        Por favor, abra seu Web browser para conseguir acesso a estes tipos de contas.</string>
 
     <string name="provider_note_yahoojp">Se desejar utilizar POP3 para este provedor, você deverá permitir o uso deste na página de configurações de se e-mail Yahoo.</string>
 
@@ -822,7 +821,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
 
 
 
-    <string name="account_settings_signature__location_label">Loca da Assinatura</string>
+    <string name="account_settings_signature__location_label">Local da Assinatura</string>
     <string name="account_settings_signature__location_before_quoted_text">Antes de escrever o texto</string>
     <string name="account_settings_signature__location_after_quoted_text">Depois do texto escrito</string>
     <string name="setting_theme_dark">Escuro</string>
@@ -868,7 +867,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="batch_delete_op">Excluir selecionados</string>
     <string name="batch_mark_read_op">Marcar selecionados como lidos</string>
     <string name="batch_mark_unread_op">Marcar selecionados como não lidos</string>
-    <string name="batch_flag_op">Incuir estrela para selecionados</string>
+    <string name="batch_flag_op">Incluir estrela para selecionados</string>
     <string name="batch_unflag_op">Remover estrela dos selecionados</string>
     <string name="batch_archive_op">Mover selecionados para arquivo</string>
     <string name="batch_spam_op">Mover selecionados para Spam</string>
@@ -918,7 +917,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>-->
 
     <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
-    <string name="flagged_modifier"> - Favoritado</string>
+    <string name="flagged_modifier"> - Favorito</string>
     <string name="unread_modifier"> - Não lido</string>
 
     <string name="search_all_messages_title">Todas as mensagens</string>
@@ -940,7 +939,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="remote_control_label">Controle remoto para K-9 Mail</string>
     <string name="remote_control_desc">Permitir esta aplicação controlar atividades e configurações do K-9 Mail.</string>
 
-    <string name="font_size_settings_title">Tamanho da fornte</string>
+    <string name="font_size_settings_title">Tamanho da fonte</string>
     <string name="font_size_settings_description">Configurar tamanho da fonte</string>
 
     <string name="font_size_account_list">Lista de contas</string>

res/values-sv/strings.xml

@@ -3,14 +3,14 @@
     <string name="app_name">K-9 E-post</string>
     <string name="beta_app_name">K-9 E-post BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
-    <!-- NEW: <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>-->
+    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Vissa delar Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
-    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
+    <string name="app_license">Licensierat under Apache-licensen, version 2.0.</string>
     <string name="app_authors_fmt">Upphovsmän: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisionsinformation: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <string name="app_libraries">Vi använder följande tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_emoji_icons">Emoji-ikoner: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">Läs bilagor</string>
     <string name="read_attachment_desc">Tillåter denna applikation att läsa bifogade filer.</string>
@@ -42,15 +42,15 @@
     <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
 
     <string name="status_next_poll">\u0020(Nästa kontroll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
+    <string name="status_syncing_off">\u0020(Synk avaktiverat)</string>
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Nästa</string> <!-- Used as part of a multi-step process -->
-    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">Föregående</string> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Avbryt</string>
     <string name="send_action">Skicka</string>
-    <!-- NEW: <string name="send_again_action">Send Again</string>-->
+    <string name="send_again_action">Skicka igen</string>
     <string name="select_action">Markera</string>
     <string name="deselect_action">Avmarkera</string>
     <string name="reply_action">Svara</string>
@@ -118,7 +118,7 @@
     <string name="dump_settings_action">Dumpa inställningar</string>
     <string name="empty_trash_action">Töm papperskorg</string>
     <string name="expunge_action">Utplåna</string>
-    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
+    <string name="clear_local_folder_action">Rensa lokalt lagrade meddelanden</string>
     <string name="set_sort_action">Välj sortering</string>
     <string name="reverse_sort_action">Omvänd sortering</string>
     <string name="about_action">Om</string>
@@ -128,7 +128,7 @@
     <string name="folder_context_menu_title">Mappinställningar</string>
 
     <string name="general_no_subject">(Inget ämne)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Inget datum</string>
     <string name="general_no_sender">Ingen avsändare</string>
     <string name="status_loading">Kontrollerar</string>
     <string name="status_loading_folder">(Kontrollerar <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -260,7 +260,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="message_compose_content_hint">Meddelandetext</string>
     <string name="message_compose_quote_header_separator">-------- Originalmeddelande --------</string>
     <string name="message_compose_quote_header_subject">Ämne:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">Skickat:</string>
     <string name="message_compose_quote_header_from">Från:</string>
     <string name="message_compose_quote_header_to">Till:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -324,14 +324,14 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_checkbox_summary">Visa alltid checkboxar för flerval</string>
     <string name="global_settings_touchable_label">Touch-vänlig vy</string>
     <string name="global_settings_touchable_summary">Rymligare listobjekt med förhandsgranskningar</string>
-    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <string name="global_settings_preview_lines_label">Förhandsgranska rader</string>
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <string name="global_settings_show_correspondent_names_label">Visa korrespondensnamn</string>
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <string name="global_settings_show_correspondent_names_summary">Visa namn på korrespondens hellre än e-post-adresser</string>
-    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
+    <string name="global_settings_show_contact_name_label">Visa kontaktnamn</string>
-    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
+    <string name="global_settings_show_contact_name_summary">Använd avsändarnamn ifrån kontakter när tillgängligt</string>
-    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
+    <string name="global_settings_registered_name_color_label">Färglägg kontakter</string>
-    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
+    <string name="global_settings_registered_name_color_default">Färglägg inte namn i kontaktlistan</string>
-    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
+    <string name="global_settings_registered_name_color_changed">Färglägg namn i kontaktlistan</string>
 
     <string name="global_settings_messageview_fixedwidth_label">Teckensnitt med fast bredd</string>
     <string name="global_settings_messageview_fixedwidth_summary">Använd ett teckensnitt med fast bredd för att visa brev med enbart text</string>
@@ -349,10 +349,10 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_privacy_mode_summary">Visa inte e-postens ämnen i notifieringsytan när systemet är låst</string>
 
 
-    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <string name="quiet_time">Tyst tid</string>
-    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <string name="quiet_time_description">Avaktivera ringsignaler, vibration och blinkande på natten</string>
-    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <string name="quiet_time_starts">Tyst tid börjar</string>
-    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+    <string name="quiet_time_ends">Tyst tid slutar</string>
 
 
     <string name="account_setup_basics_title">Konfigurera ett nytt konto</string>
@@ -369,8 +369,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_check_settings_retr_info_msg">Hämtar kontoinformation\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Kontrollerar inställningar för inkommande server\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Kontrollerar inställningar för utgående server\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <string name="account_setup_check_settings_authenticate">Authentiserar\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
+    <string name="account_setup_check_settings_fetch">Hämtar kontoinställningar\u2026</string>
     <string name="account_setup_check_settings_finishing_msg">Avslutar\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
 
@@ -416,10 +416,10 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_incoming_save_all_headers_title">Nerladdning av e-post-huvuden</string>
     <string name="account_setup_incoming_save_all_headers_label">Spara alla huvuden lokalt</string>
 
-    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <string name="local_storage_provider_external_label">Extern lagring (SD-kort)</string>
-    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <string name="local_storage_provider_internal_label">Vanlig intern lagring</string>
-    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s ytterligare intern lagring</string>
-    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+    <string name="local_storage_provider_label">Lagringsplacering</string>
 
     <string name="account_setup_expunge_policy_label">Utplåna e-post</string>
     <string name="account_setup_expunge_policy_immediately">Direkt efter radering eller flytt</string>
@@ -516,7 +516,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_options_mail_display_count_250">250 brev</string>
     <string name="account_setup_options_mail_display_count_500">500 brev</string>
     <string name="account_setup_options_mail_display_count_1000">1000 brev</string>
-    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+    <string name="account_setup_options_mail_display_count_all">alla brev</string>
 
 
     <string name="move_copy_cannot_copy_unsynced_message">Kan inte kopiera eller flytta ett brev som inte är synkroniserat med servern</string>
@@ -528,7 +528,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_failed_dlg_edit_details_action">Redigera detaljer</string>
     <string name="account_setup_failed_dlg_continue_action">Fortsätt</string>
 
-    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
+    <string name="account_settings_push_advanced_title">Advancerat</string>
     <string name="account_settings_title_fmt">Allmänna inställningar</string>
     <string name="account_settings_default">Standardkonto</string>
     <string name="account_settings_default_label">Standardkonto</string>
@@ -543,8 +543,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_notify_self_summary">Notifiera även för e-post som jag själv har skickat</string>
     <string name="account_settings_notification_opens_unread_label">Notifieringar öppnar oläst e-post</string>
     <string name="account_settings_notification_opens_unread_summary">Letar efter oläst e-post när notifieringen öppnas</string>
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <string name="account_settings_notification_unread_count_label">Visa antal olästa</string>
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
+    <string name="account_settings_notification_unread_count_summary">Visar antalet olästa brev i notifieringsytan.</string>
 
     <string name="account_settings_hide_buttons_label">Scrolla navigationsknappar</string>
     <string name="account_settings_hide_buttons_never">Aldrig</string>
@@ -565,16 +565,16 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_reply_after_quote_label">Svar efter citat</string>
     <string name="account_settings_reply_after_quote_summary">Vid svar på e-post placeras originalmeddelandet ovanför ditt svar.</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <string name="account_settings_message_format_label">Brevformat</string>
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <string name="account_settings_message_format_text">Ren text (bilder och formatering tas bort)</string>
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+    <string name="account_settings_message_format_html">HTML (bilder och formatering behålls)</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <string name="account_settings_quote_style_label">Citationsstil vid svar</string>
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <string name="account_settings_quote_style_prefix">Prefix (som Gmail, Pine)</string>
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_quote_style_header">Header (som Outlook, Yahoo!, Hotmail)</string>
 
-    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
+    <string name="account_settings_general_title">Allmänna inställningar</string>
-    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_display_prefs_title">Utseende</string>
     <string name="account_settings_sync">Mappsynkronisering</string>
     <string name="account_settings_folders">Mappar</string>
     <string name="account_settings_message_lists">Lista e-post</string>
@@ -590,7 +590,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_mail_check_frequency_label">Frekvens för att kontrollera mappar</string>
     <string name="account_settings_second_class_check_frequency_label">Frekvens för kontroll av andra klass</string>
 
-    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+    <string name="account_settings_storage_title">Lagring</string>
 
 
     <string name="account_settings_color_label">Kontofärg</string>
@@ -702,8 +702,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_vibrate_pattern_5">mönster 5</string>
     <string name="account_settings_vibrate_times">Antal vibrationer</string>
     <string name="account_settings_ringtone">Ringsignal för ny e-post</string>
-    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
+    <string name="account_settings_led_label">Blinka LED</string>
-    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+    <string name="account_settings_led_summary">Blinka LED när det kommer ny e-post</string>
 
 
     <string name="account_settings_servers">Serverinställningar</string>
@@ -751,7 +751,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="choose_identity">Välj identitet</string>
     <string name="choose_identity_title">Välj identitet</string>
     <string name="choose_account_title">Välj konto/identitet</string>
-    <!-- NEW: <string name="send_as">Send as</string>-->
+    <string name="send_as">Skicka som</string>
 
 
     <string name="no_identities">Gå till Kontoinställningar -&gt; Hantera identiteter för att skapa en identitet</string>
@@ -785,7 +785,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas från K-9 E-post.</string>
 
     <string name="account_recreate_dlg_title">Återskapa konto</string>
-    <string name="account_recreate_dlg_instructions_fmt">All data för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
+    <string name="account_recreate_dlg_instructions_fmt">Alla meddelanden, bifogade filer, mappar och inställningar mapp för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
 
     <string name="account_clear_dlg_title">Rensa konto</string>
     <string name="account_clear_dlg_instructions_fmt">All e-post i \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
@@ -795,7 +795,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
         med din korrekta adress och lösenord så kanske du inte har ett betalt
         \"Plus\"-konto. Vänligen starta webbläsaren för att komma åt dessa konton.</string>
 
-    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+    <string name="provider_note_yahoojp">Om du vill använda POP3 med denna leverantör måste du välja att tillåta POP3 på inställningssidan för Yahoo!.</string>
 
     <string name="account_setup_failed_dlg_invalid_certificate_title">Okänt Certifikat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptera nyckel</string>
@@ -831,22 +831,22 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_signature__location_after_quoted_text">Efter citerad text</string>
     <string name="setting_theme_dark">Mörk</string>
     <string name="setting_theme_light">Ljus</string>
-    <!-- NEW: <string name="display_preferences">Display</string>-->
+    <string name="display_preferences">Utseende</string>
-    <!-- NEW: <string name="global_preferences">Global</string>-->
+    <string name="global_preferences">Globala inställningar</string>
-    <string name="debug_preferences">Debugging</string>
+    <string name="debug_preferences">Avlusning</string>
-    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
+    <string name="privacy_preferences">Sekretess</string>
-    <!-- NEW: <string name="network_preferences">Network</string>-->
+    <string name="network_preferences">Nätverk</string>
-    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
+    <string name="interaction_preferences">Interaktion</string>
     <string name="accountlist_preferences">Kontolista</string>
     <string name="messagelist_preferences">E-post-listor</string>
     <string name="messageview_preferences">Brev</string>
     <string name="settings_theme_label">Tema</string>
     <string name="settings_language_label">Språk</string>
 
-    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
+    <string name="settings_messageview_mobile_layout_label">En-kolumns-layout</string>
-    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
+    <string name="settings_messageview_mobile_layout_summary">Formatera om HTML-brev för mindre skärmar</string>
-    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
+    <string name="settings_messageview_zoom_controls_label">Kontroll av zoom</string>
-    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+    <string name="settings_messageview_zoom_controls_summary">Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det</string>
 
 
 
@@ -900,8 +900,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="gestures_title">Gester</string>
     <string name="gestures_summary">Acceptera gestkontroll</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <string name="compact_layouts_title">Komprimera vyer</string>
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_summary">Tryck ihop vyer för att kunna visa mer på varje sida</string>
 
     <string name="volume_navigation_title">Volym upp/ner-navigering</string>
     <string name="volume_navigation_summary">Växla mellan val med hjälp av volymkontrollerna</string>
@@ -961,7 +961,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="font_size_message_list_subject">Ämne</string>
     <string name="font_size_message_list_sender">Avsändare</string>
     <string name="font_size_message_list_date">Datum</string>
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+    <string name="font_size_message_list_preview">Förhandsvisning</string>
 
     <string name="font_size_message_view">E-post-vy</string>
     <string name="font_size_message_view_sender">Avsändare</string>
@@ -1027,7 +1027,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
 
     <string name="debug_logging_enabled">Debug-loggning till Androids loggsystem är aktiverat</string>
 
-    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <string name="messagelist_sent_to_me_sigil">»</string>
-    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <string name="messagelist_sent_cc_me_sigil">›</string>
-    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+    <string name="error_unable_to_connect">Kan inte ansluta.</string>
 </resources>

src/com/fsck/k9/K9.java

@@ -245,6 +245,13 @@ public class K9 extends Application {
      */
     public static final int MAX_ATTACHMENT_DOWNLOAD_SIZE = (128 * 1024 * 1024);
 
+
+    /* How many times should K-9 try to deliver a message before giving up
+     * until the app is killed and restarted
+     */
+
+    public static int MAX_SEND_ATTEMPTS = 5;
+
     /**
      * Max time (in millis) the wake lock will be held for when background sync is happening
      */
@@ -321,11 +328,7 @@ public class K9 extends Application {
 
     }
 
-    public static void setServicesEnabled(Context context, Integer wakeLockId) {
+    private static void setServicesEnabled(Context context, boolean enabled, Integer wakeLockId) {
-        setServicesEnabled(context, Preferences.getPreferences(context).getAvailableAccounts().size() > 0, wakeLockId);
-    }
-
-    public static void setServicesEnabled(Context context, boolean enabled, Integer wakeLockId) {
 
         PackageManager pm = context.getPackageManager();
 

src/com/fsck/k9/activity/setup/AccountSettings.java

@@ -857,7 +857,7 @@ public class AccountSettings extends K9PreferenceActivity {
             while (iter.hasNext())
             {
                 Folder folder = iter.next();
-                if (mAccount.getOutboxFolderName().equals(folder.getName()))
+                if (mAccount.getOutboxFolderName().equalsIgnoreCase(folder.getName()))
                 {
                     iter.remove();
                 }

src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java

@@ -29,7 +29,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
     private static final String EXTRA_MAKE_DEFAULT = "makeDefault";
 
     private static final int smtpPorts[] = {
-        25, 465, 465, 25, 25
+        587, 465, 465, 587, 587
     };
 
     private static final String smtpSchemes[] = {

src/com/fsck/k9/controller/MessagingController.java

@@ -1787,7 +1787,11 @@ public class MessagingController implements Runnable {
                 rootCause = nextCause;
             }
         } while (nextCause != null);
-        return rootCause.getMessage();
+        if (rootCause instanceof MessagingException) {
+            return rootCause.getMessage();
+        } else {
+            return rootCause.toString();
+        }
     }
 
     private void queuePendingCommand(Account account, PendingCommand command) {
@@ -2889,15 +2893,21 @@ public class MessagingController implements Runnable {
         notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(), notif);
     }
 
-    private void notifySendFailed(Account account, Exception lastFailure) {
+    private void notifySendTempFailed(Account account, Exception lastFailure) {
+        notifySendFailed(account, lastFailure, account.getOutboxFolderName());
+    }
+    private void notifySendPermFailed(Account account, Exception lastFailure) {
+        notifySendFailed(account, lastFailure, account.getDraftsFolderName());
+    }
+    private void notifySendFailed(Account account, Exception lastFailure, String openFolder) {
         NotificationManager notifMgr = (NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
         Notification notif = new Notification(R.drawable.stat_notify_email_generic, mApplication.getString(R.string.send_failure_subject), System.currentTimeMillis());
 
-        Intent i = FolderList.actionHandleNotification(mApplication, account, account.getOutboxFolderName());
+        Intent i = FolderList.actionHandleNotification(mApplication, account, openFolder);
 
         PendingIntent pi = PendingIntent.getActivity(mApplication, 0, i, 0);
 
-        notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.send_failure_subject), lastFailure.getMessage(), pi);
+        notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.send_failure_subject), getRootCauseMessage(lastFailure), pi);
 
         configureNotification(notif,  null, null, K9.NOTIFICATION_LED_SENDING_FAILURE_COLOR, K9.NOTIFICATION_LED_BLINK_FAST, true);
         notif.flags |= Notification.FLAG_AUTO_CANCEL;
@@ -3005,6 +3015,14 @@ public class MessagingController implements Runnable {
                     if (K9.DEBUG)
                         Log.i(K9.LOG_TAG, "Send count for message " + message.getUid() + " is " + count.get());
 
+                    if (count.incrementAndGet() > K9.MAX_SEND_ATTEMPTS) {
+                        Log.e(K9.LOG_TAG, "Send count for message " + message.getUid() + " can't be delivered after "+ K9.MAX_SEND_ATTEMPTS + " attempts.  Giving up until the user restarts the device");
+                        notifySendTempFailed(account, new MessagingException(message.getSubject()));
+                        continue;
+                    }
+
+
+
                     localFolder.fetch(new Message[] { message }, fp, null);
                     try {
                         message.setFlag(Flag.X_SEND_IN_PROGRESS, true);
@@ -3039,6 +3057,15 @@ public class MessagingController implements Runnable {
                         }
 
                     } catch (Exception e) {
+                        // 5.x.x errors from the SMTP server are "PERMFAIL"
+                        // move the message over to drafts rather than leaving it in the outbox
+                        // This is a complete hack, but is worlds better than the previous
+                        // "don't even bother" functionality
+                        if (getRootCauseMessage(e).startsWith("5")) {
+                            localFolder.moveMessages(new Message[] { message }, (LocalFolder) localStore.getFolder(account.getDraftsFolderName()));
+                        } else {
+                        }
+
                         message.setFlag(Flag.X_SEND_FAILED, true);
                         Log.e(K9.LOG_TAG, "Failed to send message", e);
                         for (MessagingListener l : getListeners()) {
@@ -3058,7 +3085,11 @@ public class MessagingController implements Runnable {
                 l.sendPendingMessagesCompleted(account);
             }
             if (lastFailure != null) {
-                notifySendFailed(account, lastFailure);
+                if (getRootCauseMessage(lastFailure).startsWith("5")) {
+                    notifySendPermFailed(account, lastFailure);
+                } else {
+                    notifySendTempFailed(account, lastFailure);
+                }
             }
         } catch (UnavailableStorageException e) {
             Log.i(K9.LOG_TAG, "Failed to send pending messages because storage is not available - trying again later.");

src/com/fsck/k9/mail/store/StorageManager.java

@@ -20,7 +20,6 @@ import android.util.Log;
 
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
-import com.fsck.k9.service.MailService;
 
 /**
  * Manager for different {@link StorageProvider} -classes that abstract access
@@ -659,6 +658,8 @@ public class StorageManager {
         sync.writeLock.lock();
         sync.unmounting = false;
         sync.writeLock.unlock();
+
+        K9.setServicesEnabled(K9.app);
     }
 
     /**
@@ -684,7 +685,7 @@ public class StorageManager {
         }
 
         // XXX we should reset mail service ONLY if there are accounts using the storage (this is not done in a regular listener because it has to be invoked afterward)
-        MailService.actionReset(mApplication, null);
+        K9.setServicesEnabled(K9.app);
     }
 
     /**