moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-11 12:40:22 -05:00
Code Issues Releases Wiki Activity

Merge of remote branch 'origin/master' into ms-eas

Browse Source
This commit is contained in:
wongk 2012-05-09 16:56:07 -04:00
commit 8d359ad4aa
78 changed files with 6360 additions and 920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="15012" android:versionCode="15016"
android:versionName="4.113" package="com.fsck.k9" android:versionName="4.117" package="com.fsck.k9"
> >
<uses-sdk <uses-sdk
android:minSdkVersion="7" android:minSdkVersion="7"
@ -281,7 +281,10 @@
android:name="com.fsck.k9.activity.AccessibleEmailContentActivity" android:name="com.fsck.k9.activity.AccessibleEmailContentActivity"
> >
</activity> </activity>
<activity android:name="com.fsck.k9.activity.EmailAddressList"
android:configChanges="locale"
>
</activity>
<receiver android:name="com.fsck.k9.service.BootReceiver" <receiver android:name="com.fsck.k9.service.BootReceiver"
android:enabled="true" android:enabled="true"
> >

2
build.xml
View File

@ -179,7 +179,7 @@
</target> </target>
<target name="astyle"> <target name="astyle">
<exec executable="astyle" failonerror="true"> <exec executable="astyle" failonerror="true">
<arg line="--style=java --indent=spaces=4 --brackets=attach --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java'"/> <arg line="--style=java --indent=spaces=4 --indent-switches --max-instatement-indent=4 --brackets=attach --add-brackets --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java' 'tests/src/com/fsck/k9/*.java'"/>
</exec> </exec>
</target> </target>
<target name="help"> <target name="help">

1720
images/drawable-src/ic_button_archive.ai Normal file
View File

File diff suppressed because one or more lines are too long

BIN
images/drawable-src/ic_menu_envelope.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
images/drawable-src/ic_menu_reply_receipt.psd Normal file
View File

Binary file not shown.

7
k9mail.iml
View File

@ -20,6 +20,10 @@
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" /> <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
<option name="GENERATE_UNSIGNED_APK" value="false" /> <option name="GENERATE_UNSIGNED_APK" value="false" />
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" /> <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
<option name="PACK_TEST_CODE" value="false" />
<option name="RUN_PROGUARD" value="false" />
<option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
<resOverlayFolders />
</configuration> </configuration>
</facet> </facet>
</component> </component>
@ -31,7 +35,6 @@
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
</content> </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
@ -99,7 +102,7 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Android 2.3.1 Platform" level="application" /> <orderEntry type="inheritedJdk" />
</component> </component>
</module> </module>

BIN
res/drawable-hdpi/ic_button_archive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
res/drawable-hdpi/ic_menu_reply_receipt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
res/drawable/ic_button_archive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
res/drawable/ic_menu_reply_receipt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

13
res/layout/email_address_list.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ListView
android:id="@+id/android:list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
</LinearLayout>

9
res/layout/email_address_list_item.xml Executable file
View File

@ -0,0 +1,9 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
android:paddingLeft="6dip"
android:minHeight="?android:attr/listPreferredItemHeight"
/>

14
res/layout/message_list_batch_buttons.xml
View File

@ -26,6 +26,20 @@
android:layout_weight="1" android:layout_weight="1"
android:src="@drawable/ic_button_delete" android:src="@drawable/ic_button_delete"
/> />
<ImageButton
android:id="@+id/batch_archive_button"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"
android:src="@drawable/ic_button_archive"
/>
<ImageButton
android:id="@+id/batch_move_button"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"
android:src="@drawable/ic_button_move"
/>
<ImageButton <ImageButton
android:id="@+id/batch_flag_button" android:id="@+id/batch_flag_button"
android:layout_width="0dip" android:layout_width="0dip"

5
res/menu/message_compose_option.xml
View File

@ -32,8 +32,9 @@
/> />
<item <item
android:id="@+id/read_receipt" android:id="@+id/read_receipt"
android:alphabeticShortcut="r" android:alphabeticShortcut="r"
android:title="@string/read_receipt" android:title="@string/read_receipt"
android:icon="@drawable/ic_menu_reply_receipt"
/> />
<item <item
android:id="@+id/add_attachment_image" android:id="@+id/add_attachment_image"

2
res/values-ca/strings.xml
View File

@ -233,8 +233,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="debug_enable_sensitive_logging_title">Registra info sensible</string> <string name="debug_enable_sensitive_logging_title">Registra info sensible</string>
<string name="debug_enable_sensitive_logging_summary">Pot mostrar les contrasenyes en els registres.</string> <string name="debug_enable_sensitive_logging_summary">Pot mostrar les contrasenyes en els registres.</string>
<string name="message_header_mua">K-9 Mail per Android</string>
<string name="combined_inbox_title">Tot el correu</string> <string name="combined_inbox_title">Tot el correu</string>
<string name="combined_inbox_label">Missatges recents de tots els comptes</string> <string name="combined_inbox_label">Missatges recents de tots els comptes</string>
<string name="combined_inbox_list_title">Tot el correu de la Bústia d’entrada</string> <string name="combined_inbox_list_title">Tot el correu de la Bústia d’entrada</string>

2
res/values-cs/strings.xml
View File

@ -239,8 +239,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="debug_enable_sensitive_logging_title">Záznam citlivých informací</string> <string name="debug_enable_sensitive_logging_title">Záznam citlivých informací</string>
<string name="debug_enable_sensitive_logging_summary">V záznamech mohou být zobrazena hesla</string> <string name="debug_enable_sensitive_logging_summary">V záznamech mohou být zobrazena hesla</string>
<string name="message_header_mua">K-9 Mail pro Android</string>
<string name="combined_inbox_title">Veškerá pošta</string> <string name="combined_inbox_title">Veškerá pošta</string>
<string name="combined_inbox_label">Poslední zprávy ze všech účtů</string> <string name="combined_inbox_label">Poslední zprávy ze všech účtů</string>
<string name="combined_inbox_list_title">Veškerá doručená pošta</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Veškerá doručená pošta</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

3
res/values-da/strings.xml
View File

@ -5,7 +5,6 @@
<string name="app_authors">Google, The K-9 Dog Walkers.</string> <string name="app_authors">Google, The K-9 Dog Walkers.</string>
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Visse dele 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. Visse dele Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Licenseret under the Apache License, Version 2.0.</string> <string name="app_license">Licenseret under the Apache License, Version 2.0.</string>
<string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright (c) 2006-2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
<string name="app_authors_fmt">Ophavsmænd: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Ophavsmænd: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Revisions information: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Revisions information: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">Vi anvender følgende 3je parts biblioteker: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Vi anvender følgende 3je parts biblioteker: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -234,8 +233,6 @@ Velkommen til K-9 Mail opsætning. K-9 er en open source mail klient for Androi
<string name="debug_enable_sensitive_logging_title">Log sensitiv information</string> <string name="debug_enable_sensitive_logging_title">Log sensitiv information</string>
<string name="debug_enable_sensitive_logging_summary">Kan eksponere passwords i logs.</string> <string name="debug_enable_sensitive_logging_summary">Kan eksponere passwords i logs.</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">Alle mails</string> <string name="combined_inbox_title">Alle mails</string>
<string name="combined_inbox_label">Nye mails fra alle konti</string> <string name="combined_inbox_label">Nye mails fra alle konti</string>
<string name="combined_inbox_list_title">Indbakke med alle nye mails</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Indbakke med alle nye mails</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

2
res/values-de/strings.xml
View File

@ -232,8 +232,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="debug_enable_sensitive_logging_title">Vertrauliche Informationen aufzeichnen</string> <string name="debug_enable_sensitive_logging_title">Vertrauliche Informationen aufzeichnen</string>
<string name="debug_enable_sensitive_logging_summary">Anmeldepasswörter bei Verbindungsaufbau aufzeichnen</string> <string name="debug_enable_sensitive_logging_summary">Anmeldepasswörter bei Verbindungsaufbau aufzeichnen</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">Alle Nachrichten</string> <string name="combined_inbox_title">Alle Nachrichten</string>
<string name="combined_inbox_label">Neue Nachrichten aller Konten</string> <string name="combined_inbox_label">Neue Nachrichten aller Konten</string>
<string name="combined_inbox_list_title">Globaler Posteingang</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Globaler Posteingang</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

1172
res/values-el/strings.xml Normal file
View File

File diff suppressed because it is too large Load Diff

365
res/values-es/strings.xml
View File

@ -2,9 +2,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">K-9 Mail</string> <string name="app_name">K-9 Mail</string>
<string name="beta_app_name">K-9 Mail BETA</string> <string name="beta_app_name">K-9 Mail BETA</string>
<string name="app_authors">Google, The K-9 Dog Walkers.</string>
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Partes Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Liceciado bajo Licencia Apache, Versión 2.0.</string>
<string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Información de la revisión <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Información de la revisión <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">Estamos usando las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Estamos usando las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -34,12 +31,12 @@
<string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string> <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
<string name="status_loading_account_folder">\u0020(Poll <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_loading_account_folder">\u0020(Poll <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_loading_account_folder_headers">\u0020(Recuperando encabezados <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_loading_account_folder_headers">\u0020(Recuperando cabeceras <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_sending_account">\u0020(Enviando <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_sending_account">\u0020(Enviando <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_processing_account">\u0020(Proc <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_processing_account">\u0020(Proc <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string> <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(Próxima comprobación @ <xliff:g id="nexttime">%s</xliff:g>)</string> <string name="status_next_poll">\u0020(Sincronizará @ <xliff:g id="nexttime">%s</xliff:g>)</string>
<string name="status_syncing_off">\u0020(Sincronización deshabilitada)</string> <string name="status_syncing_off">\u0020(Sincronización deshabilitada)</string>
<!-- Actions will be used as buttons and in menu items --> <!-- Actions will be used as buttons and in menu items -->
@ -60,6 +57,7 @@
<string name="forward_action">Reenviar</string> <string name="forward_action">Reenviar</string>
<string name="move_action">Mover</string> <string name="move_action">Mover</string>
<string name="continue_action">Continuar</string> <string name="continue_action">Continuar</string>
<string name="back_action">Atrás</string>
<string name="done_action">Hecho</string> <!-- Used to complete a multi-step process --> <string name="done_action">Hecho</string> <!-- Used to complete a multi-step process -->
<string name="remove_action">Eliminar</string> <string name="remove_action">Eliminar</string>
<string name="discard_action">Descartar</string> <string name="discard_action">Descartar</string>
@ -70,6 +68,7 @@
<string name="send_messages_action">Enviar Correo</string> <string name="send_messages_action">Enviar Correo</string>
<string name="list_folders_action">Lista de Carpetas</string> <string name="list_folders_action">Lista de Carpetas</string>
<string name="refresh_folders_action">Refrescar Carpetas</string> <string name="refresh_folders_action">Refrescar Carpetas</string>
<string name="filter_folders_action">Buscar carpeta</string>
<string name="mark_all_as_read_action">Marcar todos como leídos</string> <string name="mark_all_as_read_action">Marcar todos como leídos</string>
<string name="add_account_action">Añadir cuenta</string> <string name="add_account_action">Añadir cuenta</string>
<string name="compose_action">Redactar</string> <string name="compose_action">Redactar</string>
@ -81,7 +80,7 @@
<string name="folder_settings_action">Configurar carpeta</string> <string name="folder_settings_action">Configurar carpeta</string>
<string name="global_settings_action">Configuración global</string> <string name="global_settings_action">Configuración global</string>
<string name="remove_account_action">Eliminar cuenta</string> <string name="remove_account_action">Eliminar cuenta</string>
<string name="clear_pending_action">Limipar acciones pendientes (peligroso!)</string> <string name="clear_pending_action">Limpiar acciones pendientes (peligroso!)</string>
<string name="accounts_action">Cuentas</string> <string name="accounts_action">Cuentas</string>
<string name="back_to_accounts_action">◀</string> <string name="back_to_accounts_action">◀</string>
@ -97,8 +96,8 @@
<string name="flag_action">Añadir Estrella</string> <string name="flag_action">Añadir Estrella</string>
<string name="unflag_action">Eliminar Estrella</string> <string name="unflag_action">Eliminar Estrella</string>
<string name="copy_action">Copiar</string> <string name="copy_action">Copiar</string>
<string name="show_full_header_action">Ver todos los encabezados</string> <string name="show_full_header_action">Ver todas las cabeceras</string>
<string name="hide_full_header_action">Ocultar todos los encabezados</string> <string name="hide_full_header_action">Ocultar todas las cabeceras</string>
<string name="select_text_action">Seleccionar texto</string> <string name="select_text_action">Seleccionar texto</string>
<string name="mark_as_unread_action">Marcar No Leído</string> <string name="mark_as_unread_action">Marcar No Leído</string>
@ -107,9 +106,9 @@
<string name="view_hide_details_action">Ver/Ocultar detalles</string> <string name="view_hide_details_action">Ver/Ocultar detalles</string>
<string name="add_cc_bcc_action">Añadir Cc/Bcc</string> <string name="add_cc_bcc_action">Añadir Cc/Bcc</string>
<string name="edit_subject_action">Editar Asunto</string> <string name="edit_subject_action">Editar Asunto</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>--> <string name="read_receipt">Acuse de Recibo</string>
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>--> <string name="read_receipt_enabled">Se solicitará Acuse de Recibo</string>
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>--> <string name="read_receipt_disabled">Acuse de recibo no solicitado</string>
<string name="add_attachment_action">Añadir adjunto</string> <string name="add_attachment_action">Añadir adjunto</string>
<string name="add_attachment_action_image">Añadir adjunto (Imagen)</string> <string name="add_attachment_action_image">Añadir adjunto (Imagen)</string>
<string name="add_attachment_action_video">Añadir adjunto (Vídeo)</string> <string name="add_attachment_action_video">Añadir adjunto (Vídeo)</string>
@ -136,7 +135,7 @@
<string name="status_error">Error</string> <!-- Used in Outbox when a message has failed to send --> <string name="status_error">Error</string> <!-- Used in Outbox when a message has failed to send -->
<string name="status_sending">Enviando</string> <!-- Used in Outbox when a message is currently sending --> <string name="status_sending">Enviando</string> <!-- Used in Outbox when a message is currently sending -->
<string name="status_loading_more_failed">Intentando cargar más mensages</string> <string name="status_loading_more_failed">Intentando cargar más mensajes</string>
<string name="load_more_messages_fmt">Cargar <xliff:g id="messages_to_load">%d</xliff:g> más</string> <string name="load_more_messages_fmt">Cargar <xliff:g id="messages_to_load">%d</xliff:g> más</string>
@ -217,7 +216,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
\n * Almacenamiento de adjuntos en la SD \n * Almacenamiento de adjuntos en la SD
\n * Vaciado de papelera \n * Vaciado de papelera
\n * Ordenación de mensajes \n * Ordenación de mensajes
\n * ...y muchas más. \n * …y muchas más.
\n \n
\nDate cuenta que K-9 no soporta muchas de las cuentas de hotmail, como muchos otros clientes de correo, que tiene ciertas peculiaridades cuando se comunicacn con Microsoft Exchange. \nDate cuenta que K-9 no soporta muchas de las cuentas de hotmail, como muchos otros clientes de correo, que tiene ciertas peculiaridades cuando se comunicacn con Microsoft Exchange.
\n \n
@ -229,9 +228,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="debug_enable_debug_logging_title">Activar acceso a debug</string> <string name="debug_enable_debug_logging_title">Activar acceso a debug</string>
<string name="debug_enable_debug_logging_summary">Diagnóstico con información adicional</string> <string name="debug_enable_debug_logging_summary">Diagnóstico con información adicional</string>
<string name="debug_enable_sensitive_logging_title">Información sensible</string> <string name="debug_enable_sensitive_logging_title">Información sensible</string>
<string name="debug_enable_sensitive_logging_summary">Deben mostrarse password en el log</string> <string name="debug_enable_sensitive_logging_summary">Mostrar password en el log</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">Todos los correos</string> <string name="combined_inbox_title">Todos los correos</string>
<string name="combined_inbox_label">Mensajes recientes para todas las cuentas</string> <string name="combined_inbox_label">Mensajes recientes para todas las cuentas</string>
@ -251,10 +248,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="message_list_unflag_action">Quitar estrella</string> <string name="message_list_unflag_action">Quitar estrella</string>
<string name="message_compose_to_hint">Para</string> <string name="message_compose_to_hint">Para</string>
<string name="message_compose_cc_hint">Cc</string> <string name="message_compose_cc_hint">CC</string>
<string name="message_compose_bcc_hint">CCo</string> <string name="message_compose_bcc_hint">CCO</string>
<string name="message_compose_subject_hint">Asunto</string> <string name="message_compose_subject_hint">Asunto</string>
<string name="message_compose_content_hint">Texto del Mensaje</string> <string name="message_compose_content_hint">Texto del Mensaje</string>
<string name="message_compose_signature_hint">Firma</string>
<string name="message_compose_quote_header_separator">-------- Mensaje Origianl --------</string> <string name="message_compose_quote_header_separator">-------- Mensaje Origianl --------</string>
<string name="message_compose_quote_header_subject">Asunto:</string> <string name="message_compose_quote_header_subject">Asunto:</string>
<string name="message_compose_quote_header_send_date">Enviado:</string> <string name="message_compose_quote_header_send_date">Enviado:</string>
@ -264,10 +262,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escribió:\n\n</string> <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escribió:\n\n</string>
<string name="message_compose_quoted_text_label">Citado</string> <string name="message_compose_quoted_text_label">Citado</string>
<string name="message_compose_error_no_recipients">Debes añadir un destinatario</string> <string name="message_compose_error_no_recipients">Debes añadir un destinatario</string>
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>--> <string name="error_contact_address_not_found">Dirección e-mail no encontrada.</string>
<string name="message_compose_downloading_attachments_toast">Algunos adjuntos no se han descargado. Serán descargados automáticamente antes de que se envíe el mensaje</string> <string name="message_compose_downloading_attachments_toast">Algunos adjuntos no se han descargado. Serán descargados automáticamente antes de que se envíe el mensaje</string>
<string name="message_compose_attachments_skipped_toast">Algunos adjuntos no pueden reenviarse porque no han sido descargados.</string> <string name="message_compose_attachments_skipped_toast">Algunos adjuntos no pueden reenviarse porque no han sido descargados.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>--> <string name="message_compose_show_quoted_text_action">Citar mensaje</string>
<string name="message_compose_description_add_to">Añadir destinatario (To)</string>
<string name="message_compose_description_add_cc">Añadir destinatario (CC)</string>
<string name="message_compose_description_add_bcc">Añadir destinatario (BCC)</string>
<string name="message_compose_description_delete_quoted_text">Eliminar texto citado</string>
<string name="message_compose_description_edit_quoted_text">Editar texto citado</string>
<string name="message_view_from_format">Desde: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string> <string name="message_view_from_format">Desde: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Para:</string> <string name="message_to_label">Para:</string>
@ -279,27 +282,30 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="message_view_archive_action">Archivar</string> <string name="message_view_archive_action">Archivar</string>
<string name="message_view_move_action">Mover</string> <string name="message_view_move_action">Mover</string>
<string name="message_view_spam_action">Spam</string> <string name="message_view_spam_action">Spam</string>
<string name="message_view_datetime_fmt">dd MMM yyyy hh:mm a</string> <string name="message_view_datetime_fmt">dd MM yyyy hh:mm a</string>
<string name="message_view_status_attachment_saved">Adjunto guardado en la SD como <xliff:g id="filename">%s</xliff:g>.</string> <string name="message_view_status_attachment_saved">Adjunto guardado en la SD como <xliff:g id="filename">%s</xliff:g>.</string>
<string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la SD</string> <string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la SD</string>
<string name="message_view_show_pictures_instructions">Seleccione \"Mostrar imagen\" para ver las imágenes embebidas</string> <string name="message_view_show_pictures_instructions">Seleccione \"Mostrar imagen\" para ver las imágenes embebidas</string>
<string name="message_view_show_pictures_action">Mostrar imagen</string> <string name="message_view_show_pictures_action">Mostrar imagen</string>
<string name="message_view_show_message_action">Mostrar mensaje</string>
<string name="message_view_show_attachments_action">Ver adjuntos</string>
<string name="message_view_show_more_attachments_action">Más…</string>
<string name="message_view_fetching_attachment_toast">Obteniendo adjuntos.</string> <string name="message_view_fetching_attachment_toast">Obteniendo adjuntos.</string>
<string name="message_view_no_viewer">Imposible encontrar visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string> <string name="message_view_no_viewer">Imposible encontrar visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Descargar mensaje completo</string> <string name="message_view_download_remainder">Descargar mensaje completo</string>
<!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' --> <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
<string name="message_additional_headers_not_downloaded">No todos los encabezados han sido descargados o grabados. Seleccione \"Guardar todos los encabezados localmente\" en la Configuración de la cuenta para permitir esta acción en un futuro</string> <string name="message_additional_headers_not_downloaded">No todas las cabeceras se han descargado o grabado. Seleccione \"Guardar todas las cabeceras localmente\" en la Configuración de la cuenta para permitir esta acción en un futuro</string>
<string name="message_no_additional_headers_available">Todos los encabezados han sido descargados, pero no hay encabezados adicionales que mostrar</string> <string name="message_no_additional_headers_available">Todas las cabeceras han sido descargadas, y no hay cabeceras adicionales que mostrar</string>
<string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar los encabezados adicionales desde la base de datos o el servidor</string> <string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar las cabeceras desde la base de datos o el servidor</string>
<string name="mailbox_select_dlg_title">Carpetas</string> <string name="mailbox_select_dlg_title">Carpetas</string>
<string name="mailbox_select_dlg_new_mailbox_action">Nueva Carpeta</string> <string name="mailbox_select_dlg_new_mailbox_action">Nueva Carpeta</string>
<string name="new_mailbox_dlg_title">Nombre nueva carpeta</string> <string name="new_mailbox_dlg_title">Nombre nueva carpeta</string>
<string name="folder_push_active_symbol">(Subscripción)</string> <string name="folder_push_active_symbol">(Suscrito)</string>
<string name="from_same_sender">Más de este remitente</string> <string name="from_same_sender">Más de este remitente</string>
@ -332,21 +338,32 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="global_settings_messageview_fixedwidth_summary">Utilizar tamaño fijo de fuente cuando se muestre mensajes en texto plano</string> <string name="global_settings_messageview_fixedwidth_summary">Utilizar tamaño fijo de fuente cuando se muestre mensajes en texto plano</string>
<string name="global_settings_messageview_return_to_list_label">Volver a la lista después de borrar</string> <string name="global_settings_messageview_return_to_list_label">Volver a la lista después de borrar</string>
<string name="global_settings_messageview_return_to_list_summary">Volver a la lista después de la acción de borrado</string> <string name="global_settings_messageview_return_to_list_summary">Volver a la lista después de la acción de borrado</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>--> <string name="global_settings_messageview_show_next_label">Mostrar siguiente mensaje tras borrado</string>
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>--> <string name="global_settings_messageview_show_next_summary">Mostrar por defecto siguiente mensaje tras el borrado</string>
<string name="global_settings_confirm_actions_title">Confirmar acción</string> <string name="global_settings_confirm_actions_title">Confirmar acción</string>
<string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string> <string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string>
<string name="global_settings_confirm_action_archive">Archivar</string> <string name="global_settings_confirm_action_archive">Archivar</string>
<string name="global_settings_confirm_action_delete">Borrar (Mensajes en la vista)</string> <string name="global_settings_confirm_action_delete">Borrar (Mensajes en la vista)</string>
<string name="global_settings_confirm_action_delete_starred">Borrar destacado (sólo vista mensaje)</string>
<string name="global_settings_confirm_action_spam">Spam</string> <string name="global_settings_confirm_action_spam">Spam</string>
<!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>--> <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos como leídos</string>
<string name="global_settings_confirm_action_send">Enviados</string> <string name="global_settings_confirm_action_send">Enviados</string>
<string name="global_settings_privacy_mode_title">Bloquear notificaciones</string> <string name="global_settings_privacy_mode_title">Bloquear notificaciones</string>
<string name="global_settings_privacy_mode_summary">No mostrar asunto del mensaje en la barra de notificaciones cuando el sistema está bloqueado.</string> <string name="global_settings_privacy_mode_summary">No mostrar asunto del mensaje en la barra de notificaciones cuando el sistema está bloqueado.</string>
<string name="quiet_time">Tiempo de Silencio</string> <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
<!-- NEW: <string name="global_settings_delete">Delete</string>-->
<!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
<!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
<!-- NEW: <string name="global_settings_move">Move</string>-->
<!-- NEW: <string name="global_settings_flag">Flag</string>-->
<!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
<string name="quiet_time">Horario de Silencio</string>
<string name="quiet_time_description">Desactivar sonidos, alertas y luces por la noche</string> <string name="quiet_time_description">Desactivar sonidos, alertas y luces por la noche</string>
<string name="quiet_time_starts">Silencio comienza</string> <string name="quiet_time_starts">Silencio comienza</string>
<string name="quiet_time_ends">Silencio termina</string> <string name="quiet_time_ends">Silencio termina</string>
@ -370,12 +387,12 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_check_settings_finishing_msg">Finalizando\u2026</string> <string name="account_setup_check_settings_finishing_msg">Finalizando\u2026</string>
<string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string> <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
<string name="account_setup_names_title">Hecho!</string> <string name="account_setup_names_title">¡Hecho!</string>
<string name="account_setup_names_instructions">Tu cuenta está configurada!</string> <string name="account_setup_names_instructions">Tu cuenta está configurada!</string>
<string name="account_setup_names_account_name_label">De un nombre a esta cuenta (opcional):</string> <string name="account_setup_names_account_name_label">De un nombre a esta cuenta (opcional):</string>
<string name="account_setup_names_user_name_label">Introduzca su nombre (se visualizará en el mensaje de salida):</string> <string name="account_setup_names_user_name_label">Introduzca su nombre (se verá en el mensaje de salida):</string>
<string name="account_setup_finished_toast">Su cuenta está configurada!\n\nObteniendo correo\u2026</string> <string name="account_setup_finished_toast">¡Su cuenta está configurada!\n\nObteniendo correo\u2026</string>
<string name="account_setup_account_type_title">Tipo de cuenta</string> <string name="account_setup_account_type_title">Tipo de cuenta</string>
<string name="account_setup_account_type_instructions">¿Qué tipo de cuenta es?</string> <string name="account_setup_account_type_instructions">¿Qué tipo de cuenta es?</string>
@ -400,7 +417,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_incoming_delete_policy_label">Borrado de mesajes</string> <string name="account_setup_incoming_delete_policy_label">Borrado de mesajes</string>
<string name="account_setup_incoming_delete_policy_never_label">No borrar del servidor</string> <string name="account_setup_incoming_delete_policy_never_label">No borrar del servidor</string>
<string name="account_setup_incoming_delete_policy_7days_label">Después de 7 dias</string> <string name="account_setup_incoming_delete_policy_7days_label">Pasado 7 días</string>
<string name="account_setup_incoming_delete_policy_delete_label">Borrar del servidor</string> <string name="account_setup_incoming_delete_policy_delete_label">Borrar del servidor</string>
<string name="account_setup_incoming_delete_policy_markread_label">Marcar como leído en servidor</string> <string name="account_setup_incoming_delete_policy_markread_label">Marcar como leído en servidor</string>
@ -409,20 +426,20 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_incoming_wifi_label">Wi-Fi</string> <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
<string name="account_setup_incoming_other_label">Otras</string> <string name="account_setup_incoming_other_label">Otras</string>
<string name="account_setup_incoming_save_all_headers_title">Descargar encabezados</string> <string name="account_setup_incoming_save_all_headers_title">Descargar cabeceras</string>
<string name="account_setup_incoming_save_all_headers_label">Guardar todos los encabezados localmente</string> <string name="account_setup_incoming_save_all_headers_label">Guardar todas las cabeceras localmente</string>
<string name="local_storage_provider_external_label">Almacenamiento externo (SD)</string> <string name="local_storage_provider_external_label">Almacenamiento externo (SD)</string>
<string name="local_storage_provider_internal_label">Almacenamiento interno</string> <string name="local_storage_provider_internal_label">Almacenamiento interno</string>
<string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamiento interno adicional</string> <string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamiento interno adicional</string>
<string name="local_storage_provider_label">Ubicación del almacenamiento</string> <string name="local_storage_provider_label">Ubicación del almacén</string>
<string name="account_setup_expunge_policy_label">Erradicar borrados</string> <string name="account_setup_expunge_policy_label">Elininar borrados</string>
<string name="account_setup_expunge_policy_immediately">Inmediatamente</string> <string name="account_setup_expunge_policy_immediately">Inmediatamente</string>
<string name="account_setup_expunge_policy_on_poll">Durante comprobación</string> <string name="account_setup_expunge_policy_on_poll">Durante comprobación</string>
<string name="account_setup_expunge_policy_manual">Sólo manualmente</string> <string name="account_setup_expunge_policy_manual">Sólo manualmente</string>
<!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>--> <string name="account_setup_incoming_autodetect_namespace_label">Autodetectar nombre IMAP</string>
<string name="account_setup_incoming_imap_path_prefix_label">Prefijo de la Dirección IMAP</string> <string name="account_setup_incoming_imap_path_prefix_label">Prefijo de la Dirección IMAP</string>
<string name="drafts_folder_label">Carpeta Borradores</string> <string name="drafts_folder_label">Carpeta Borradores</string>
@ -431,7 +448,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="archive_folder_label">Carpeta Archivados</string> <string name="archive_folder_label">Carpeta Archivados</string>
<string name="spam_folder_label">Carpeta SPAM</string> <string name="spam_folder_label">Carpeta SPAM</string>
<string name="account_setup_incoming_subscribed_folders_only_label">Ver sólo carpteas suscritas</string> <string name="account_setup_incoming_subscribed_folders_only_label">Ver sólo carpetas suscritas</string>
<string name="account_setup_auto_expand_folder">Autoexpandir carpeta</string> <string name="account_setup_auto_expand_folder">Autoexpandir carpeta</string>
<string name="account_setup_incoming_webdav_path_prefix_label">Dirección WebDAV (Exchange)</string> <string name="account_setup_incoming_webdav_path_prefix_label">Dirección WebDAV (Exchange)</string>
@ -467,10 +484,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_options_title">Opciones de cuenta</string> <string name="account_setup_options_title">Opciones de cuenta</string>
<string name="compact_action">Compactar</string> <string name="compact_action">Compactar</string>
<string name="clear_action">Limpiar mensajes (peligroso!)</string> <string name="clear_action">Limpiar mensajes (¡peligroso!)</string>
<string name="recreate_action">Reconstruir mensajes (última opción!)</string> <string name="recreate_action">Reconstruir mensajes (¡última opción!)</string>
<string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo</string> <string name="account_setup_options_mail_check_frequency_label">Cuando comprobar nuevo correo</string>
<!-- Frequency also used in account_settings_* --> <!-- Frequency also used in account_settings_* -->
<string name="account_setup_options_mail_check_frequency_never">Nunca</string> <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
<string name="account_setup_options_mail_check_frequency_1min">Cada minuto</string> <string name="account_setup_options_mail_check_frequency_1min">Cada minuto</string>
@ -486,8 +503,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_options_mail_check_frequency_24hour">Cada 24 horas</string> <string name="account_setup_options_mail_check_frequency_24hour">Cada 24 horas</string>
<string name="push_poll_on_connect_label">Comprobar automáticamente</string> <string name="push_poll_on_connect_label">Comprobar automáticamente</string>
<string name="account_setup_options_enable_push_label">Activar subscripción para esta cuenta</string> <string name="account_setup_options_enable_push_label">Activar suscripción para esta cuenta</string>
<string name="account_setup_options_enable_push_summary">Si se soporta por su servidor, los mensajes aparecerán de forma instantanea. Esta opción puede hacer más lento el sistema</string> <string name="account_setup_options_enable_push_summary">Si lo permite su servidor, los mensajes aparecerán de forma instantánea. Esta opción puede ralentizar el sistema</string>
<string name="idle_refresh_period_label">Refrescar conexión</string> <string name="idle_refresh_period_label">Refrescar conexión</string>
<string name="idle_refresh_period_1min">Cada minuto</string> <string name="idle_refresh_period_1min">Cada minuto</string>
<string name="idle_refresh_period_2min">Cada 2 minutos</string> <string name="idle_refresh_period_2min">Cada 2 minutos</string>
@ -499,8 +516,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="idle_refresh_period_48min">Cada 48 minutos</string> <string name="idle_refresh_period_48min">Cada 48 minutos</string>
<string name="idle_refresh_period_60min">Cada 60 minutos</string> <string name="idle_refresh_period_60min">Cada 60 minutos</string>
<string name="account_setup_options_default_label">Enviar correos desde esta cuenta por defecto</string> <string name="account_setup_options_default_label">Enviar mensajes desde esta cuenta por defecto</string>
<string name="account_setup_options_notify_label">Avisarme cuando llegue correo</string> <string name="account_setup_options_notify_label">Avisarme cuando lleguen mensajes</string>
<string name="account_setup_options_notify_sync_label">Avisarme cuando se compruebe el correo</string> <string name="account_setup_options_notify_sync_label">Avisarme cuando se compruebe el correo</string>
<!-- Number of displayed messages, also used in account_settings_* --> <!-- Number of displayed messages, also used in account_settings_* -->
@ -514,11 +531,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_options_mail_display_count_1000">1000 mensajes</string> <string name="account_setup_options_mail_display_count_1000">1000 mensajes</string>
<string name="account_setup_options_mail_display_count_all">Todos los mensajes</string> <string name="account_setup_options_mail_display_count_all">Todos los mensajes</string>
<string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje que no ha sido sincronizado con el servidor</string> <string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje no sincronizado con el servidor</string>
<string name="account_setup_failed_dlg_title">No se ha podido finalizar la Configuración</string> <string name="account_setup_failed_dlg_title">No se ha podido finalizar la Configuración</string>
<string name="account_setup_failed_dlg_auth_message_fmt">Usuario o contraseña incorrectas.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Username or password incorrect\n(ERR01 Account does not exist) --> <string name="account_setup_failed_dlg_auth_message_fmt">Usuario o contraseña incorrectas.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Username or password incorrect\n(ERR01 Account does not exist) -->
<string name="account_setup_failed_dlg_certificate_message_fmt">No se puede conectar de forma segura con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) --> <string name="account_setup_failed_dlg_certificate_message_fmt">No se puede conectar de forma segura con el servidor. Certificado inválido\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) -->
<string name="account_setup_failed_dlg_server_message_fmt">No se puede conectar con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) --> <string name="account_setup_failed_dlg_server_message_fmt">No se puede conectar con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) -->
<string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string> <string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string>
<string name="account_setup_failed_dlg_continue_action">Continuar</string> <string name="account_setup_failed_dlg_continue_action">Continuar</string>
@ -527,19 +544,21 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_title_fmt">Configuración de cuenta</string> <string name="account_settings_title_fmt">Configuración de cuenta</string>
<string name="account_settings_default">Cuenta por defecto</string> <string name="account_settings_default">Cuenta por defecto</string>
<string name="account_settings_default_label">Cuenta por defecto</string> <string name="account_settings_default_label">Cuenta por defecto</string>
<string name="account_settings_default_summary">Enviar correo desde esta cuenta por defecto</string> <string name="account_settings_default_summary">Enviar mensajes desde esta cuenta por defecto</string>
<string name="account_settings_notify_label">Notificar correo nuevo</string> <string name="account_settings_notify_label">Notificar mensajes nuevos</string>
<string name="account_settings_notify_sync_label">Notificar sincronización</string> <string name="account_settings_notify_sync_label">Notificar sincronización</string>
<string name="account_settings_email_label">Tu Dirección de correo</string> <string name="account_settings_email_label">Tu Dirección de correo</string>
<string name="account_settings_notify_summary">Avisarme en el estatus cuando llegue correo nuevo</string> <string name="account_settings_notify_summary">Avisar cuando llegue correo nuevo</string>
<string name="account_settings_notify_sync_summary">Avisarme en el estatus cuando se compruebe el correo</string> <string name="account_settings_notify_sync_summary">Avisar cuando se compruebe el correo</string>
<string name="account_settings_show_combined_label">Mostrar bandejas de entradas combinadas</string> <string name="account_settings_show_combined_label">Mostrar bandejas de entradas combinadas</string>
<string name="account_settings_notify_self_label">Incluir bandeja de salida</string> <string name="account_settings_notify_self_label">Incluir bandeja de salida</string>
<string name="account_settings_notify_self_summary">Mostrar notificaciones durante el envío de correo</string> <string name="account_settings_notify_self_summary">Mostrar notificaciones durante el envío de correo</string>
<string name="account_settings_notification_opens_unread_label">Abrir correo no leído</string> <string name="account_settings_notification_opens_unread_label">Abrir correo no leído</string>
<string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string> <string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string>
<string name="account_settings_notification_unread_count_label">Mostrar contador de correos sin leer</string> <string name="account_settings_notification_unread_count_label">Mostrar número de mensajes no leídos</string>
<string name="account_settings_notification_unread_count_summary">Mostrar el número de mensajes sin leer en la barra de notificaciones.</string> <string name="account_settings_notification_unread_count_summary">Mostrar número de mensajes no leídos en barra de notificaciones.</string>
<string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído tras abrirlo</string>
<string name="account_settings_mark_message_as_read_on_view_summary">Marcar mensaje como leído cuando se abre para verlo</string>
<string name="account_settings_enable_move_buttons_label">Habilitar botones de copia</string> <string name="account_settings_enable_move_buttons_label">Habilitar botones de copia</string>
<string name="account_settings_enable_move_buttons_summary">Mostrar botones de archivar, mover y SPAM</string> <string name="account_settings_enable_move_buttons_summary">Mostrar botones de archivar, mover y SPAM</string>
@ -551,18 +570,22 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_composition">Configuración Saliente</string> <string name="account_settings_composition">Configuración Saliente</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>--> <string name="account_settings_default_quoted_text_shown_label">Citar mensaje original al responder</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>--> <string name="account_settings_default_quoted_text_shown_summary">Al responder los mensajes, el mensaje original se incluirá en tu respuesta.</string>
<string name="account_settings_reply_after_quote_label">Respuesta tras cita</string> <string name="account_settings_reply_after_quote_label">Respuesta tras cita</string>
<string name="account_settings_reply_after_quote_summary">Cuando se responda a un correo, el texto original estará por encima de su respuesta</string> <string name="account_settings_reply_after_quote_summary">Al responder un mensaje, el texto original estará por encima de su respuesta</string>
<string name="account_settings_strip_signature_label">Eliminar firma del texto citado</string>
<string name="account_settings_strip_signature_summary">Al responder los mensajes, la firma del texto citado será eliminada</string>
<string name="account_settings_message_format_label">Formato del mensaje</string> <string name="account_settings_message_format_label">Formato del mensaje</string>
<string name="account_settings_message_format_text">Texto plano (se quitan las imágenes y el formato)</string> <string name="account_settings_message_format_text">Texto simple (se quitan las imágenes y el formato)</string>
<string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string> <string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string>
<string name="account_settings_message_format_auto">Automática (texto simple excepto si se responde a un mensaje HTML)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>--> <string name="account_settings_message_read_receipt_label">Leer acuse de lectura</string>
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>--> <string name="account_settings_message_read_receipt_summary">Solicitar siempre un acuse de Lectura</string>
<string name="account_settings_quote_style_label">Estilo de cita al responder</string> <string name="account_settings_quote_style_label">Estilo de cita al responder</string>
<string name="account_settings_quote_style_prefix">Prefijo (como Gmail, Pine)</string> <string name="account_settings_quote_style_prefix">Prefijo (como Gmail, Pine)</string>
@ -581,6 +604,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_crypto_app_not_available">No disponible</string> <string name="account_settings_crypto_app_not_available">No disponible</string>
<string name="account_settings_crypto_auto_signature">Firmar automáticamente</string> <string name="account_settings_crypto_auto_signature">Firmar automáticamente</string>
<string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma</string> <string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma</string>
<string name="account_settings_crypto_auto_encrypt">Auto-encriptado</string>
<string name="account_settings_crypto_auto_encrypt_summary">Encripta automáticamente si la clave pública es compatible.</string>
<string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string> <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
<string name="account_settings_second_class_check_frequency_label">Frecuencia de 2a clase</string> <string name="account_settings_second_class_check_frequency_label">Frecuencia de 2a clase</string>
@ -591,11 +616,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_color_summary">Seleccione el color a utilizar en la carpeta y en la cuenta</string> <string name="account_settings_color_summary">Seleccione el color a utilizar en la carpeta y en la cuenta</string>
<string name="account_settings_led_color_label">Color de aviso</string> <string name="account_settings_led_color_label">Color de aviso</string>
<string name="account_settings_led_color_summary">Seleccione el color del LED cuando haya un aviso para esta cuenta</string> <string name="account_settings_led_color_summary">Seleccione el color del LED para los avisos de esta cuenta</string>
<string name="account_settings_mail_display_count_label">Tamaño carpeta local</string> <string name="account_settings_mail_display_count_label">Tamaño carpeta local</string>
<string name="account_settings_autodownload_message_size_label">Obtener mensajes hasta</string> <string name="account_settings_autodownload_message_size_label">Obtener mensajes con hasta</string>
<string name="account_settings_autodownload_message_size_1">1Kb</string> <string name="account_settings_autodownload_message_size_1">1Kb</string>
<string name="account_settings_autodownload_message_size_2">2Kb</string> <string name="account_settings_autodownload_message_size_2">2Kb</string>
<string name="account_settings_autodownload_message_size_4">4Kb</string> <string name="account_settings_autodownload_message_size_4">4Kb</string>
@ -610,7 +635,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_autodownload_message_size_2048">2Mb</string> <string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string> <string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string> <string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">cualquier tamaño (sin límite)</string> <string name="account_settings_autodownload_message_size_any">completo (sin límite)</string>
<string name="account_settings_message_age_label">Sincronizar desde</string> <string name="account_settings_message_age_label">Sincronizar desde</string>
<string name="account_settings_message_age_any">Sin fecha (sin límite)</string> <string name="account_settings_message_age_any">Sin fecha (sin límite)</string>
@ -639,7 +664,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_folder_sync_mode_not_second_class">Todas excepto las de 2a clase</string> <string name="account_settings_folder_sync_mode_not_second_class">Todas excepto las de 2a clase</string>
<string name="account_settings_folder_sync_mode_none">Ninguna</string> <string name="account_settings_folder_sync_mode_none">Ninguna</string>
<string name="account_settings_folder_push_mode_label">Subscripción de carpetas</string> <string name="account_settings_folder_push_mode_label">Suscripción de carpetas</string>
<string name="account_settings_folder_push_mode_all">Todas</string> <string name="account_settings_folder_push_mode_all">Todas</string>
<string name="account_settings_folder_push_mode_first_class">Sólo 1a clase</string> <string name="account_settings_folder_push_mode_first_class">Sólo 1a clase</string>
<string name="account_settings_folder_push_mode_first_and_second_class">1a y 2a Clase</string> <string name="account_settings_folder_push_mode_first_and_second_class">1a y 2a Clase</string>
@ -671,7 +696,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="folder_settings_folder_sync_mode_second_class">2a Clase</string> <string name="folder_settings_folder_sync_mode_second_class">2a Clase</string>
<string name="folder_settings_folder_sync_mode_inherited">La misma que la de visualización</string> <string name="folder_settings_folder_sync_mode_inherited">La misma que la de visualización</string>
<string name="folder_settings_folder_push_mode_label">Clase en subscripción</string> <string name="folder_settings_folder_push_mode_label">Clase en suscripción</string>
<string name="folder_settings_folder_push_mode_normal">Ninguna</string> <string name="folder_settings_folder_push_mode_normal">Ninguna</string>
<string name="folder_settings_folder_push_mode_first_class">1a Clase</string> <string name="folder_settings_folder_push_mode_first_class">1a Clase</string>
<string name="folder_settings_folder_push_mode_second_class">2a Clase</string> <string name="folder_settings_folder_push_mode_second_class">2a Clase</string>
@ -740,7 +765,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_signature_label">Firma</string> <string name="account_settings_signature_label">Firma</string>
<string name="account_settings_signature_summary">Añadir firma a cada mensaje que envias</string> <string name="account_settings_signature_summary">Añadir firma a cada mensaje que envias</string>
<string name="default_signature">-- \nEnviado desde mi teléfono Android con K-9 Mail. Disculpa mi brevedad</string> <string name="default_signature">-- \nEnviado desde mi teléfono con K-9 Mail.</string>
<string name="default_identity_description">Identidad principal</string> <string name="default_identity_description">Identidad principal</string>
<string name="choose_identity">Seleccionar identidad</string> <string name="choose_identity">Seleccionar identidad</string>
<string name="choose_identity_title">Seleccionar identidad</string> <string name="choose_identity_title">Seleccionar identidad</string>
@ -765,8 +790,9 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="sort_attach_first">Con adjuntos primero</string> <string name="sort_attach_first">Con adjuntos primero</string>
<string name="sort_unattached_first">Sin adjuntos primero</string> <string name="sort_unattached_first">Sin adjuntos primero</string>
<string name="sort_by">Ordenado por...</string> <string name="sort_by">Ordenado por…</string>
<string name="sort_by_date">Fecha</string> <string name="sort_by_date">Fecha</string>
<string name="sort_by_arrival">Llegada</string>
<string name="sort_by_sender">Remitente</string> <string name="sort_by_sender">Remitente</string>
<string name="sort_by_subject">Asunto</string> <string name="sort_by_subject">Asunto</string>
<string name="sort_by_flag">Estrellas</string> <string name="sort_by_flag">Estrellas</string>
@ -787,10 +813,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
Si no puede acceder con su contraseña y usuario y no tiene una cuenta de pago. Si no puede acceder con su contraseña y usuario y no tiene una cuenta de pago.
Es posible que pueda acceder sólo via web.</string> Es posible que pueda acceder sólo via web.</string>
<string name="provider_note_yahoojp">Si quiere utilizar el correo POP3 para este proveedor debe activar este acceso en la Configuración de yahoo.</string> <string name="provider_note_yahoojp">Si quiere utilizar el correo POP3 para este proveedor debe activar este acceso en la Configuración de yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>--> <string name="provider_note_auonejp">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo au one.</string>
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>--> <string name="provider_note_naver">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Naver.</string>
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>--> <string name="provider_note_hanmail">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Hanmail(Daum).</string>
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>--> <string name="provider_note_paran">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Paran.</string>
<string name="provider_note_nate">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Nate.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string> <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string> <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
@ -813,13 +840,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
Q - Volver a cuentas\u000A Q - Volver a cuentas\u000A
S - Editar preferencias cuenta</string> S - Editar preferencias cuenta</string>
<string name="folder_list_filter_hint">nombre carpeta contiene</string>
<string name="folder_list_display_mode_label">Carpetas</string> <string name="folder_list_display_mode_label">Carpetas</string>
<string name="folder_list_display_mode_all">Ver todas las carpetas</string> <string name="folder_list_display_mode_all">Ver todas las carpetas</string>
<string name="folder_list_display_mode_first_class">Ver sólo carpetas de 1a Clase</string> <string name="folder_list_display_mode_first_class">Ver sólo carpetas de 1a Clase</string>
<string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a y 2a Clase</string> <string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a y 2a Clase</string>
<string name="folder_list_display_mode_not_second_class">Ver todas excepto las de 2a Clase</string> <string name="folder_list_display_mode_not_second_class">Ver todas excepto las de 2a Clase</string>
<string name="account_settings_signature__location_label">Posición de la Frima</string> <string name="account_settings_signature__location_label">Posición de la Firma</string>
<string name="account_settings_signature__location_before_quoted_text">Antes del texto citado</string> <string name="account_settings_signature__location_before_quoted_text">Antes del texto citado</string>
<string name="account_settings_signature__location_after_quoted_text">Después del texto citado</string> <string name="account_settings_signature__location_after_quoted_text">Después del texto citado</string>
<string name="setting_theme_dark">Oscuro</string> <string name="setting_theme_dark">Oscuro</string>
@ -832,12 +861,12 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="interaction_preferences">Interacción</string> <string name="interaction_preferences">Interacción</string>
<string name="accountlist_preferences">Lista de cuentas</string> <string name="accountlist_preferences">Lista de cuentas</string>
<string name="messagelist_preferences">Lista de mensajes</string> <string name="messagelist_preferences">Lista de mensajes</string>
<string name="messageview_preferences">mensajes</string> <string name="messageview_preferences">Mensajes</string>
<string name="settings_theme_label">Tema</string> <string name="settings_theme_label">Tema</string>
<string name="settings_language_label">Idioma</string> <string name="settings_language_label">Idioma</string>
<string name="settings_messageview_mobile_layout_label">Columna única</string> <string name="settings_messageview_mobile_layout_label">Única Columna</string>
<string name="settings_messageview_mobile_layout_summary">Reformatea mensajes HTML para pantallas pequeñas</string> <string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string>
<string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string> <string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string>
<string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string> <string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string>
@ -858,10 +887,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
--> -->
<string name="date_format_short">SHORT</string> <string name="date_format_short">SHORT</string>
<string name="date_format_medium">MEDIUM</string> <string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd-MMM-yyyy</string> <string name="date_format_common">dd-MM-yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string> <string name="date_format_iso8601">yyyy-MM-dd</string>
<string name="batch_ops">Operaciones en lote</string> <string name="batch_ops">Operaciones por Lotes</string>
<string name="batch_delete_op">Borrar seleccionados</string> <string name="batch_delete_op">Borrar seleccionados</string>
<string name="batch_mark_read_op">Marcar seleccionados como leídos</string> <string name="batch_mark_read_op">Marcar seleccionados como leídos</string>
<string name="batch_mark_unread_op">Marcar seleccionados como no leídos</string> <string name="batch_mark_unread_op">Marcar seleccionados como no leídos</string>
@ -892,7 +921,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="gestures_summary">Aceptar controles gestuales</string> <string name="gestures_summary">Aceptar controles gestuales</string>
<string name="compact_layouts_title">Disposición compacta</string> <string name="compact_layouts_title">Disposición compacta</string>
<string name="compact_layouts_summary">Ajustar disposición para mostrar más en cada página</string> <string name="compact_layouts_summary">Ajustar disposición para mostrar más mensajes en cada página</string>
<string name="volume_navigation_title">Navegación con teclas de volumen</string> <string name="volume_navigation_title">Navegación con teclas de volumen</string>
<string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string> <string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string>
@ -900,10 +929,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="volume_navigation_list">Listas de mensajes</string> <string name="volume_navigation_list">Listas de mensajes</string>
<string name="manage_back_title">Controlar botón \"Atras\" </string> <string name="manage_back_title">Controlar botón \"Atras\" </string>
<string name="manage_back_summary">Hacer \"Atras\" siempre un nivel superior</string> <string name="manage_back_summary">Ir \"Atras\" hacia un nivel superior</string>
<string name="start_integrated_inbox_title">Iniciar en Bandeja unificada</string> <string name="start_integrated_inbox_title">Usar Bandeja Unificada</string>
<string name="start_integrated_inbox_summary">Mostrar la Bandeja de Entrada unificada al inicio</string> <string name="start_integrated_inbox_summary">Mostrar una Bandeja de Entrada unificada al inicio</string>
<string name="measure_accounts_title">Tamaño cuenta</string> <string name="measure_accounts_title">Tamaño cuenta</string>
<string name="measure_accounts_summary">Desactivar para mejorar rendimiento</string> <string name="measure_accounts_summary">Desactivar para mejorar rendimiento</string>
@ -911,8 +940,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="count_search_title">Mostrar contador de búsqueda</string> <string name="count_search_title">Mostrar contador de búsqueda</string>
<string name="count_search_summary">Desactivar para mejorar rendimiento</string> <string name="count_search_summary">Desactivar para mejorar rendimiento</string>
<!-- NEW: <string name="hide_special_accounts_title">Hide special accounts</string>--> <string name="hide_special_accounts_title">Esconder cuentas especiales</string>
<!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>--> <string name="hide_special_accounts_summary">Esconder la cuenta unificada y todas las cuentas</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></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"> - Estrellas</string> <string name="flagged_modifier"> - Estrellas</string>
@ -964,15 +993,18 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="font_size_message_view_date">Fecha</string> <string name="font_size_message_view_date">Fecha</string>
<string name="font_size_message_view_content">Cuerpo de mensaje</string> <string name="font_size_message_view_content">Cuerpo de mensaje</string>
<string name="font_size_tiniest">Muy delgada</string> <string name="font_size_message_compose">Composición Mensaje</string>
<string name="font_size_tiny">Delgada</string> <string name="font_size_message_compose_input">Campos Entrada Texto</string>
<string name="font_size_smaller">Muy pequeña</string>
<string name="font_size_tiniest">La más pequeña</string>
<string name="font_size_tiny">Muy pequeña</string>
<string name="font_size_smaller">Más pequeña</string>
<string name="font_size_small">Pequeña</string> <string name="font_size_small">Pequeña</string>
<string name="font_size_medium">Mediana</string> <string name="font_size_medium">Mediana</string>
<string name="font_size_large">Grande</string> <string name="font_size_large">Grande</string>
<string name="font_size_larger">Muy Grande</string> <string name="font_size_larger">Muy Grande</string>
<string name="font_size_webview_smaller">Muy pequeña</string> <string name="font_size_webview_smaller">Más pequeña</string>
<string name="font_size_webview_small">Pequeña</string> <string name="font_size_webview_small">Pequeña</string>
<string name="font_size_webview_normal">Normal</string> <string name="font_size_webview_normal">Normal</string>
<string name="font_size_webview_large">Grande</string> <string name="font_size_webview_large">Grande</string>
@ -1005,6 +1037,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="save_or_discard_draft_message_dlg_title">¿Guardar como borrador?</string> <string name="save_or_discard_draft_message_dlg_title">¿Guardar como borrador?</string>
<string name="save_or_discard_draft_message_instructions_fmt">¿Guardar o descartar este mensaje?</string> <string name="save_or_discard_draft_message_instructions_fmt">¿Guardar o descartar este mensaje?</string>
<string name="confirm_discard_draft_message_title">¿Desechar mensaje?</string>
<string name="confirm_discard_draft_message">¿Está seguro de desechar este mensaje?</string>
<string name="refuse_to_save_draft_marked_encrypted_dlg_title">Rehusar guardar mensaje borrador.</string>
<string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rehusar guardar mensaje borrador marcado como encriptado.</string>
<string name="continue_without_public_key_dlg_title">¿Continuar sin clave pública?</string>
<string name="continue_without_public_key_instructions_fmt">Uno o más recipientes no tienen clave pública. ¿Continuar?</string>
<string name="charset_not_found">Este mensaje no puede visualizarse porque el tipo de caracteres \"<xliff:g id="charset">%s</xliff:g>\" no ha sido encontrado.</string> <string name="charset_not_found">Este mensaje no puede visualizarse porque el tipo de caracteres \"<xliff:g id="charset">%s</xliff:g>\" no ha sido encontrado.</string>
<string name="select_text_now">Seleccionar texto a copiar.</string> <string name="select_text_now">Seleccionar texto a copiar.</string>
@ -1014,23 +1055,13 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="dialog_confirm_delete_confirm_button">Borrar</string> <string name="dialog_confirm_delete_confirm_button">Borrar</string>
<string name="dialog_confirm_delete_cancel_button">No borrar</string> <string name="dialog_confirm_delete_cancel_button">No borrar</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <string name="dialog_confirm_spam_title">Confirmar mover a la carpeta spam</string>
<!-- NEW: <plurals name="dialog_confirm_spam_message"> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</item> <item quantity="one">¿Quiere mover este mensaje a la carpeta Spam?</item>
<item quantity="other">Do you really want to move <xliff:g id="message_count">%1$d</xliff:g> messages to the spam folder?</item> <item quantity="other">¿Quiere realmente mover <xliff:g id="message_count">%1$d</xliff:g> los mensajes a la carpeta Spam?</item>
</plurals>
Translators: <string name="dialog_confirm_spam_confirm_button">Si</string>
<string name="dialog_confirm_spam_cancel_button">No</string>
Please review how to handle pluralization for your language at (1) and ajust
the <item> elements accordingly
Possible values for 'quantity': zero, one, two, few, many, other
(1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
</plurals>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->
<string name="dialog_attachment_progress_title">Descargando adjunto</string> <string name="dialog_attachment_progress_title">Descargando adjunto</string>
@ -1040,55 +1071,89 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="messagelist_sent_cc_me_sigil">›</string> <string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Imposible conectar.</string> <string name="error_unable_to_connect">Imposible conectar.</string>
<!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>--> <string name="import_export_action">Ajustes Importar &amp; Exportar</string>
<!-- NEW: <string name="settings_export_account">Export account settings</string>--> <string name="settings_export_account">Exportar ajustes cuenta</string>
<!-- NEW: <string name="settings_export_all">Export settings and accounts</string>--> <string name="settings_export_all">Exportar ajustes y cuentas</string>
<!-- NEW: <string name="settings_import_dialog_title">Import</string>--> <string name="settings_import_dialog_title">Importar</string>
<!-- NEW: <string name="settings_export_dialog_title">Export</string>--> <string name="settings_export_dialog_title">Exportar</string>
<!-- NEW: <string name="settings_import">Import settings</string>--> <string name="settings_import">Importar ajustes</string>
<!-- NEW: <string name="settings_import_selection">Import selection</string>--> <string name="settings_import_selection">Importar selección</string>
<!-- NEW: <string name="settings_import_global_settings">Global settings</string>--> <string name="settings_import_global_settings">Ajustes globales</string>
<!-- NEW: <string name="settings_exporting">Exporting settings...</string>--> <string name="settings_exporting">Exportando ajustes…</string>
<!-- NEW: <string name="settings_importing">Importing settings...</string>--> <string name="settings_importing">Importando ajustes…</string>
<!-- NEW: <string name="settings_import_scanning_file">Scanning file...</string>--> <string name="settings_import_scanning_file">Buscando archivo…</string>
<!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_export_success">Ajustes guardados en <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_global_settings_success">Ajustes globales importados desde <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_success">Importado <xliff:g id="accounts">%s</xliff:g> desde <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <plurals name="settings_import_success"> <plurals name="settings_import_success">
<item quantity="one">1 account</item> <item quantity="one">1 cuenta</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item> <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> cuentas</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_export_failure">Failed to export settings</string>--> <string name="settings_export_failure">Fallo al exportar los ajustes</string>
<!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_failure">Fallo al importar cualquier ajuste desde <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_export_success_header">Export succeeded</string>--> <string name="settings_export_success_header">Exportación correcta</string>
<!-- NEW: <string name="settings_export_failed_header">Export failed</string>--> <string name="settings_export_failed_header">Exportación incorrecta</string>
<!-- NEW: <string name="settings_import_success_header">Import succeeded</string>--> <string name="settings_import_success_header">Importación correcta</string>
<!-- NEW: <string name="settings_import_failed_header">Import failed</string>--> <string name="settings_import_failed_header">Importación incorrecta</string>
<!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>--> <string name="settings_import_activate_account_header">Activar cuenta</string>
<!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s.</xliff:g></string>--> <string name="settings_import_activate_account_intro">Para poder activar esta cuenta \"<xliff:g id="account">%s</xliff:g>\" debe proveer la <xliff:g id="server_passwords">%s.</xliff:g></string>
<!-- NEW: <plurals name="settings_import_server_passwords"> <plurals name="settings_import_server_passwords">
<item quantity="one">server password</item> <item quantity="one">palabra clave del servidor</item>
<item quantity="other">server passwords</item> <item quantity="other">palabras claves del servidor</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>--> <string name="settings_import_incoming_server">Servidor Entrante (<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>--> <string name="settings_import_outgoing_server">Servidor de Salida (<xliff:g id="hostname">%s</xliff:g>):</string>
<!-- NEW: <plurals name="settings_import_setting_passwords"> <plurals name="settings_import_setting_passwords">
<item quantity="one">Setting password...</item> <item quantity="one">Definir password...</item>
<item quantity="other">Setting passwords...</item> <item quantity="other">Definir passwords...</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>--> <string name="settings_import_use_incoming_server_password">Usar el password del Servidor Entrante</string>
<!-- NEW: <string name="activate_account_action">Activate</string>--> <string name="activate_account_action">Activar</string>
<!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>--> <!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>-->
<!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>--> <string name="account_unavailable">Cuenta \"<xliff:g id="account">%s</xliff:g>\" no disponible; comprobar</string>
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>--> <string name="settings_attachment_default_path">Guardar adjuntos en…</string>
<!-- NEW: <string name="attachment_save_title">Save attachment</string>--> <string name="attachment_save_title">Guardar adjuntos</string>
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>--> <string name="attachment_save_desc">Explorador no encontrado. ¿Dónde quiere guardar este adjunto?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>--> <string name="manage_accounts_move_up_action">Subir</string>
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>--> <string name="manage_accounts_move_down_action">Bajar</string>
<!-- NEW: <string name="manage_accounts_moving_message">Moving account...</string>--> <string name="manage_accounts_moving_message">Mover cuenta…</string>
<string name="unread_widget_label">Mensaje K-9 no leído</string>
<string name="unread_widget_select_account">Mostrar contador no leídos para…</string>
<string name="import_dialog_error_title">No existe Explorador de Archivos</string>
<string name="import_dialog_error_message">No hay una aplicación disponible importar el archivo. Por favor, instale un explorador de archivos desde Google Play</string>
<string name="open_market">Abrir Google Play</string>
<string name="close">Cerrar</string>
<!-- NEW: <string name="webview_empty_message">No text</string>-->
<string name="webview_contextmenu_link_view_action">Abrir para ver</string>
<string name="webview_contextmenu_link_share_action">Compartir enlace</string>
<string name="webview_contextmenu_link_copy_action">Copiar enlace portapapeles</string>
<string name="webview_contextmenu_link_clipboard_label">Enlace</string>
<string name="webview_contextmenu_image_title">Imagen</string>
<string name="webview_contextmenu_image_view_action">Ver imagen</string>
<string name="webview_contextmenu_image_save_action">Guardar imagen</string>
<string name="webview_contextmenu_image_download_action">Descargar imagen</string>
<string name="webview_contextmenu_image_copy_action">Copiar URL imagen al portapapeles</string>
<string name="webview_contextmenu_image_clipboard_label">URL de la imagen</string>
<string name="webview_contextmenu_phone_call_action">Número llamada</string>
<string name="webview_contextmenu_phone_save_action">Guardar en Contactos</string>
<string name="webview_contextmenu_phone_copy_action">Copiar Nº teléfono en el portapapeles</string>
<string name="webview_contextmenu_phone_clipboard_label">Número teléfono</string>
<string name="webview_contextmenu_email_send_action">Enviar mensaje</string>
<string name="webview_contextmenu_email_save_action">Guardar en Contactos</string>
<string name="webview_contextmenu_email_copy_action">Copiar dirección email en portapapeles</string>
<string name="webview_contextmenu_email_clipboard_label">Dirección Email</string>
<string name="image_saved_as">Imagen guardado como \"<xliff:g id="filename">%s</xliff:g>\"</string>
<string name="image_saving_failed">Error al guardar la imagen.</string>
</resources> </resources>

2
res/values-fi/strings.xml
View File

@ -229,8 +229,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="debug_enable_sensitive_logging_title">Kirjoita lokiin arkaluontoisia tietoja</string> <string name="debug_enable_sensitive_logging_title">Kirjoita lokiin arkaluontoisia tietoja</string>
<string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string> <string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string>
<string name="message_header_mua">K-9 Mail Androidille</string>
<string name="combined_inbox_title">Kaikki postit</string> <string name="combined_inbox_title">Kaikki postit</string>
<string name="combined_inbox_label">Viimeisimmät viestit kaikilta tileiltä</string> <string name="combined_inbox_label">Viimeisimmät viestit kaikilta tileiltä</string>
<string name="combined_inbox_list_title">Saapuneet</string> <string name="combined_inbox_list_title">Saapuneet</string>

2
res/values-fr/strings.xml
View File

@ -256,8 +256,6 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
<string name="debug_enable_sensitive_logging_title">Journaliser les informations personnelles</string> <string name="debug_enable_sensitive_logging_title">Journaliser les informations personnelles</string>
<string name="debug_enable_sensitive_logging_summary">Vos mots de passe pourront se retrouver dans le journal</string> <string name="debug_enable_sensitive_logging_summary">Vos mots de passe pourront se retrouver dans le journal</string>
<string name="message_header_mua">K-9 Mail pour Android</string>
<string name="combined_inbox_title">Tous les messages</string> <string name="combined_inbox_title">Tous les messages</string>
<string name="combined_inbox_label">Messages récents de tous les comptes</string> <string name="combined_inbox_label">Messages récents de tous les comptes</string>
<string name="combined_inbox_list_title">Toutes les boîtes de réception</string> <string name="combined_inbox_list_title">Toutes les boîtes de réception</string>

2
res/values-gl/strings.xml
View File

@ -231,8 +231,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="debug_enable_sensitive_logging_title">Información sensible</string> <string name="debug_enable_sensitive_logging_title">Información sensible</string>
<string name="debug_enable_sensitive_logging_summary">Deben amosarse chaves no log</string> <string name="debug_enable_sensitive_logging_summary">Deben amosarse chaves no log</string>
<string name="message_header_mua">K-9 Mail para Android</string>
<string name="combined_inbox_title">Todos os correos</string> <string name="combined_inbox_title">Todos os correos</string>
<string name="combined_inbox_label">Mensaxes recentes para todas as contas</string> <string name="combined_inbox_label">Mensaxes recentes para todas as contas</string>
<string name="combined_inbox_list_title">Todos os correos de Entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Todos os correos de Entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

1
res/values-hu/strings.xml
View File

@ -189,7 +189,6 @@ Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot
<string name="debug_enable_debug_logging_summary">Extra diagnosztikai naplózás</string> <string name="debug_enable_debug_logging_summary">Extra diagnosztikai naplózás</string>
<string name="debug_enable_sensitive_logging_title">Személyes adatok naplózása</string> <string name="debug_enable_sensitive_logging_title">Személyes adatok naplózása</string>
<string name="debug_enable_sensitive_logging_summary">Jelszavak naplózása</string> <string name="debug_enable_sensitive_logging_summary">Jelszavak naplózása</string>
<string name="message_header_mua">K-9 Levlező program Android rendszerhez</string>
<string name="combined_inbox_title">Minden levél</string> <string name="combined_inbox_title">Minden levél</string>
<string name="combined_inbox_label">Legújabb üzenetek az összes fiókból</string> <string name="combined_inbox_label">Legújabb üzenetek az összes fiókból</string>
<string name="combined_inbox_list_title">Minden beérkezett üzenet</string> <string name="combined_inbox_list_title">Minden beérkezett üzenet</string>

2
res/values-it/strings.xml
View File

@ -233,8 +233,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="debug_enable_sensitive_logging_title">Registra informazioni sensibili</string> <string name="debug_enable_sensitive_logging_title">Registra informazioni sensibili</string>
<string name="debug_enable_sensitive_logging_summary">Può mostrare le passwords nei files di logs.</string> <string name="debug_enable_sensitive_logging_summary">Può mostrare le passwords nei files di logs.</string>
<string name="message_header_mua">K-9 Mail per Android</string>
<string name="combined_inbox_title">Tutti i messaggi</string> <string name="combined_inbox_title">Tutti i messaggi</string>
<string name="combined_inbox_label">Messaggi recenti da tutti gli account</string> <string name="combined_inbox_label">Messaggi recenti da tutti gli account</string>
<string name="combined_inbox_list_title">Tutti i messaggi in arrivo</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Tutti i messaggi in arrivo</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

2
res/values-ja/strings.xml
View File

@ -234,8 +234,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="debug_enable_sensitive_logging_title">詳細情報ログ</string> <string name="debug_enable_sensitive_logging_title">詳細情報ログ</string>
<string name="debug_enable_sensitive_logging_summary">ログにパスワードが表示される</string> <string name="debug_enable_sensitive_logging_summary">ログにパスワードが表示される</string>
<string name="message_header_mua">K-9 for Android </string>
<string name="combined_inbox_title">すべてのメール</string> <string name="combined_inbox_title">すべてのメール</string>
<string name="combined_inbox_label">全アカウントの最新メール</string> <string name="combined_inbox_label">全アカウントの最新メール</string>
<string name="combined_inbox_list_title">受信トレイのすべてのメール</string> <string name="combined_inbox_list_title">受信トレイのすべてのメール</string>

2
res/values-ko/strings.xml
View File

@ -232,8 +232,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="debug_enable_sensitive_logging_title">중요 정보 기록</string> <string name="debug_enable_sensitive_logging_title">중요 정보 기록</string>
<string name="debug_enable_sensitive_logging_summary">로그에 비밀번호를 남길수도 있습니다.</string> <string name="debug_enable_sensitive_logging_summary">로그에 비밀번호를 남길수도 있습니다.</string>
<string name="message_header_mua">안드로이드용 K-9 메일 </string>
<string name="combined_inbox_title">모든 메일</string> <string name="combined_inbox_title">모든 메일</string>
<string name="combined_inbox_label">모든 계정의 모든 메시지</string> <string name="combined_inbox_label">모든 계정의 모든 메시지</string>
<string name="combined_inbox_list_title">받은편지함의 모든 메일</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">받은편지함의 모든 메일</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

2
res/values-nl/strings.xml
View File

@ -231,8 +231,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="debug_enable_sensitive_logging_title">Log gevoelige informatie</string> <string name="debug_enable_sensitive_logging_title">Log gevoelige informatie</string>
<string name="debug_enable_sensitive_logging_summary">Kan wachtwoorden laten zien in logs.</string> <string name="debug_enable_sensitive_logging_summary">Kan wachtwoorden laten zien in logs.</string>
<string name="message_header_mua">K-9 Mail voor Android</string>
<string name="combined_inbox_title">Alle Mail</string> <string name="combined_inbox_title">Alle Mail</string>
<string name="combined_inbox_label">Recente berichten voor alle accounts</string> <string name="combined_inbox_label">Recente berichten voor alle accounts</string>
<string name="combined_inbox_list_title">Alle Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Alle Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

530
res/values-pl/strings.xml
View File

@ -8,27 +8,26 @@
<!-- ## This is draft. Send all your notes or suggestions to address given above. ## --> <!-- ## This is draft. Send all your notes or suggestions to address given above. ## -->
<!-- ## ## --> <!-- ## ## -->
<!-- ## Latest update: (YYYY-MM-DD): 2010.07.03 ## --> <!-- ## Latest update: (YYYY-MM-DD): 2010.07.03 ## -->
<!-- ## Modified by rabbbit, 2011.03.03 ## --> <!-- ## Modified by rabbbit, 2011.03.03 ## -->
<!-- ## Updated by Błażej Jeżewski, 2012.04.10 ## -->
<!-- ## ## --> <!-- ## ## -->
<!-- #################################################################################### --> <!-- #################################################################################### -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">K-9 Mail</string> <string name="app_name">K-9 Mail</string>
<string name="beta_app_name">K-9 Mail BETA</string> <string name="beta_app_name">K-9 Mail BETA</string>
<string name="app_authors">Google, The K-9 Dog Walkers.</string> <string name="app_license">Wszelkie prawa zastrzeżone</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>-->
<!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
<string name="app_authors_fmt">Autorzy: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autorzy: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Historia zmian: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Historia zmian: <xliff:g id="app_revision_url">%s</xliff:g></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">K-9 mail zawiera kod źródłowy: <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">Ikony Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
<string name="read_attachment_label">Odczyt załączników</string> <string name="read_attachment_label">Odczyt załączników</string>
<string name="read_attachment_desc">Zezwalaj tej aplikacji na czytanie załaczników z Twoich maili.</string> <string name="read_attachment_desc">Zezwalaj tej aplikacji na czytanie załaczników z Twoich wiadomości.</string>
<string name="read_messages_label">Odczytaj maile</string> <string name="read_messages_label">Odczytaj wiadomości</string>
<string name="read_messages_desc">Zezwalaj tej aplikacji na czytanie Twoich maili</string> <string name="read_messages_desc">Zezwalaj tej aplikacji na czytanie Twoich wiadomości</string>
<string name="delete_messages_label">Usuń emaile</string> <string name="delete_messages_label">Usuń wiadomości</string>
<string name="delete_messages_desc">Zezwalaj tej aplikacji na usuwanie Twoich maili.</string> <string name="delete_messages_desc">Zezwalaj tej aplikacji na usuwanie Twoich wiadomości.</string>
<string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string> <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
<string name="accounts_title">Konta</string> <string name="accounts_title">Konta</string>
@ -39,17 +38,17 @@
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string> <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
<string name="compose_title">Nie</string> <string name="compose_title">Nie</string>
<string name="debug_title">Debug</string> <string name="debug_title">Debuguj</string>
<string name="choose_folder_title">Wybierz folder</string> <string name="choose_folder_title">Wybierz folder</string>
<string name="choose_color_title">Wybierz kolor</string> <string name="choose_color_title">Wybierz kolor</string>
<string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string> <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
<string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string> <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
<string name="status_loading_account_folder">\u0020(Pobieram <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_loading_account_folder">\u0020(Sprawdzam <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_loading_account_folder_headers">\u0020(Pobieranie nagłówków <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_loading_account_folder_headers">\u0020(Nagłówki: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_sending_account">\u0020(Wysyłam <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_sending_account">\u0020(Wysyłam: <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_processing_account">\u0020(Przetw. <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_processing_account">\u0020(Przetwarzam: <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string> <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(Sprawdzę o <xliff:g id="nexttime">%s</xliff:g>)</string> <string name="status_next_poll">\u0020(Sprawdzę o <xliff:g id="nexttime">%s</xliff:g>)</string>
@ -73,16 +72,18 @@
<string name="forward_action">Prześlij dalej</string> <string name="forward_action">Prześlij dalej</string>
<string name="move_action">Przenieś</string> <string name="move_action">Przenieś</string>
<string name="continue_action">Kontynuuj</string> <string name="continue_action">Kontynuuj</string>
<string name="back_action">Cofnij</string>
<string name="done_action">Gotowe</string> <!-- Used to complete a multi-step process --> <string name="done_action">Gotowe</string> <!-- Used to complete a multi-step process -->
<string name="remove_action">Skasuj</string> <string name="remove_action">Skasuj</string>
<string name="discard_action">Usuń</string> <string name="discard_action">Usuń</string>
<string name="save_draft_action">Zapisz jako szkic</string> <string name="save_draft_action">Zapisz jako szkic</string>
<string name="retry_action">Ponów</string> <string name="retry_action">Ponów</string>
<string name="refresh_action">Odśwież</string> <string name="refresh_action">Odśwież</string>
<string name="check_mail_action">Pobierz</string> <string name="check_mail_action">Sprawdź pocztę</string>
<string name="send_messages_action">Wyślij wiadomości</string> <string name="send_messages_action">Wyślij wiadomości</string>
<string name="list_folders_action">Lista folderów</string> <string name="list_folders_action">Lista folderów</string>
<string name="refresh_folders_action">Odswież listę</string> <string name="refresh_folders_action">Odśwież listę</string>
<string name="filter_folders_action">Wyszukaj folder</string>
<string name="mark_all_as_read_action">Wszystkie jako przeczytane</string> <string name="mark_all_as_read_action">Wszystkie jako przeczytane</string>
<string name="add_account_action">Dodaj konto</string> <string name="add_account_action">Dodaj konto</string>
<string name="compose_action">Napisz</string> <string name="compose_action">Napisz</string>
@ -100,36 +101,35 @@
<string name="back_to_accounts_action">◀</string> <string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string> <string name="back_to_folder_list_action">◀</string>
<string name="read_action">Otwórz</string> <string name="read_action">Otwórz</string>
<string name="mark_as_read_action">Ozn. jako przeczytane</string> <string name="mark_as_read_action">Oznacz jako przeczytane</string>
<string name="send_alternate_action">Prześlij dalej (alternatywne)</string> <string name="send_alternate_action">Prześlij dalej (alternatywne)</string>
<string name="send_alternate_chooser_title">Wybierz nadawcę</string> <string name="send_alternate_chooser_title">Wybierz nadawcę</string>
<string name="mark_all_as_read_dlg_title">Wszystkie jako przeczytane</string> <string name="mark_all_as_read_dlg_title">Wszystkie jako przeczytane</string>
<string name="mark_all_as_read_dlg_instructions_fmt">Oznaczyć wszystkie wiadomości w \'<xliff:g id="folder">%s</xliff:g>\' jako przeczytane <string name="mark_all_as_read_dlg_instructions_fmt">Oznaczyć wszystkie wiadomości w \'<xliff:g id="folder">%s</xliff:g>\' jako przeczytane (włączając wiadomości znajdujące się w folderze, które nie są wyświetlone w programie K-9)?</string>
(włączając wiadomości znajdujące się w folderze, które nie są wyświetlone w programie K-9)?</string>
<string name="flag_action">Dodaj gwiazdkę</string> <string name="flag_action">Dodaj gwiazdkę</string>
<string name="unflag_action">Usuń gwiazdkę</string> <string name="unflag_action">Usuń gwiazdkę</string>
<string name="copy_action">Skopiuj</string> <string name="copy_action">Skopiuj</string>
<string name="show_full_header_action">Pokaż pełne nagłówki</string> <string name="show_full_header_action">Pokaż pełne nagłówki</string>
<string name="hide_full_header_action">Ukryj pełne nagłówki</string> <string name="hide_full_header_action">Ukryj pełne nagłówki</string>
<string name="select_text_action">Wybierz text</string> <string name="select_text_action">Zaznacz tekst</string>
<string name="mark_as_unread_action">Jako nieprzeczytane</string> <string name="mark_as_unread_action">Jako nieprzeczytane</string>
<string name="move_to_action">Przenieś do</string> <string name="move_to_action">Przenieś do</string>
<string name="folders_action">Foldery</string> <string name="folders_action">Foldery</string>
<string name="view_hide_details_action">Pokaż/Ukryj szczegóły</string> <string name="view_hide_details_action">Pokaż/ukryj szczegóły</string>
<string name="add_cc_bcc_action">Dodaj DW/UDW</string> <string name="add_cc_bcc_action">Dodaj DW/UDW</string>
<string name="edit_subject_action">Edytuj temat</string> <string name="edit_subject_action">Edytuj temat</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>--> <string name="read_receipt">Powiadomienie o przeczytaniu</string>
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>--> <string name="read_receipt_enabled">Żadaj powiadomienia o przeczytaniu</string>
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>--> <string name="read_receipt_disabled">Nie wymagaj powiadomienia o przeczytaniu</string>
<string name="add_attachment_action">Dodaj załącznik</string> <string name="add_attachment_action">Dodaj załącznik</string>
<string name="add_attachment_action_image">Dodaj załącznik (Zdjęcie)</string> <string name="add_attachment_action_image">Dodaj załącznik (Zdjęcie)</string>
<string name="add_attachment_action_video">Add załącznik (Film)</string> <string name="add_attachment_action_video">Dodaj załącznik (Film)</string>
<string name="dump_settings_action">Zapisz ustawienia</string> <string name="dump_settings_action">Zapisz ustawienia</string>
<string name="empty_trash_action">Opróżnij śmietnik</string> <string name="empty_trash_action">Opróżnij kosz</string>
<string name="expunge_action">Wyczyść</string> <!-- FIXME - probably--> <string name="expunge_action">Wyczyść</string>
<string name="clear_local_folder_action">Wyczyść wiadomości lokalne</string> <string name="clear_local_folder_action">Wyczyść wiadomości lokalne</string>
<string name="set_sort_action">Wybierz sortowanie</string> <string name="set_sort_action">Wybierz sortowanie</string>
<string name="reverse_sort_action">Sortuj malejąco</string> <string name="reverse_sort_action">Sortuj malejąco</string>
@ -142,9 +142,9 @@
<string name="general_no_subject">(Brak tematu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. --> <string name="general_no_subject">(Brak tematu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
<string name="general_no_date">Brak daty</string> <string name="general_no_date">Brak daty</string>
<string name="general_no_sender">Brak nadawcy</string> <string name="general_no_sender">Brak nadawcy</string>
<string name="status_loading">Poll <xliff:g id="progress">%s</xliff:g></string> <string name="status_loading">Sprawdzanie <xliff:g id="progress">%s</xliff:g></string>
<string name="status_loading_folder">(Poll <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string> <string name="status_loading_folder">(Sprawdzam <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_loading_more">Wczytuję wiadomość\u2026</string> <string name="status_loading_more">Wczytuję wiadomości…</string>
<string name="status_network_error">Błąd połączenia</string> <string name="status_network_error">Błąd połączenia</string>
<string name="status_invalid_id_error">Nie znaleziono wiadomości</string> <string name="status_invalid_id_error">Nie znaleziono wiadomości</string>
<string name="status_error">Błąd</string> <!-- Used in Outbox when a message has failed to send --> <string name="status_error">Błąd</string> <!-- Used in Outbox when a message has failed to send -->
@ -180,17 +180,16 @@
<string name="notification_bg_title_separator">:</string> <string name="notification_bg_title_separator">:</string>
<string name="special_mailbox_name_inbox">Odebrane</string> <string name="special_mailbox_name_inbox">Odebrane</string>
<string name="special_mailbox_name_outbox">Outbox</string> <string name="special_mailbox_name_outbox">Wychodzące</string>
<!-- The following mailbox names will be used if the user has not specified one from the server --> <!-- The following mailbox names will be used if the user has not specified one from the server -->
<string name="special_mailbox_name_drafts">Drafts</string> <string name="special_mailbox_name_drafts">Szablony</string>
<string name="special_mailbox_name_trash">Trash</string> <string name="special_mailbox_name_trash">Kosz</string>
<string name="special_mailbox_name_sent">Sent</string> <string name="special_mailbox_name_sent">Wysłane</string>
<string name="special_mailbox_name_archive">Archiwizuj</string> <string name="special_mailbox_name_archive">Archiwizuj</string>
<string name="special_mailbox_name_spam">Spam</string> <string name="special_mailbox_name_spam">Spam</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string> <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Śmietnik)</string> <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Usunięte)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Wysłane)</string> <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Wysłane)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archiwum)</string> <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archiwum)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string> <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
@ -199,11 +198,11 @@
<string name="send_failure_body_abbrev">Dalsze informacje znajdziesz w folderze <xliff:g id="errorFolder">%s</xliff:g>.</string> <string name="send_failure_body_abbrev">Dalsze informacje znajdziesz w folderze <xliff:g id="errorFolder">%s</xliff:g>.</string>
<string name="send_failure_body_fmt">K-9 napotkał na problemy podczas wysyłki niektórych wiadomości. <string name="send_failure_body_fmt">K-9 napotkał na problemy podczas wysyłki niektórych wiadomości.
Niestety, z powodu natury problemu, K-9 nie jest w stanie ocenić czy wiadomość została wysłana Niestety, z powodu natury problemu, K-9 nie jest w stanie ocenić czy wiadomość została wysłana
czy też nie (odbiorcy mogli ortrzymać kopie wysyłanych wiadomości). czy też nie (odbiorcy mogli otrzymać kopie wysyłanych wiadomości).
\u000a\u000aWiadomości przy których ten problem wystąpił zostały oznaczone gwiazdką w folderze \u000a\u000aWiadomości przy których ten problem wystąpił zostały oznaczone gwiazdką w folderze
poczty wychodzącej (Outbox). Jeśli usuniesz z nich gwiazdkę, K-9 spróbuje wysłac te wiadomości poczty wychodzącej (Wychodzące). Jeśli usuniesz z nich gwiazdkę, K-9 spróbuje wysłac te wiadomości
raz jeszcze. Wciśnij i przytrzymaj folder Outbox a następnie wybierz "Wyślij wiadomości" aby raz jeszcze. Wciśnij i przytrzymaj folder Wychodzące a następnie wybierz Wyślij wiadomości, aby
zainicjować kolejną próbę wysyłki.\u000A\u000a zainicjować kolejną próbę wysyłki.\u000a\u000a
Folder <xliff:g id="errorFolder">%s</xliff:g> moze zawierać komunikaty błędów dot. tego problemu.</string> Folder <xliff:g id="errorFolder">%s</xliff:g> moze zawierać komunikaty błędów dot. tego problemu.</string>
<string name="alert_header">Alarm K-9</string> <string name="alert_header">Alarm K-9</string>
@ -227,7 +226,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
\n * Zapisywanie załączników na kartę SD \n * Zapisywanie załączników na kartę SD
\n * Opróźnianie folderu \"Trash\" \n * Opróźnianie folderu \"Trash\"
\n * Sortowanie wiadomości \n * Sortowanie wiadomości
\n * ... i wiele innych \n * … i wiele innych
\n \n
\nK-9 nie obsługuje darmowych kont Hotmail oraz, jak wiele innych programów pocztowych może być kapryśny przy połączeniach z serwerem Microsoft Exchange. \nK-9 nie obsługuje darmowych kont Hotmail oraz, jak wiele innych programów pocztowych może być kapryśny przy połączeniach z serwerem Microsoft Exchange.
\n \n
@ -243,11 +242,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="debug_enable_sensitive_logging_title">Loguj poufne informacje</string> <string name="debug_enable_sensitive_logging_title">Loguj poufne informacje</string>
<string name="debug_enable_sensitive_logging_summary">Logi mogą zawierać Twoje hasła</string> <string name="debug_enable_sensitive_logging_summary">Logi mogą zawierać Twoje hasła</string>
<string name="message_header_mua">K-9 Mail dla Androida</string> <string name="combined_inbox_title">Wszystkie wiadomości</string>
<string name="combined_inbox_label">Ostatnie wiadomości ze wszystkich kont</string>
<string name="combined_inbox_title">Wszystkie maile</string> <string name="combined_inbox_list_title">Wszystkie odebrane</string>
<string name="combined_inbox_label">Recent messages from all accounts</string>
<string name="combined_inbox_list_title">All Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
<string name="message_list_title_fmt"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> <string name="message_list_title_fmt"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g>
<xliff:g id="unread_count">%s</xliff:g> <xliff:g id="unread_count">%s</xliff:g>
@ -267,6 +264,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="message_compose_bcc_hint">UDW</string> <string name="message_compose_bcc_hint">UDW</string>
<string name="message_compose_subject_hint">Temat</string> <string name="message_compose_subject_hint">Temat</string>
<string name="message_compose_content_hint">Treść wiadomości</string> <string name="message_compose_content_hint">Treść wiadomości</string>
<string name="message_compose_signature_hint">Podpis</string>
<string name="message_compose_quote_header_separator">-------- Wiadomość oryginalna --------</string> <string name="message_compose_quote_header_separator">-------- Wiadomość oryginalna --------</string>
<string name="message_compose_quote_header_subject">Temat:</string> <string name="message_compose_quote_header_subject">Temat:</string>
<string name="message_compose_quote_header_send_date">Wysłane:</string> <string name="message_compose_quote_header_send_date">Wysłane:</string>
@ -278,16 +276,21 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="message_compose_error_no_recipients">Musisz dodać co najmniej jednego odbiorcę.</string> <string name="message_compose_error_no_recipients">Musisz dodać co najmniej jednego odbiorcę.</string>
<string name="error_contact_address_not_found">Żaden adres email nie został znaleziony.</string> <string name="error_contact_address_not_found">Żaden adres email nie został znaleziony.</string>
<string name="message_compose_downloading_attachments_toast">Niektóre załączniki nie zostały pobrane. Zostaną pobrane automatycznie przed wysłaniem tej wiadomości.</string> <string name="message_compose_downloading_attachments_toast">Niektóre załączniki nie zostały pobrane. Zostaną pobrane automatycznie przed wysłaniem tej wiadomości.</string>
<string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą byc przesłane dalej ponieważ nie zostały wcześniej pobrane.</string> <string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą być przesłane dalej ponieważ nie zostały wcześniej pobrane.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>--> <string name="message_compose_show_quoted_text_action">Cytuj wiadomość</string>
<string name="message_compose_description_add_to">Dodaj odbiorcę (Do)</string>
<string name="message_compose_description_add_cc">Dodaj odbiorcę (DW)</string>
<string name="message_compose_description_add_bcc">Dodaj odbiorcę (UDW)</string>
<string name="message_compose_description_delete_quoted_text">Usuń cytowany tekst</string>
<string name="message_compose_description_edit_quoted_text">Edytuj cytowany tekst</string>
<string name="message_view_from_format">Od: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string> <string name="message_view_from_format">Od: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Do:</string> <string name="message_to_label">Do:</string>
<string name="message_view_cc_label">DW:</string> <string name="message_view_cc_label">DW:</string>
<string name="message_view_attachment_view_action">Otwórz</string> <string name="message_view_attachment_view_action">Otwórz</string>
<string name="message_view_attachment_download_action">Zapisz</string> <string name="message_view_attachment_download_action">Zapisz</string>
<string name="message_view_prev_action">\u25BC</string> <string name="message_view_prev_action">▼</string>
<string name="message_view_next_action">\u25B2</string> <string name="message_view_next_action">▲</string>
<string name="message_view_archive_action">Archiwizuj</string> <string name="message_view_archive_action">Archiwizuj</string>
<string name="message_view_move_action">Przenieś</string> <string name="message_view_move_action">Przenieś</string>
<string name="message_view_spam_action">Spam</string> <string name="message_view_spam_action">Spam</string>
@ -296,13 +299,16 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="message_view_status_attachment_not_saved">Zapisywanie załącznika na karcie SD nie powiodło się.</string> <string name="message_view_status_attachment_not_saved">Zapisywanie załącznika na karcie SD nie powiodło się.</string>
<string name="message_view_show_pictures_instructions">Wybierz \"Wyświetl grafikę\" aby wyświetlić osadzoną w treści grafikę.</string> <string name="message_view_show_pictures_instructions">Wybierz \"Wyświetl grafikę\" aby wyświetlić osadzoną w treści grafikę.</string>
<string name="message_view_show_pictures_action">Wyświetl grafikę</string> <string name="message_view_show_pictures_action">Wyświetl grafikę</string>
<string name="message_view_fetching_attachment_toast">Pobieram załącznik...</string> <string name="message_view_show_message_action">Pokaż wiadomość</string>
<string name="message_view_show_attachments_action">Pokaż załączniki</string>
<string name="message_view_show_more_attachments_action">Więcej…</string>
<string name="message_view_fetching_attachment_toast">Pobieram załącznik…</string>
<string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string> <string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Pobierz całą wiadomość</string> <string name="message_view_download_remainder">Pobierz całą wiadomość</string>
<string name="message_view_downloading">Pobieranie…</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' --> <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
<string name="message_additional_headers_not_downloaded">Nie wszystkie nagłówki zostały pobrane lub zapisane. Wybierz \"Zapisuj nagłówki lokalnie\" w ustawieniach serwera poczty przychodzącej aby tę funcje aktywować</string> <string name="message_additional_headers_not_downloaded">Nie wszystkie nagłówki zostały pobrane lub zapisane. Wybierz \"Zapisuj nagłówki lokalnie\" w ustawieniach serwera poczty przychodzącej, aby tę funcje aktywować</string>
<string name="message_no_additional_headers_available">Wszystkie nagłówki pobrano, niemniej nie znaleziono żadnych dodatkowych do wyświetlenia.</string> <string name="message_no_additional_headers_available">Wszystkie nagłówki pobrano, niemniej nie znaleziono żadnych dodatkowych do wyświetlenia.</string>
<string name="message_additional_headers_retrieval_failed">Pobieranie nagłówkow nie powiodło się.</string> <string name="message_additional_headers_retrieval_failed">Pobieranie nagłówkow nie powiodło się.</string>
@ -323,40 +329,51 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="message_delete_failed">Nie moge skasować wiadomości</string> <string name="message_delete_failed">Nie moge skasować wiadomości</string>
<string name="about_header"><xliff:g id="app_name">%s</xliff:g></string> <string name="about_header"><xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">wersja <xliff:g id="version">%s</xliff:g></string> <string name="about_version">Wersja <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Oznaczaj gwiazdkami</string> <string name="global_settings_flag_label">Oznaczaj gwiazdkami</string>
<string name="global_settings_flag_summary">Gwiazka wskazuje oznakowane wiadomości</string> <string name="global_settings_flag_summary">Gwiazka wskazuje oznakowane wiadomości</string>
<string name="global_settings_checkbox_label">Zaznaczanie wielu maili</string> <string name="global_settings_checkbox_label">Zaznaczanie wielu</string>
<string name="global_settings_checkbox_summary">Opcja zaznaczania dostępna zawsze w trybie wielokrotnego wyboru</string> <string name="global_settings_checkbox_summary">Opcja zaznaczania wielu wiadomości dostępna zawsze w trybie wielokrotnego wyboru</string>
<string name="global_settings_touchable_label">Widok Touch-friendly</string> <string name="global_settings_touchable_label">Widok palco-przyjazny</string>
<string name="global_settings_touchable_summary">Lista z podglądem treści wiadomości</string> <string name="global_settings_touchable_summary">Lista z podglądem treści wiadomości</string>
<string name="global_settings_preview_lines_label">Podglądaj linie</string> <string name="global_settings_preview_lines_label">Podglądaj linie</string>
<string name="global_settings_show_correspondent_names_label">Pokazuj nazwiska korespondentów</string> <string name="global_settings_show_correspondent_names_label">Pokazuj nazwiska korespondentów</string>
<string name="global_settings_show_correspondent_names_summary">Pokazuj nazwiska korespondentów zamiast ich adresów email</string> <string name="global_settings_show_correspondent_names_summary">Pokazuj nazwiska korespondentów zamiast ich adresów email</string>
<string name="global_settings_show_contact_name_label">Pokazuj nazwiska kontaktów</string> <string name="global_settings_show_contact_name_label">Pokazuj nazwę kontaktu</string>
<string name="global_settings_show_contact_name_summary">Użyj nazwisk odbiorców z kontaktów kiedy to możliwe</string> <string name="global_settings_show_contact_name_summary">Użyj nazw nadawców, jeżeli występują w Twojej książce kontaktowej</string>
<string name="global_settings_registered_name_color_label">Koloruj kontakty</string> <string name="global_settings_registered_name_color_label">Koloruj kontakty</string>
<string name="global_settings_registered_name_color_default">Nie koloruj nazwisk na liście kontaktów</string> <string name="global_settings_registered_name_color_default">Nie koloruj nazwisk na liście kontaktów</string>
<string name="global_settings_registered_name_color_changed">Koloruj nazwiska na liście kontaktów</string> <string name="global_settings_registered_name_color_changed">Koloruj nazwiska na liście kontaktów</string>
<string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szer.</string> <string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szer.</string>
<string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania maili tekstowych</string> <string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania wiadomości tekstowych</string>
<string name="global_settings_messageview_return_to_list_label">Skasuj i wróć do listy</string> <string name="global_settings_messageview_return_to_list_label">Skasuj i wróć do listy</string>
<string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danego maila</string> <string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danej wiadomości</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>--> <string name="global_settings_messageview_show_next_label">Pokaż następną wiadomość po usunięciu</string>
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>--> <string name="global_settings_messageview_show_next_summary">Pokaż domyślnie następną wiadomość po usunięciu</string>
<string name="global_settings_confirm_actions_title">Potwierdź akcje</string> <string name="global_settings_confirm_actions_title">Potwierdź akcje</string>
<string name="global_settings_confirm_actions_summary">Pokaż okno dialogowe kiedy wykonujesz wybrane akcje</string> <string name="global_settings_confirm_actions_summary">Pokaż potwierdzające okno dialogowe, gdy wykonujesz wybrane akcje</string>
<string name="global_settings_confirm_action_archive">Archiwizuj</string> <string name="global_settings_confirm_action_archive">Archiwizuj</string>
<string name="global_settings_confirm_action_delete">Usuń (tylko widok wiadomości)</string> <string name="global_settings_confirm_action_delete">Usuń (tylko widok wiadomości)</string>
<string name="global_settings_confirm_action_delete_starred">Usuń oznacz. gwiazkdą (tylko widok wiadomości)</string>
<string name="global_settings_confirm_action_spam">Spam</string> <string name="global_settings_confirm_action_spam">Spam</string>
<string name="global_settings_confirm_action_mark_all_as_read">Oznacz wszystkie jako przeczytane</string> <string name="global_settings_confirm_action_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
<string name="global_settings_confirm_action_send">Wyślij</string> <string name="global_settings_confirm_action_send">Wyślij</string>
<string name="global_settings_privacy_mode_title">Powiadomienia ekranowe przy zablokowanym ekranie</string> <string name="global_settings_privacy_mode_title">Powiadomienia ekranowe przy zablokowanym ekranie</string>
<string name="global_settings_privacy_mode_summary">Nie pokazuj tematu wiadomości w pasku powiadimień gdy ekran jest zablokowany</string> <string name="global_settings_privacy_mode_summary">Nie pokazuj tematu wiadomości w pasku powiadomień, gdy ekran jest zablokowany</string>
<!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
<!-- NEW: <string name="global_settings_delete">Delete</string>-->
<!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
<!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
<!-- NEW: <string name="global_settings_move">Move</string>-->
<!-- NEW: <string name="global_settings_flag">Flag</string>-->
<!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
<string name="quiet_time">Okres ciszy</string> <string name="quiet_time">Okres ciszy</string>
<string name="quiet_time_description">Wyłącz dzwonienie, wibracje i mruganie w nocy</string> <string name="quiet_time_description">Wyłącz dzwonienie, wibracje i mruganie w nocy</string>
@ -374,20 +391,20 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_basics_manual_setup_action">Ustaw ręcznie</string> <string name="account_setup_basics_manual_setup_action">Ustaw ręcznie</string>
<string name="account_setup_check_settings_title"></string> <string name="account_setup_check_settings_title"></string>
<string name="account_setup_check_settings_retr_info_msg">Pobieram informacje\u2026</string> <string name="account_setup_check_settings_retr_info_msg">Pobieram informacje…</string>
<string name="account_setup_check_settings_check_incoming_msg">Sprawdzam ustawienia serwera\u2026</string> <string name="account_setup_check_settings_check_incoming_msg">Sprawdzam ustawienia serwera…</string>
<string name="account_setup_check_settings_check_outgoing_msg">Sprawdzam ustawienia serwera\u2026</string> <string name="account_setup_check_settings_check_outgoing_msg">Sprawdzam ustawienia serwera…</string>
<string name="account_setup_check_settings_authenticate">Autentykacja\u2026</string> <string name="account_setup_check_settings_authenticate">Autentyfikacja…</string>
<string name="account_setup_check_settings_fetch">Pobieranie ustawień konta\u2026</string> <string name="account_setup_check_settings_fetch">Pobieranie ustawień konta…</string>
<string name="account_setup_check_settings_finishing_msg">Kończę\u2026</string> <string name="account_setup_check_settings_finishing_msg">Kończę…</string>
<string name="account_setup_check_settings_canceling_msg">Przerywam\u2026</string> <string name="account_setup_check_settings_canceling_msg">Przerywam…</string>
<string name="account_setup_names_title">Prawie gotowe!</string> <string name="account_setup_names_title">Prawie gotowe!</string>
<string name="account_setup_names_instructions">Ustawienia są już gotowe i maile są w drodze!</string> <string name="account_setup_names_instructions">Ustawienia są już gotowe i maile są w drodze!</string>
<string name="account_setup_names_account_name_label">Wpisz nazwę (opcjonalną) tego konta:</string> <string name="account_setup_names_account_name_label">Wpisz nazwę (opcjonalną) tego konta:</string>
<string name="account_setup_names_user_name_label">Twoje imię i nazwisko (pojawi się w wysyłanych wiadomościach):</string> <string name="account_setup_names_user_name_label">Twoje imię i nazwisko (pojawi się w wysyłanych wiadomościach):</string>
<string name="account_setup_finished_toast">Konto skonfigurowane!\n\nPobieram wiadomości\u2026</string> <string name="account_setup_finished_toast">Konto skonfigurowane!\n\nPobieram wiadomości…</string>
<string name="account_setup_account_type_title">Rodzaj konta</string> <string name="account_setup_account_type_title">Rodzaj konta</string>
<string name="account_setup_account_type_instructions">Jakiego typu serwer obsługuje to konto?</string> <string name="account_setup_account_type_instructions">Jakiego typu serwer obsługuje to konto?</string>
@ -421,8 +438,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_incoming_wifi_label">Wi-Fi</string> <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
<string name="account_setup_incoming_other_label">Inne</string> <string name="account_setup_incoming_other_label">Inne</string>
<string name="account_setup_incoming_save_all_headers_title">Pobieranie nagłówków wiadomości</string> <string name="account_setup_incoming_save_all_headers_title">Pobieranie nagłówków</string>
<string name="account_setup_incoming_save_all_headers_label">Zapisuj nagłówki lokalnie</string> <string name="account_setup_incoming_save_all_headers_label">Zapisuj nagłówki wiadomości lokalnie</string>
<string name="local_storage_provider_external_label">Pamięć zewnętrzna (karta SD)</string> <string name="local_storage_provider_external_label">Pamięć zewnętrzna (karta SD)</string>
<string name="local_storage_provider_internal_label">Zwykła pamięc wewnętrzna</string> <string name="local_storage_provider_internal_label">Zwykła pamięc wewnętrzna</string>
@ -434,7 +451,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_expunge_policy_on_poll">Podczas każdego pobrania</string> <string name="account_setup_expunge_policy_on_poll">Podczas każdego pobrania</string>
<string name="account_setup_expunge_policy_manual">Tylko ręcznie</string> <string name="account_setup_expunge_policy_manual">Tylko ręcznie</string>
<!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>--> <string name="account_setup_incoming_autodetect_namespace_label">Wykrywaj automatycznie IMAP namespace</string>
<string name="account_setup_incoming_imap_path_prefix_label">Prefiks ścieżki IMAP</string> <string name="account_setup_incoming_imap_path_prefix_label">Prefiks ścieżki IMAP</string>
<string name="drafts_folder_label">Szkice</string> <string name="drafts_folder_label">Szkice</string>
@ -449,12 +466,12 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_incoming_webdav_path_prefix_label">Ścieżka WebDAV (Exchange)</string> <string name="account_setup_incoming_webdav_path_prefix_label">Ścieżka WebDAV (Exchange)</string>
<string name="account_setup_incoming_webdav_path_prefix_hint">Opcjonalne</string> <string name="account_setup_incoming_webdav_path_prefix_hint">Opcjonalne</string>
<string name="account_setup_incoming_webdav_auth_path_label">Ścieżka autentykacji</string> <string name="account_setup_incoming_webdav_auth_path_label">Ścieżka autentyfikacji</string>
<string name="account_setup_incoming_webdav_auth_path_hint">Opcjonalne</string> <string name="account_setup_incoming_webdav_auth_path_hint">Opcjonalne</string>
<string name="account_setup_incoming_webdav_mailbox_path_label">Ścieżka Mailboxa</string> <string name="account_setup_incoming_webdav_mailbox_path_label">Ścieżka Mailboxa</string>
<string name="account_setup_incoming_webdav_mailbox_path_hint">Opcjonalne</string> <string name="account_setup_incoming_webdav_mailbox_path_hint">Opcjonalne</string>
<string name="account_setup_outgoing_title">Poczta wysyłana (SMTP)</string> <string name="account_setup_outgoing_title">Poczta wychodząca (SMTP)</string>
<string name="account_setup_outgoing_smtp_server_label">Nazwa serwera SMTP</string> <string name="account_setup_outgoing_smtp_server_label">Nazwa serwera SMTP</string>
<string name="account_setup_outgoing_port_label">Port</string> <string name="account_setup_outgoing_port_label">Port</string>
<string name="account_setup_outgoing_security_label">Typ zabezpieczeń</string> <string name="account_setup_outgoing_security_label">Typ zabezpieczeń</string>
@ -464,8 +481,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_outgoing_security_tls_label">TLS (zawsze)</string> <string name="account_setup_outgoing_security_tls_label">TLS (zawsze)</string>
<string name="account_setup_outgoing_require_login_label">Serwer wymaga uwierzytelnienia</string> <string name="account_setup_outgoing_require_login_label">Serwer wymaga uwierzytelnienia</string>
<string name="account_setup_outgoing_username_label">Identyfikator</string> <string name="account_setup_outgoing_username_label">Identyfikator</string>
<string name="account_setup_outgoing_password_label">Haslo</string> <string name="account_setup_outgoing_password_label">Hasło</string>
<string name="account_setup_outgoing_authentication_label">Rodzaj autentykacji</string> <string name="account_setup_outgoing_authentication_label">Rodzaj autentyfikacji</string>
<!-- The authentication strings below are for a planned (hopefully) change to the above username and password options --> <!-- The authentication strings below are for a planned (hopefully) change to the above username and password options -->
<string name="account_setup_outgoing_authentication_basic_label">Login i hasło</string> <string name="account_setup_outgoing_authentication_basic_label">Login i hasło</string>
<string name="account_setup_outgoing_authentication_basic_username_label">Identyfikator</string> <string name="account_setup_outgoing_authentication_basic_username_label">Identyfikator</string>
@ -482,7 +499,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="clear_action">Usuń wszystkie dane (niebezpieczne!)</string> <string name="clear_action">Usuń wszystkie dane (niebezpieczne!)</string>
<string name="recreate_action">Odtwórz dane (ostatnia szansa!)</string> <string name="recreate_action">Odtwórz dane (ostatnia szansa!)</string>
<string name="account_setup_options_mail_check_frequency_label">Pobieranie maili</string> <string name="account_setup_options_mail_check_frequency_label">Pobieranie wiadomości</string>
<!-- Frequency also used in account_settings_* --> <!-- Frequency also used in account_settings_* -->
<string name="account_setup_options_mail_check_frequency_never">Nigdy</string> <string name="account_setup_options_mail_check_frequency_never">Nigdy</string>
<string name="account_setup_options_mail_check_frequency_1min">Co 1 minutę</string> <string name="account_setup_options_mail_check_frequency_1min">Co 1 minutę</string>
@ -499,8 +516,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="push_poll_on_connect_label">Pobieraj podczas połączeń Push</string> <!-- FIXME --> <string name="push_poll_on_connect_label">Pobieraj podczas połączeń Push</string> <!-- FIXME -->
<string name="account_setup_options_enable_push_label">Włącz obsługe Push mail dla tego konta</string> <string name="account_setup_options_enable_push_label">Włącz obsługe Push mail dla tego konta</string>
<string name="account_setup_options_enable_push_summary">If your server supports it, new messages will appear instantly. This option can dramatically improve or hurt performance.</string> <!-- FIXME --> <string name="account_setup_options_enable_push_summary">Jeżeli Twój serwer obsługuje, nowe wiadomości pojawią się natychmiast. Ta opcja może dramatycznie obniżyć lub zwiększyć wydajność.</string>
<string name="idle_refresh_period_label">Odswież połączenie IDLE</string> <string name="idle_refresh_period_label">Odśwież połączenie IDLE</string>
<string name="idle_refresh_period_1min">Co 1 minutę</string> <string name="idle_refresh_period_1min">Co 1 minutę</string>
<string name="idle_refresh_period_2min">Co 2 minuty</string> <string name="idle_refresh_period_2min">Co 2 minuty</string>
<string name="idle_refresh_period_3min">co 3 minuty</string> <string name="idle_refresh_period_3min">co 3 minuty</string>
@ -511,7 +528,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="idle_refresh_period_48min">Co 48 minut</string> <string name="idle_refresh_period_48min">Co 48 minut</string>
<string name="idle_refresh_period_60min">Co 60 minut</string> <string name="idle_refresh_period_60min">Co 60 minut</string>
<string name="account_setup_options_default_label">Domyślnie wysyłaj maile z tego konta</string> <string name="account_setup_options_default_label">Domyślnie wysyłaj wiadomości z tego konta</string>
<string name="account_setup_options_notify_label">Powiadamiaj o nowej poczcie</string> <string name="account_setup_options_notify_label">Powiadamiaj o nowej poczcie</string>
<string name="account_setup_options_notify_sync_label">Powiadamiaj o sprawdzaniu konta</string> <string name="account_setup_options_notify_sync_label">Powiadamiaj o sprawdzaniu konta</string>
@ -535,25 +552,27 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_failed_dlg_edit_details_action">Popraw ustawienia</string> <string name="account_setup_failed_dlg_edit_details_action">Popraw ustawienia</string>
<string name="account_setup_failed_dlg_continue_action">Kontynuuj</string> <string name="account_setup_failed_dlg_continue_action">Kontynuuj</string>
<!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>--> <string name="account_settings_push_advanced_title">Zaawansowane</string>
<string name="account_settings_title_fmt">Ustawienia ogólne</string> <string name="account_settings_title_fmt">Ustawienia ogólne</string>
<string name="account_settings_default">Konto domyślne</string> <string name="account_settings_default">Konto domyślne</string>
<string name="account_settings_default_label">Konto domyślne</string> <string name="account_settings_default_label">Konto domyślne</string>
<string name="account_settings_default_summary">Domyślnie wysyłaj maile z tego konta</string> <string name="account_settings_default_summary">Domyślnie wysyłaj wiadomości z tego konta</string>
<string name="account_settings_notify_label">Nowe wiadomości</string> <string name="account_settings_notify_label">Nowe wiadomości</string>
<string name="account_settings_notify_sync_label">Synchronizacja</string> <string name="account_settings_notify_sync_label">Synchronizacja konta</string>
<string name="account_settings_email_label">Twój adres email</string> <string name="account_settings_email_label">Twój adres email</string>
<string name="account_settings_notify_summary">Powiadomiaj na pasku statusu gdy jest nową wiadomość</string> <string name="account_settings_notify_summary">Powiadomiaj na pasku statusu, gdy jest nowa wiadomość</string>
<string name="account_settings_notify_sync_summary">Powiadomiaj na pasku statusu o sprawdzaniu tego konta</string> <string name="account_settings_notify_sync_summary">Powiadomiaj na pasku status, gdy przeprowadzasz sprawdzanie tego konta</string>
<string name="account_settings_show_combined_label">Pokaż łączony Inbox</string> <string name="account_settings_show_combined_label">Pokaż łączoną Odbiorczą</string>
<string name="account_settings_notify_self_label">Moje wiadomości</string> <string name="account_settings_notify_self_label">Moje wiadomości</string>
<string name="account_settings_notify_self_summary">Powiadamiaj o mailach wysłanych przeze mnie</string> <string name="account_settings_notify_self_summary">Powiadamiaj również o wiadomościach, które sam wysłałem</string>
<string name="account_settings_notification_opens_unread_label">Notyfikacja otwiera nieprz. wiadomości</string> <!-- FIXME --> <string name="account_settings_notification_opens_unread_label">Nowe nieprzeczytane</string>
<string name="account_settings_notification_opens_unread_summary">Notifikacja wyszukuje nieprz. wiadomości</string> <!-- FIXME --> <string name="account_settings_notification_opens_unread_summary">Powiadomienie o nieprzeczytanych wiadomościach</string>
<string name="account_settings_notification_unread_count_label">Pokaż liczbę nieprzeczytanych</string> <string name="account_settings_notification_unread_count_label">Liczba nieprzeczytanych</string>
<string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień.</string> <string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień</string>
<string name="account_settings_mark_message_as_read_on_view_label">Oznacz jako przeczytane</string>
<string name="account_settings_mark_message_as_read_on_view_summary">Oznacz wiadomość jako przeczytaną przy otwieraniu</string>
<string name="account_settings_enable_move_buttons_label">Użyj przycisków refile </string> <!-- FIXME --> <string name="account_settings_enable_move_buttons_label">Użyj przycisków refile</string>
<string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string> <string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string>
<string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string> <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
@ -563,25 +582,29 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_composition">Tworzenie wiadomości</string> <string name="account_settings_composition">Tworzenie wiadomości</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>--> <string name="account_settings_default_quoted_text_shown_label">Cytuj oryginał</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>--> <string name="account_settings_default_quoted_text_shown_summary">Gdy odpowiadasz tekst oryginalnej wiadomości zostanie cytowany</string>
<string name="account_settings_reply_after_quote_label">Odpowiadaj po cytowanym tekście</string> <string name="account_settings_reply_after_quote_label">Cytat pod spodem</string>
<string name="account_settings_reply_after_quote_summary">Podczas odpowiadania, wiadomość oryginalna pojawi się nad Twoją odpowiedzią.</string> <string name="account_settings_reply_after_quote_summary">Podczas odpowiadania, wiadomość oryginalna (cytowana) pojawi się nad Twoją odpowiedzią</string>
<string name="account_settings_strip_signature_label">Wycinaj podpis z tekstu</string>
<string name="account_settings_strip_signature_summary">Gdy odpowiadasz na wiadomość, cytowany tekst nie bedzie zawierał podpisu</string>
<string name="account_settings_message_format_label">Format wiadomości</string> <string name="account_settings_message_format_label">Format wiadomości</string>
<string name="account_settings_message_format_text">Czysty tekst (bez obrazków i formatowania)</string> <string name="account_settings_message_format_text">Czysty tekst (bez obrazków i formatowania)</string>
<string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string> <string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string>
<string name="account_settings_message_format_auto">Automatycznie (czysty tekst, chyba że odpoiwadasz na wiadomość HTML)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>--> <string name="account_settings_message_read_receipt_label">Potwierdzenie przeczytania</string>
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>--> <string name="account_settings_message_read_receipt_summary">Zawsze wymagaj potwierdzenia o przeczytaniu</string>
<string name="account_settings_quote_style_label">Styl cytowania podczas odpowiedzi</string> <string name="account_settings_quote_style_label">Styl cytowania podczas odpowiedzi</string>
<string name="account_settings_quote_style_prefix">Prefix (jak Gmail, Pine)</string> <string name="account_settings_quote_style_prefix">Prefix (jak Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Nagłówek (jak Outlook, Yahoo!, Hotmail)</string> <string name="account_settings_quote_style_header">Nagłówek (jak Outlook, Yahoo!, Hotmail)</string>
<string name="account_settings_general_title">Ustawienia ogólne</string> <string name="account_settings_general_title">Ustawienia ogólne</string>
<string name="account_settings_display_prefs_title">Wyświetlacz</string> <string name="account_settings_display_prefs_title">Wygląd</string>
<string name="account_settings_sync">Synchronizacja folderów</string> <string name="account_settings_sync">Synchronizacja folderów</string>
<string name="account_settings_folders">Foldery</string> <string name="account_settings_folders">Foldery</string>
<string name="account_settings_message_lists">Lista wiadomości</string> <string name="account_settings_message_lists">Lista wiadomości</string>
@ -592,7 +615,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_crypto_app_none">Bez</string> <string name="account_settings_crypto_app_none">Bez</string>
<string name="account_settings_crypto_app_not_available">nie dostępny</string> <string name="account_settings_crypto_app_not_available">nie dostępny</string>
<string name="account_settings_crypto_auto_signature">Automatyczny podpis</string> <string name="account_settings_crypto_auto_signature">Automatyczny podpis</string>
<string name="account_settings_crypto_auto_signature_summary">Użyj adresu email do zgadnięcia klucza podpisu.</string> <string name="account_settings_crypto_auto_signature_summary">Użyj adresu email do zgadnięcia klucza podpisu</string>
<string name="account_settings_crypto_auto_encrypt">Automatyczne szyfrowanie</string>
<string name="account_settings_crypto_auto_encrypt_summary">Automatycznie używaj szyfrowania, gdy publiczny klucz pasuje do odbiorcy</string>
<string name="account_settings_mail_check_frequency_label">Sprawdzanie konta</string> <string name="account_settings_mail_check_frequency_label">Sprawdzanie konta</string>
<string name="account_settings_second_class_check_frequency_label">Cykliczne sprawdzanie folderów klasy 2</string> <string name="account_settings_second_class_check_frequency_label">Cykliczne sprawdzanie folderów klasy 2</string>
@ -607,7 +632,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_mail_display_count_label">Liczba wiadomości</string> <string name="account_settings_mail_display_count_label">Liczba wiadomości</string>
<string name="account_settings_autodownload_message_size_label">Pobierz wiadomośći aż do</string> <string name="account_settings_autodownload_message_size_label">Rozmiar pobieranych wiadomości</string>
<string name="account_settings_autodownload_message_size_1">1Kb</string> <string name="account_settings_autodownload_message_size_1">1Kb</string>
<string name="account_settings_autodownload_message_size_2">2Kb</string> <string name="account_settings_autodownload_message_size_2">2Kb</string>
<string name="account_settings_autodownload_message_size_4">4Kb</string> <string name="account_settings_autodownload_message_size_4">4Kb</string>
@ -625,8 +650,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_autodownload_message_size_any">dowolny rozmiar (bez limitu)</string> <string name="account_settings_autodownload_message_size_any">dowolny rozmiar (bez limitu)</string>
<string name="account_settings_message_age_label">Synchronizuj nowsze niż</string> <string name="account_settings_message_age_label">Synchronizuj nowsze niż</string>
<string name="account_settings_message_age_any">Wielki Wybuch</string> <string name="account_settings_message_age_any">wszystkie</string>
<string name="account_settings_message_age_0">1 dzień</string> <string name="account_settings_message_age_0">dzisiaj</string>
<string name="account_settings_message_age_1">2 dni</string> <string name="account_settings_message_age_1">2 dni</string>
<string name="account_settings_message_age_2">3 dni</string> <string name="account_settings_message_age_2">3 dni</string>
<string name="account_settings_message_age_7">ostatni tydzień</string> <string name="account_settings_message_age_7">ostatni tydzień</string>
@ -664,8 +689,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_folder_target_mode_first_and_second_class">Foldery klasy 1 oraz 2</string> <string name="account_settings_folder_target_mode_first_and_second_class">Foldery klasy 1 oraz 2</string>
<string name="account_settings_folder_target_mode_not_second_class">Wszystkich poza klasą 2</string> <string name="account_settings_folder_target_mode_not_second_class">Wszystkich poza klasą 2</string>
<string name="account_settings_sync_remote_deletetions_label">Synchronizacja usunięć na serwerze</string> <string name="account_settings_sync_remote_deletetions_label">Synchronizacja usunięć</string>
<string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string> <string name="account_settings_sync_remote_deletetions_summary">Usuwaj wiadomości również z serwera poczty</string>
<string name="folder_settings_title">Ustawienia folderu</string> <string name="folder_settings_title">Ustawienia folderu</string>
@ -691,7 +716,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_incoming_label">Poczta przychodząca</string> <string name="account_settings_incoming_label">Poczta przychodząca</string>
<string name="account_settings_incoming_summary">Ustawienia serwera poczty przychodzącej</string> <string name="account_settings_incoming_summary">Ustawienia serwera poczty przychodzącej</string>
<string name="account_settings_outgoing_label">Poczta wysyłana</string> <string name="account_settings_outgoing_label">Poczta wychodząca</string>
<string name="account_settings_outgoing_summary">Ustawienia serwera poczty wychodzącej (SMTP)</string> <string name="account_settings_outgoing_summary">Ustawienia serwera poczty wychodzącej (SMTP)</string>
<string name="account_settings_add_account_label">Dodaj kolejne konto</string> <string name="account_settings_add_account_label">Dodaj kolejne konto</string>
<string name="account_settings_description_label">Nazwa konta</string> <string name="account_settings_description_label">Nazwa konta</string>
@ -699,7 +724,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="notifications_title">Powiadomienia</string> <string name="notifications_title">Powiadomienia</string>
<string name="account_settings_ring_summary">Odtwórz dzwięk, gdy są nowe wiadomości</string> <string name="account_settings_ring_summary">Odtwórz dzwięk, gdy są nowe wiadomości</string>
<string name="account_settings_vibrate_enable">Wibracja</string> <string name="account_settings_vibrate_enable">Wibracja</string>
<string name="account_settings_vibrate_summary">Wibruj gdy są nowe wiadomości</string> <string name="account_settings_vibrate_summary">Wibruj, gdy są nowe wiadomości</string>
<string name="account_settings_vibrate_pattern_label">Schematy wibracji</string> <string name="account_settings_vibrate_pattern_label">Schematy wibracji</string>
<string name="account_settings_vibrate_pattern_default">Domyślny</string> <string name="account_settings_vibrate_pattern_default">Domyślny</string>
<string name="account_settings_vibrate_pattern_1">Schemat 1</string> <string name="account_settings_vibrate_pattern_1">Schemat 1</string>
@ -752,14 +777,14 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_signature_label">Sygnatura</string> <string name="account_settings_signature_label">Sygnatura</string>
<string name="account_settings_signature_summary">Dodawaj sygnaturę do każdej wysyłanej wiadomości</string> <string name="account_settings_signature_summary">Dodawaj sygnaturę do każdej wysyłanej wiadomości</string>
<string name="default_signature">-- \nWysłane z Androida za pomocą K-9 Mail. Prosze wybaczyć lakoniczność.</string> <string name="default_signature">-- \nWysłane za pomocą K-9 Mail.</string>
<string name="default_identity_description">Tożsamość domyślna</string> <string name="default_identity_description">Tożsamość domyślna</string>
<string name="choose_identity">Wybierz tożsamość</string> <string name="choose_identity">Wybierz tożsamość</string>
<string name="choose_identity_title">Wybierz tożsamość</string> <string name="choose_identity_title">Wybierz tożsamość</string>
<string name="choose_account_title">Wybierz konto/tożsamość</string> <string name="choose_account_title">Wybierz konto/tożsamość</string>
<string name="send_as">Wyślij jako</string> <string name="send_as">Wyślij jako</string>
<string name="no_identities">Przejdź do "Ustawienia Konta" -&gt; "Tożsamości" aby utworzyć tożsamość</string> <string name="no_identities">Przejdź do Ustawienia Konta -&gt; Tożsamości, aby utworzyć tożsamość</string>
<string name="no_removable_identity">Nie możesz usunąć jedynej tożsamości</string> <string name="no_removable_identity">Nie możesz usunąć jedynej tożsamości</string>
<string name="identity_has_no_email">Nie możesz użyć tożsamości bez podanego adresu email</string> <string name="identity_has_no_email">Nie możesz użyć tożsamości bez podanego adresu email</string>
<string name="identity_will_not_be_saved">Wybór tożsamości oraz zmiany w sygnaturze nie będą zapisane z kopią roboczą</string> <string name="identity_will_not_be_saved">Wybór tożsamości oraz zmiany w sygnaturze nie będą zapisane z kopią roboczą</string>
@ -777,13 +802,14 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="sort_attach_first">Wiadomości z załącznikami jako pierwsze</string> <string name="sort_attach_first">Wiadomości z załącznikami jako pierwsze</string>
<string name="sort_unattached_first">Wiadomości bez załączników jako pierwsze</string> <string name="sort_unattached_first">Wiadomości bez załączników jako pierwsze</string>
<string name="sort_by">Sortowanie...</string> <string name="sort_by">Sortuj wg…</string>
<string name="sort_by_date">Po dacie</string> <string name="sort_by_date">Daty</string>
<string name="sort_by_sender">Po nadawcy</string> <string name="sort_by_arrival">Daty otrzymania</string>
<string name="sort_by_subject">Po temacie</string> <string name="sort_by_sender">Nadawcy</string>
<string name="sort_by_flag">Po gwiazdkach</string> <string name="sort_by_subject">Tematu</string>
<string name="sort_by_flag">Gwiazdek</string>
<string name="sort_by_unread">Przeczytane/nieprzeczytane</string> <string name="sort_by_unread">Przeczytane/nieprzeczytane</string>
<string name="sort_by_attach">Po załącznikach</string> <string name="sort_by_attach">Załącznikach</string>
<string name="message_web_view_error">%s</string> <string name="message_web_view_error">%s</string>
<string name="account_delete_dlg_title">Usuwanie</string> <string name="account_delete_dlg_title">Usuwanie</string>
@ -800,32 +826,59 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
do swojego konta z użyciem poprawnego hasła i adresu email, najprawdopodobniej do swojego konta z użyciem poprawnego hasła i adresu email, najprawdopodobniej
nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty
korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string> korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string>
<string name="provider_note_yahoojp">Jeśli chcesz uzywać POP3 dla tego dostawcy, powinieneś zezwolić na użycie POP3 na stronie ustawień poczty Yahoo.</string> <string name="provider_note_yahoojp">Jeśli chcesz używać POP3 dla tego dostawcy, powinieneś zezwolić na użycie POP3 na stronie ustawień poczty Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>--> <string name="provider_note_auonejp">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Au one.</string>
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>--> <string name="provider_note_naver">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Naver.</string>
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>--> <string name="provider_note_hanmail">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Hanmail(Daum).</string>
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>--> <string name="provider_note_paran">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień pocztyParan.</string>
<string name="provider_note_nate">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Nate.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string> <string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string> <string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Odrzuć</string> <string name="account_setup_failed_dlg_invalid_certificate_reject">Odrzuć</string>
<string name="message_help_key">Del lub D - Usuń\u000AR - <string name="message_help_key">
Odpowiedz\u000AA - Odp. wszystim\u000AF - Prześlij dalej\u000AJ lub P - Poprzednia Del lub D - Usuń\n
wiadomość\u000AK, N - Następna wiadomość\u000AM - Przenieś\u000AY - Skopiuj\u000AZ - Pomniejsz\u000AShift-Z - R - Odpowiedz\n
Powiększ\u000aG - Gwiazdka</string> A - Odp. wszystim\n
<string name="message_list_help_key">Del lub D - Usuń\u000AR - F - Prześlij dalej\n
Odpowiedz\u000AA - Odp. wszystkim\u000AC - Napisz\u000AF - Prześlij dalej\u000aM - J lub P - Poprzednia wiadomość\n
Przenieś\u000AY - Skopiuj\u000AG - Gwiazdka\u000AO - Typ sortowania\u000AI - Porządek sortowania\u000AQ K, N - Następna wiadomość\n
- Widok folderów\u000AS - Zaznacz/odznacz</string> M - Przenieś\n
Y - Skopiuj\n
Z - Pomniejsz\n
Shift-Z - Powiększ\n
G - Gwiazdka
</string>
<string name="folder_list_help_key"> <string name="message_list_help_key">
1 - Wyśw. tylko foldery 1szej klasy\u000A Del lub D - Usuń\n
2 - Wyśw. foldery 1szej i 2giej klasy\u000A R - Odpowiedz\n
3 - Wyśw. wszystkie poza folderami 2giej klasy\u000A A - Odp. wszystkim\n
4 - Wyświetl wszystkie foldery\u000A C - Napisz\n
Q - Lista kont\u000A F - Prześlij dalej\n
S - Edytuj ustawienia konta</string> M - Przenieś\n
Y - Skopiuj\n
G - Gwiazdka\n
O - Typ sortowania\n
I - Porządek sortowania\n
Q - Widok folderów\n
S - Zaznacz/odznacz\n
Z - Przełącz przeczytane/nieprzeczytane\n
/ - Szukaj\n
5 - Sprawdź pocztę
</string>
<string name="folder_list_help_key">
1 - Wyśw. tylko foldery 1szej klasy\n
2 - Wyśw. foldery 1szej i 2giej klasy\n
3 - Wyśw. wszystkie poza folderami 2giej klasy\n
4 - Wyświetl wszystkie foldery\n
Q - Lista kont\n
S - Edytuj ustawienia konta
</string>
<string name="folder_list_filter_hint">Wpisz nazwę folderu</string>
<string name="folder_list_display_mode_label">Wyświetlanie folderów</string> <string name="folder_list_display_mode_label">Wyświetlanie folderów</string>
<string name="folder_list_display_mode_all">Wszystkie</string> <string name="folder_list_display_mode_all">Wszystkie</string>
@ -840,7 +893,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="setting_theme_light">Jasna</string> <string name="setting_theme_light">Jasna</string>
<string name="display_preferences">Ustawienia globalne</string> <string name="display_preferences">Ustawienia globalne</string>
<string name="global_preferences">Globalne</string> <string name="global_preferences">Globalne</string>
<string name="debug_preferences">Debugging</string> <string name="debug_preferences">Debugowanie</string>
<string name="privacy_preferences">Prywatność</string> <string name="privacy_preferences">Prywatność</string>
<string name="network_preferences">Sieć</string> <string name="network_preferences">Sieć</string>
<string name="interaction_preferences">Interakcja</string> <string name="interaction_preferences">Interakcja</string>
@ -866,8 +919,10 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="no_message_seletected_toast">Nie wybrano wiadomości</string> <string name="no_message_seletected_toast">Nie wybrano wiadomości</string>
<string name="date_format_label">Format daty</string> <string name="date_format_label">Format daty</string>
<!--
<!-- These are default values. DO NOT CHANGE. Entries copied there to keep my internal string validator quiet --> The values of the date_format_* strings MUST be valid date format strings.
See Android SDK documentation for the class SimpleDateFormat.
-->
<string name="date_format_short">SHORT</string> <string name="date_format_short">SHORT</string>
<string name="date_format_medium">MEDIUM</string> <string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd-MMM-yyyy</string> <string name="date_format_common">dd-MMM-yyyy</string>
@ -883,7 +938,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="batch_spam_op">Przenieś wybrane do Spamu</string> <string name="batch_spam_op">Przenieś wybrane do Spamu</string>
<string name="batch_move_op">Przenieś</string> <string name="batch_move_op">Przenieś</string>
<string name="batch_copy_op">Skopiuj</string> <string name="batch_copy_op">Skopiuj</string>
<string name="batch_flag_mode">Star mode</string> <string name="batch_flag_mode">Tryb gwiadzki</string>
<string name="batch_select_mode">Tryb zaznaczania</string> <string name="batch_select_mode">Tryb zaznaczania</string>
<string name="batch_plain_mode">Tryb zwykły</string> <string name="batch_plain_mode">Tryb zwykły</string>
<string name="batch_select_all">Zaznacz wszystko</string> <string name="batch_select_all">Zaznacz wszystko</string>
@ -903,8 +958,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="gestures_title">Gesty</string> <string name="gestures_title">Gesty</string>
<string name="gestures_summary">Pozwól na sterowanie gestami</string> <string name="gestures_summary">Pozwól na sterowanie gestami</string>
<string name="compact_layouts_title">Wygląd kopaktowy</string> <string name="compact_layouts_title">Wygląd kompaktowy</string>
<string name="compact_layouts_summary">Dopaduj wygląd, aby wyświetlać więcej na każdej stronie</string> <string name="compact_layouts_summary">Dostosuj wygląd, aby wyświetlać więcej na stronie</string>
<string name="volume_navigation_title">Nawigacja przyciskiem głośności</string> <string name="volume_navigation_title">Nawigacja przyciskiem głośności</string>
<string name="volume_navigation_summary">Przeskakuj między rzeczami używając przycisków głośności</string> <string name="volume_navigation_summary">Przeskakuj między rzeczami używając przycisków głośności</string>
@ -914,31 +969,31 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="manage_back_title">Przycisk \"Cofnij\"</string> <string name="manage_back_title">Przycisk \"Cofnij\"</string>
<string name="manage_back_summary">Przycisk \"Cofnij\" zawsze cofa o jeden poziom wyżej</string> <string name="manage_back_summary">Przycisk \"Cofnij\" zawsze cofa o jeden poziom wyżej</string>
<string name="start_integrated_inbox_title">Pokaż Zintegr. Inbox</string> <string name="start_integrated_inbox_title">Pokaż zintegrowaną</string>
<string name="start_integrated_inbox_summary">Wyświetl \"Zintegrowany Inbox\" po uruchomieniu programu</string> <string name="start_integrated_inbox_summary">Wyświetl \"Zintegrowana odbiorcza\" po uruchomieniu programu</string>
<string name="measure_accounts_title">Pokazuj rozmiary kont</string> <string name="measure_accounts_title">Pokazuj rozmiary kont</string>
<string name="measure_accounts_summary">Wyłącz by przyspieszyć wyświetlanie</string> <string name="measure_accounts_summary">Wyłącz, aby przyspieszyć wyświetlanie</string>
<string name="count_search_title">Zliczaj wyniki szukania</string> <string name="count_search_title">Zliczaj wyniki szukania</string>
<string name="count_search_summary">Wyłącz by przyspieszyć wyświetlanie</string> <string name="count_search_summary">Wyłącz, aby przyspieszyć wyświetlanie</string>
<string name="hide_special_accounts_title">Ukryj konta specjalne</string> <string name="hide_special_accounts_title">Ukryj konta specjalne</string>
<string name="hide_special_accounts_summary">Ukryj zunifikowaną skrzynkę odbiorczą i wszystkie konta wiadomości</string> <string name="hide_special_accounts_summary">Ukryj zunifikowaną odbiorczą i wszystkie wiadomości</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></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"> - Z gwiazdka</string> <string name="flagged_modifier"> - Z gwiazdką</string>
<string name="unread_modifier"> - Nieprzeczytane</string> <string name="unread_modifier"> - Nieprzeczytane</string>
<string name="search_all_messages_title">Wszystkie wiadomości</string> <string name="search_all_messages_title">Wszystkie wiadomości</string>
<string name="search_all_messages_detail">Wiadomości w przeszukiwalnych folderach</string> <string name="search_all_messages_detail">Wiadomości w przeszukiwalnych folderach</string>
<string name="integrated_inbox_title">Zintegrowany Inbox</string> <string name="integrated_inbox_title">Zintegrowana odbiorcza</string>
<string name="integrated_inbox_detail">Nieprzeczytane wiadomości ze wszystkich kont</string> <string name="integrated_inbox_detail">Nieprzeczytane wiadomości ze wszystkich kont</string>
<string name="tap_hint">Dotknij koperty lub gwiazdki by wyświetlić wiadomości nieprzeczytane lub oznaczone gwiazdką.</string> <string name="tap_hint">Dotknij koperty lub gwiazdki, aby wyświetlić wiadomości nieprzeczytane lub oznaczone gwiazdką.</string>
<string name="folder_settings_include_in_integrated_inbox_label">Zintegruj</string> <string name="folder_settings_include_in_integrated_inbox_label">Integruj</string>
<string name="folder_settings_include_in_integrated_inbox_summary">Pokazuj nieprzeczytane wiadomości w zintegrowanym widoku</string> <string name="folder_settings_include_in_integrated_inbox_summary">Pokazuj nieprzeczytane wiadomości w zintegrowanym widoku</string>
<string name="account_settings_searchable_label">Przeszukiwalne foldery</string> <string name="account_settings_searchable_label">Przeszukiwalne foldery</string>
@ -966,7 +1021,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="font_size_message_list_date">Data wiadomości</string> <string name="font_size_message_list_date">Data wiadomości</string>
<string name="font_size_message_list_preview">Pogdląd</string> <string name="font_size_message_list_preview">Pogdląd</string>
<string name="font_size_message_view">Wyświetlanie wiadomość</string> <string name="font_size_message_view">Wiadomości</string>
<string name="font_size_message_view_sender">Nadawca</string> <string name="font_size_message_view_sender">Nadawca</string>
<string name="font_size_message_view_to">Adresat (Do:)</string> <string name="font_size_message_view_to">Adresat (Do:)</string>
<string name="font_size_message_view_cc">Odbiorca kopii (DW:)</string> <string name="font_size_message_view_cc">Odbiorca kopii (DW:)</string>
@ -976,6 +1031,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="font_size_message_view_date">Data</string> <string name="font_size_message_view_date">Data</string>
<string name="font_size_message_view_content">Treść wiadomości</string> <string name="font_size_message_view_content">Treść wiadomości</string>
<string name="font_size_message_compose">Kompozycja wiadomości</string>
<string name="font_size_message_compose_input">Pole wprawadzania tekstu</string>
<string name="font_size_tiniest">Najdrobniejsza</string> <string name="font_size_tiniest">Najdrobniejsza</string>
<string name="font_size_tiny">Drobna</string> <string name="font_size_tiny">Drobna</string>
<string name="font_size_smaller">Mniejsza</string> <string name="font_size_smaller">Mniejsza</string>
@ -1004,8 +1062,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string> <string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string>
<string name="error_apg_version_not_supported">Zainstalowana wersja APG nie jest wspierana.</string> <string name="error_apg_version_not_supported">Zainstalowana wersja APG nie jest wspierana.</string>
<string name="btn_crypto_sign">Podpisz</string> <string name="btn_crypto_sign">Podpisz</string>
<string name="btn_encrypt">Zakoduj</string> <string name="btn_encrypt">Szyfruj</string>
<string name="btn_decrypt">Zdekoduj</string> <string name="btn_decrypt">Deszyfruj</string>
<string name="btn_verify">Potwiedź</string> <string name="btn_verify">Potwiedź</string>
<string name="unknown_crypto_signature_user_id">&lt;nieznany&gt;</string> <string name="unknown_crypto_signature_user_id">&lt;nieznany&gt;</string>
<string name="key_id">id: %s</string> <string name="key_id">id: %s</string>
@ -1017,6 +1075,15 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="save_or_discard_draft_message_dlg_title">Zapisać szkic?</string> <string name="save_or_discard_draft_message_dlg_title">Zapisać szkic?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Zapisać czy porzucić wiadomość?</string> <string name="save_or_discard_draft_message_instructions_fmt">Zapisać czy porzucić wiadomość?</string>
<string name="confirm_discard_draft_message_title">Usunąć wiadomość?</string>
<string name="confirm_discard_draft_message">Czy na pewno chcesz usunąć tą wiadomość?</string>
<string name="refuse_to_save_draft_marked_encrypted_dlg_title">Odrzuć zapisywanie szablonów.</string>
<string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Odrzuć zapisywanie szablonów oznaczonych jako zaszyfrowane.</string>
<string name="continue_without_public_key_dlg_title">Kontynuować bez klucza publicznego?</string>
<string name="continue_without_public_key_instructions_fmt">Jeden lub wiele odbiorców nie ma zapisanego klucza publicznego. Kontynuować?</string>
<string name="charset_not_found">Nie można wyświetlić wiadomości, ponieważ kodowanie \"<xliff:g id="charset">%s</xliff:g>\" nie zostało znalezione.</string> <string name="charset_not_found">Nie można wyświetlić wiadomości, ponieważ kodowanie \"<xliff:g id="charset">%s</xliff:g>\" nie zostało znalezione.</string>
<string name="select_text_now">Wybierz tekst do skopiowania.</string> <string name="select_text_now">Wybierz tekst do skopiowania.</string>
@ -1028,80 +1095,103 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string> <string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string>
<plurals name="dialog_confirm_spam_message"> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Na pewno przenieśc do spamu?</item> <item quantity="one">Na pewno przenieść wiadomość do spamu?</item>
<item quantity="other">Na pewno przenieśc do spamu?</item> <item quantity="other">Na pewno przenieść <xliff:g id="message_count">%1$d</xliff:g> wiadomości do spamu?</item>
<!--
Translators:
Please review how to handle pluralization for your language at (1) and ajust
the <item> elements accordingly
Possible values for 'quantity': zero, one, two, few, many, other
(1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-->
</plurals> </plurals>
<string name="dialog_confirm_spam_confirm_button">Tak</string> <string name="dialog_confirm_spam_confirm_button">Tak</string>
<string name="dialog_confirm_spam_cancel_button">Nie</string> <string name="dialog_confirm_spam_cancel_button">Nie</string>
<string name="dialog_attachment_progress_title">Pobieranie załącznika</string> <string name="dialog_attachment_progress_title">Pobieranie załącznika</string>
<string name="debug_logging_enabled">Włączono logowanie debug\'u do logu Androida</string> <string name="debug_logging_enabled">Loguj debug do systemowego logera</string>
<string name="messagelist_sent_to_me_sigil">»</string> <string name="messagelist_sent_to_me_sigil">»</string>
<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">Błąd połączenia.</string>
<!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>--> <string name="import_export_action">Kopia zapasowa</string>
<!-- NEW: <string name="settings_export_account">Export account settings</string>--> <string name="settings_export_account">Ustawienia konta</string>
<!-- NEW: <string name="settings_export_all">Export settings and accounts</string>--> <string name="settings_export_all">Eksport</string>
<!-- NEW: <string name="settings_import_dialog_title">Import</string>--> <string name="settings_import_dialog_title">Importuj</string>
<!-- NEW: <string name="settings_export_dialog_title">Export</string>--> <string name="settings_export_dialog_title">Eksportuj</string>
<!-- NEW: <string name="settings_import">Import settings</string>--> <string name="settings_import">Import</string>
<!-- NEW: <string name="settings_import_selection">Import selection</string>--> <string name="settings_import_selection">Zaznaczenie importu</string>
<!-- NEW: <string name="settings_import_global_settings">Global settings</string>--> <string name="settings_import_global_settings">Ogólne ustawienia</string>
<!-- NEW: <string name="settings_exporting">Exporting settings...</string>--> <string name="settings_exporting">Eksportowanie ustawień…</string>
<!-- NEW: <string name="settings_importing">Importing settings...</string>--> <string name="settings_importing">Importowanie ustawień…</string>
<!-- NEW: <string name="settings_import_scanning_file">Scanning file...</string>--> <string name="settings_import_scanning_file">Skanowanie pliku…</string>
<!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_export_success">Zapisano ustawienia do <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_global_settings_success">Importowano ustawienia z <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_success">Importowano <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <plurals name="settings_import_success"> <plurals name="settings_import_success">
<item quantity="one">1 account</item> <item quantity="one">1 konto</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item> <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> kont</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_export_failure">Failed to export settings</string>--> <string name="settings_export_failure">Błąd eksportu</string>
<!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>--> <string name="settings_import_failure">Błąd importu z <xliff:g id="filename">%s</xliff:g></string>
<!-- NEW: <string name="settings_export_success_header">Export succeeded</string>--> <string name="settings_export_success_header">Eksport udany</string>
<!-- NEW: <string name="settings_export_failed_header">Export failed</string>--> <string name="settings_export_failed_header">Eksport nieudany</string>
<!-- NEW: <string name="settings_import_success_header">Import succeeded</string>--> <string name="settings_import_success_header">Import udany</string>
<!-- NEW: <string name="settings_import_failed_header">Import failed</string>--> <string name="settings_import_failed_header">Import nieudany</string>
<!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>--> <string name="settings_import_activate_account_header">Aktywuj konto</string>
<!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s.</xliff:g></string>--> <string name="settings_import_activate_account_intro">Żeby użwyać konta \"<xliff:g id="account">%s</xliff:g>\" musisz zapewnić <xliff:g id="server_passwords">%s</xliff:g>.</string>
<!-- NEW: <plurals name="settings_import_server_passwords"> <plurals name="settings_import_server_passwords">
<item quantity="one">server password</item> <item quantity="one">hasło serwera</item>
<item quantity="other">server passwords</item> <item quantity="other">hasła serwera</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>--> <string name="settings_import_incoming_server">Serwer przychodzący (<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>--> <string name="settings_import_outgoing_server">Serwer wychodzący (<xliff:g id="hostname">%s</xliff:g>):</string>
<!-- NEW: <plurals name="settings_import_setting_passwords"> <plurals name="settings_import_setting_passwords">
<item quantity="one">Setting password...</item> <item quantity="one">Ustawiam hasło…</item>
<item quantity="other">Setting passwords...</item> <item quantity="other">Ustawiam hasła…</item>
</plurals>--> </plurals>
<!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>--> <string name="settings_import_use_incoming_server_password">Użyj hasła serwera przychodzącego</string>
<!-- NEW: <string name="activate_account_action">Activate</string>--> <string name="activate_account_action">Aktywuj</string>
<!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>--> <string name="settings_unknown_version">Nie można użyć wersji <xliff:g id="version">%s</xliff:g></string>
<string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź pamięc</string> <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź pamięć</string>
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>--> <string name="settings_attachment_default_path">Zapisuj załączniki do…</string>
<!-- NEW: <string name="attachment_save_title">Save attachment</string>--> <string name="attachment_save_title">Zapisz załączniki</string>
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>--> <string name="attachment_save_desc">Brak przeglądarki plików. Chcesz zapisać ten załącznik?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>--> <string name="manage_accounts_move_up_action">Przenieś w górę</string>
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>--> <string name="manage_accounts_move_down_action">Przenieś w dół</string>
<!-- NEW: <string name="manage_accounts_moving_message">Moving account...</string>--> <string name="manage_accounts_moving_message">Przenoszenie konta…</string>
<string name="unread_widget_label">K-9 Mail nieprzeczytane</string>
<string name="unread_widget_select_account">Pokaż licznik nieprzeczytanych dla…</string>
<string name="import_dialog_error_title">Brakuje aplikacji zarządania plikami</string>
<string name="import_dialog_error_message">Brak aplikacji do obsługi plików importu. Zainastaluj jakąś aplikację z Google Play.</string>
<string name="open_market">Otwórz Google Play</string>
<string name="close">Zamknij</string>
<string name="webview_empty_message">Brak tekstu</string>
<string name="webview_contextmenu_link_view_action">Otwórz podgląd</string>
<string name="webview_contextmenu_link_share_action">Udostępnij link</string>
<string name="webview_contextmenu_link_copy_action">Kopiuj link do schowka</string>
<string name="webview_contextmenu_link_clipboard_label">Link</string>
<string name="webview_contextmenu_image_title">Obraz</string>
<string name="webview_contextmenu_image_view_action">Pokaż obraz</string>
<string name="webview_contextmenu_image_save_action">Zapisz obraz</string>
<string name="webview_contextmenu_image_download_action">Pobierz obraz</string>
<string name="webview_contextmenu_image_copy_action">Kopiuj URL obrazu do schowka</string>
<string name="webview_contextmenu_image_clipboard_label">URL obrazu</string>
<string name="webview_contextmenu_phone_call_action">Wybierz numer</string>
<string name="webview_contextmenu_phone_save_action">Zapisz do kontaktów</string>
<string name="webview_contextmenu_phone_copy_action">Kopiuj numer telefonu do schowka</string>
<string name="webview_contextmenu_phone_clipboard_label">Numer telefonu</string>
<string name="webview_contextmenu_email_send_action">Wyślij wiadomość</string>
<string name="webview_contextmenu_email_save_action">Zapisz do kontaktów</string>
<string name="webview_contextmenu_email_copy_action">Kopiuj adres email do schowka</string>
<string name="webview_contextmenu_email_clipboard_label">Adres email</string>
<string name="image_saved_as">Obraz zapisany jako \"<xliff:g id="filename">%s</xliff:g>\"</string>
<string name="image_saving_failed">Błąd zapisu obrazu.</string>
</resources> </resources>

2
res/values-pt-rBR/strings.xml
View File

@ -229,8 +229,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="debug_enable_sensitive_logging_title">Logar informações confidencias</string> <string name="debug_enable_sensitive_logging_title">Logar informações confidencias</string>
<string name="debug_enable_sensitive_logging_summary">Talvez as senhas sejam mostradas nos logs.</string> <string name="debug_enable_sensitive_logging_summary">Talvez as senhas sejam mostradas nos logs.</string>
<string name="message_header_mua">K-9 Mail para Android</string>
<string name="combined_inbox_title">Todos os e-mails</string> <string name="combined_inbox_title">Todos os e-mails</string>
<string name="combined_inbox_label">Mensagens recentes de todas as contas</string> <string name="combined_inbox_label">Mensagens recentes de todas as contas</string>
<string name="combined_inbox_list_title">Todos os e-mails da caixa de entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Todos os e-mails da caixa de entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

131
res/values-ru/strings.xml
View File

@ -7,7 +7,7 @@
<string name="app_license">Лицензия Apache License, Version 2.0.</string> <string name="app_license">Лицензия Apache License, Version 2.0.</string>
<string name="app_authors_fmt">Авторы: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Авторы: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Информация об изменениях: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Информация об изменениях: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">Мы используем следующие тертьесторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Мы используем следующие библиотеки третьих сторон: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Иконки настроения: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Иконки настроения: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
<string name="read_attachment_label">читать вложения электронной почты</string> <string name="read_attachment_label">читать вложения электронной почты</string>
@ -108,9 +108,9 @@
<string name="view_hide_details_action">Показать/спрятать подробности</string> <string name="view_hide_details_action">Показать/спрятать подробности</string>
<string name="add_cc_bcc_action">Добавить Копию/СК</string> <string name="add_cc_bcc_action">Добавить Копию/СК</string>
<string name="edit_subject_action">Редактировать тему</string> <string name="edit_subject_action">Редактировать тему</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>--> <string name="read_receipt">Уведомление о прочтении</string>
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>--> <string name="read_receipt_enabled">Уведомление о прочтении будет запрошено</string>
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>--> <string name="read_receipt_disabled">Уведомление о прочтении не будет запрошено</string>
<string name="add_attachment_action">Добавить вложение</string> <string name="add_attachment_action">Добавить вложение</string>
<string name="add_attachment_action_image">Добавить вложение (Изображение)</string> <string name="add_attachment_action_image">Добавить вложение (Изображение)</string>
<string name="add_attachment_action_video">Добавить вложение (Видео)</string> <string name="add_attachment_action_video">Добавить вложение (Видео)</string>
@ -223,8 +223,6 @@
<string name="debug_enable_sensitive_logging_title">Запись конфиденциальной информации</string> <string name="debug_enable_sensitive_logging_title">Запись конфиденциальной информации</string>
<string name="debug_enable_sensitive_logging_summary">Разрешает запись паролей в журнал</string> <string name="debug_enable_sensitive_logging_summary">Разрешает запись паролей в журнал</string>
<string name="message_header_mua">K-9 Mail для Android</string>
<string name="combined_inbox_title">Вся почта</string> <string name="combined_inbox_title">Вся почта</string>
<string name="combined_inbox_label">Последние сообщения из всех почтовых ящиков</string> <string name="combined_inbox_label">Последние сообщения из всех почтовых ящиков</string>
<string name="combined_inbox_list_title">Все Входящие Сообщения</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Все Входящие Сообщения</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
@ -324,8 +322,8 @@
<string name="global_settings_messageview_fixedwidth_summary">Использовать шрифт фиксированной ширины при показе плоского текста</string> <string name="global_settings_messageview_fixedwidth_summary">Использовать шрифт фиксированной ширины при показе плоского текста</string>
<string name="global_settings_messageview_return_to_list_label">Вернуться к списку после удаления</string> <string name="global_settings_messageview_return_to_list_label">Вернуться к списку после удаления</string>
<string name="global_settings_messageview_return_to_list_summary">Вернуться к списку сообщений после удаления сообщения</string> <string name="global_settings_messageview_return_to_list_summary">Вернуться к списку сообщений после удаления сообщения</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>--> <string name="global_settings_messageview_show_next_label">Показать след. сообщение после удаления</string>
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>--> <string name="global_settings_messageview_show_next_summary">По умолчанию показывать след. сообщение после удаления</string>
<string name="global_settings_confirm_actions_title">Подтверждение действий</string> <string name="global_settings_confirm_actions_title">Подтверждение действий</string>
<string name="global_settings_confirm_actions_summary">Показывать диалог при совершении действий</string> <string name="global_settings_confirm_actions_summary">Показывать диалог при совершении действий</string>
@ -340,7 +338,7 @@
<string name="quiet_time">Время тишины</string> <string name="quiet_time">Время тишины</string>
<string name="quiet_time_description">Запретить сигнал, вибрацию, мигание в ночное время</string> <string name="quiet_time_description">Запретить сигнал, вибрацию, мигание в ночное время</string>
<string name="quiet_time_starts">Начинало времени тишины</string> <string name="quiet_time_starts">Начало времени тишины</string>
<string name="quiet_time_ends">Конец времени тишины</string> <string name="quiet_time_ends">Конец времени тишины</string>
<string name="account_setup_basics_title">Установить новый адрес</string> <string name="account_setup_basics_title">Установить новый адрес</string>
@ -414,7 +412,7 @@
<string name="account_setup_expunge_policy_on_poll">В ходе каждого запроса</string> <string name="account_setup_expunge_policy_on_poll">В ходе каждого запроса</string>
<string name="account_setup_expunge_policy_manual">Только вручную</string> <string name="account_setup_expunge_policy_manual">Только вручную</string>
<!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>--> <string name="account_setup_incoming_autodetect_namespace_label">Автоопределение области имен IMAP</string>
<string name="account_setup_incoming_imap_path_prefix_label">Префикс пути IMAP</string> <string name="account_setup_incoming_imap_path_prefix_label">Префикс пути IMAP</string>
<string name="drafts_folder_label">Имя папки Черновиков</string> <string name="drafts_folder_label">Имя папки Черновиков</string>
@ -550,11 +548,11 @@
<string name="account_settings_reply_after_quote_summary">При ответе цитата будет выше ответа.</string> <string name="account_settings_reply_after_quote_summary">При ответе цитата будет выше ответа.</string>
<string name="account_settings_message_format_label">Формат сообщения</string> <string name="account_settings_message_format_label">Формат сообщения</string>
<string name="account_settings_message_format_text">Плоский текст (изображения и форматирование не сохраняется)</string> <string name="account_settings_message_format_text">Обычный текст (изображения и форматирование не сохраняется)</string>
<string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string> <string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>--> <string name="account_settings_message_read_receipt_label">Уведомление о прочтении</string>
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>--> <string name="account_settings_message_read_receipt_summary">Всегда запрашивать уведомление о прочтении</string>
<string name="account_settings_quote_style_label">Стиль цитирования</string> <string name="account_settings_quote_style_label">Стиль цитирования</string>
<string name="account_settings_quote_style_prefix">Префикс (например Gmail, Pine)</string> <string name="account_settings_quote_style_prefix">Префикс (например Gmail, Pine)</string>
@ -582,7 +580,7 @@
<string name="account_settings_color_label">Цвет учётной записи</string> <string name="account_settings_color_label">Цвет учётной записи</string>
<string name="account_settings_color_summary">Выберите цвет учётной записи, используемый в папке и списке учётных записей</string> <string name="account_settings_color_summary">Выберите цвет учётной записи, используемый в папке и списке учётных записей</string>
<string name="account_settings_led_color_label">Notification LED color</string> <string name="account_settings_led_color_label">Цвет светодиода для уведомления</string>
<string name="account_settings_led_color_summary">Выбрать цвет мигания для учётной записи</string> <string name="account_settings_led_color_summary">Выбрать цвет мигания для учётной записи</string>
<string name="account_settings_mail_display_count_label">Количество показываемых сообщений</string> <string name="account_settings_mail_display_count_label">Количество показываемых сообщений</string>
@ -680,13 +678,13 @@
<string name="account_settings_ring_summary">Звонок при новых сообщениях</string> <string name="account_settings_ring_summary">Звонок при новых сообщениях</string>
<string name="account_settings_vibrate_enable">Вибрация</string> <string name="account_settings_vibrate_enable">Вибрация</string>
<string name="account_settings_vibrate_summary">Вибрация при новых сообщениях</string> <string name="account_settings_vibrate_summary">Вибрация при новых сообщениях</string>
<string name="account_settings_vibrate_pattern_label">Паттерн вибрации</string> <string name="account_settings_vibrate_pattern_label">Тип вибрации</string>
<string name="account_settings_vibrate_pattern_default">По умолчанию</string> <string name="account_settings_vibrate_pattern_default">По умолчанию</string>
<string name="account_settings_vibrate_pattern_1">паттерн 1</string> <string name="account_settings_vibrate_pattern_1">Вибрация 1</string>
<string name="account_settings_vibrate_pattern_2">паттерн 2</string> <string name="account_settings_vibrate_pattern_2">Вибрация 2</string>
<string name="account_settings_vibrate_pattern_3">паттерн 3</string> <string name="account_settings_vibrate_pattern_3">Вибрация 3</string>
<string name="account_settings_vibrate_pattern_4">паттерн 4</string> <string name="account_settings_vibrate_pattern_4">Вибрация 4</string>
<string name="account_settings_vibrate_pattern_5">паттерн 5</string> <string name="account_settings_vibrate_pattern_5">Вибрация 5</string>
<string name="account_settings_vibrate_times">Повторять вибрацию</string> <string name="account_settings_vibrate_times">Повторять вибрацию</string>
<string name="account_settings_ringtone">Выбор мелодии</string> <string name="account_settings_ringtone">Выбор мелодии</string>
<string name="account_settings_led_label">Мигать</string> <string name="account_settings_led_label">Мигать</string>
@ -839,7 +837,7 @@
<string name="background_ops_never">Никогда</string> <string name="background_ops_never">Никогда</string>
<string name="background_ops_always">Всегда</string> <string name="background_ops_always">Всегда</string>
<string name="background_ops_enabled">Когда \'Фоновый режим\' включен</string> <string name="background_ops_enabled">Когда \'Фоновый режим\' включен</string>
<string name="background_ops_auto_sync">Когда \'Фоновые данные\' &amp; \'Автосинхронизация\' включены</string> <string name="background_ops_auto_sync">Когда \'Фоновые данные\' и \'Автосинхронизация\' включены</string>
<string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string> <string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string>
@ -956,11 +954,11 @@
<string name="font_size_message_view_date">Дата</string> <string name="font_size_message_view_date">Дата</string>
<string name="font_size_message_view_content">Тело сообщения</string> <string name="font_size_message_view_content">Тело сообщения</string>
<string name="font_size_tiniest">самый крочшечный</string> <string name="font_size_tiniest">Самый крочшечный</string>
<string name="font_size_tiny">Крошечный</string> <string name="font_size_tiny">Крошечный</string>
<string name="font_size_smaller">Еще меньше</string> <string name="font_size_smaller">Еще меньше</string>
<string name="font_size_small">Маленький</string> <string name="font_size_small">Маленький</string>
<string name="font_size_medium">средний</string> <string name="font_size_medium">Средний</string>
<string name="font_size_large">Большой</string> <string name="font_size_large">Большой</string>
<string name="font_size_larger">Наибольший</string> <string name="font_size_larger">Наибольший</string>
@ -1033,46 +1031,49 @@
<string name="messagelist_sent_cc_me_sigil">›</string> <string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Не получается соединиться.</string> <string name="error_unable_to_connect">Не получается соединиться.</string>
<!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>--> <string name="import_export_action">Импорт и экспорт настроек</string>
<!-- NEW: <string name="settings_export_account">Export account settings</string>-->
<!-- NEW: <string name="settings_export_all">Export settings and accounts</string>-->
<!-- NEW: <string name="settings_import_dialog_title">Import</string>-->
<!-- NEW: <string name="settings_export_dialog_title">Export</string>-->
<!-- NEW: <string name="settings_import">Import settings</string>-->
<!-- NEW: <string name="settings_import_selection">Import selection</string>-->
<!-- NEW: <string name="settings_import_global_settings">Global settings</string>-->
<!-- NEW: <string name="settings_exporting">Exporting settings...</string>-->
<!-- NEW: <string name="settings_importing">Importing settings...</string>-->
<!-- NEW: <string name="settings_import_scanning_file">Scanning file...</string>-->
<!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <plurals name="settings_import_success">
<item quantity="one">1 account</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
</plurals>-->
<!-- NEW: <string name="settings_export_failure">Failed to export settings</string>-->
<!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_export_success_header">Export succeeded</string>-->
<!-- NEW: <string name="settings_export_failed_header">Export failed</string>-->
<!-- NEW: <string name="settings_import_success_header">Import succeeded</string>-->
<!-- NEW: <string name="settings_import_failed_header">Import failed</string>-->
<!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>-->
<!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s.</xliff:g></string>-->
<!-- NEW: <plurals name="settings_import_server_passwords">
<item quantity="one">server password</item>
<item quantity="other">server passwords</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: <plurals name="settings_import_setting_passwords">
<item quantity="one">Setting password...</item>
<item quantity="other">Setting passwords...</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>-->
<!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>--> <string name="settings_export_account">Экспортировать настройки учетной записи</string>
<string name="settings_export_all">Экспортировать настройки и учетные записи</string>
<string name="settings_import_dialog_title">Импорт</string>
<string name="settings_export_dialog_title">Экспорт</string>
<string name="settings_import">Импортировать настройки</string>
<string name="settings_import_selection">Импортировать выбранное</string>
<string name="settings_import_global_settings">Глобальные настройки</string>
<string name="settings_exporting">Экспорт настроек...</string>
<string name="settings_importing">Импорт настроек...</string>
<string name="settings_import_scanning_file">Сканирование файла...</string>
<string name="settings_export_success">Настройки были экспортированы в <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_global_settings_success">Глобальные настройки были импортированы из <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_success">Импортирован <xliff:g id="accounts">%s</xliff:g> из <xliff:g id="filename">%s</xliff:g></string>
<plurals name="settings_import_success">
<item quantity="one">1 учетная запись</item>
<item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> учетных записи</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> учетных записей</item>
</plurals>
<string name="settings_export_failure">Не удалось экспортировать настройки</string>
<string name="settings_import_failure">Не удалось экспортировать настройки из <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_export_success_header">Экспорт удался</string>
<string name="settings_export_failed_header">Экспорт не удался</string>
<string name="settings_import_success_header">Импорт удался</string>
<string name="settings_import_failed_header">Импорт не удался</string>
<string name="settings_import_activate_account_header">Активировать учетную запись</string>
<string name="settings_import_activate_account_intro">Чтобы использовать учетную запись \"<xliff:g id="account">%s</xliff:g>\", Вам необходимо указать <xliff:g id="server_passwords">%s.</xliff:g></string>
<plurals name="settings_import_server_passwords">
<item quantity="one">пароль</item>
<item quantity="few">пароля</item>
<item quantity="other">паролей</item>
</plurals>
<string name="settings_import_incoming_server">Сервер для входящей почты (<xliff:g id="hostname">%s</xliff:g>):</string>
<string name="settings_import_outgoing_server">Сервер для исходящей почты (<xliff:g id="hostname">%s</xliff:g>):</string>
<plurals name="settings_import_setting_passwords">
<item quantity="one">Установка пароля...</item>
<item quantity="other">Установка паролей...</item>
</plurals>
<string name="settings_import_use_incoming_server_password">Использовать пароль от сервера для входящей почты</string>
<string name="activate_account_action">Активировать</string>
<string name="settings_unknown_version">Невозможно определить версию файла <xliff:g id="version">%s</xliff:g></string>
<string name="account_unavailable">Учётная запись\"<xliff:g id="account">%s</xliff:g>\" недоступна; проверьте хранилище</string> <string name="account_unavailable">Учётная запись\"<xliff:g id="account">%s</xliff:g>\" недоступна; проверьте хранилище</string>
@ -1080,8 +1081,8 @@
<string name="attachment_save_title">Сохранить вложение</string> <string name="attachment_save_title">Сохранить вложение</string>
<string name="attachment_save_desc">Не найден браузер файлов. Где бы вы хотели сохранить вложение?</string> <string name="attachment_save_desc">Не найден браузер файлов. Где бы вы хотели сохранить вложение?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>--> <string name="manage_accounts_move_up_action">Переместить вверх</string>
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>--> <string name="manage_accounts_move_down_action">Переместить вниз</string>
<!-- NEW: <string name="manage_accounts_moving_message">Moving account...</string>--> <string name="manage_accounts_moving_message">Перемещение учетной записи...</string>
</resources> </resources>

2
res/values-sv/strings.xml
View File

@ -233,8 +233,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="debug_enable_sensitive_logging_title">Logga känslig information</string> <string name="debug_enable_sensitive_logging_title">Logga känslig information</string>
<string name="debug_enable_sensitive_logging_summary">Kan visa lösenord i loggarna.</string> <string name="debug_enable_sensitive_logging_summary">Kan visa lösenord i loggarna.</string>
<string name="message_header_mua">K-9 E-post för Android</string>
<string name="combined_inbox_title">All e-post</string> <string name="combined_inbox_title">All e-post</string>
<string name="combined_inbox_label">Nya brev från alla konton</string> <string name="combined_inbox_label">Nya brev från alla konton</string>
<string name="combined_inbox_list_title">Inkorg med alla nya brev</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Inkorg med alla nya brev</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

2
res/values-tr/strings.xml
View File

@ -206,8 +206,6 @@
<string name="debug_enable_sensitive_logging_title">Hassas bigi günlüğü tut</string> <string name="debug_enable_sensitive_logging_title">Hassas bigi günlüğü tut</string>
<string name="debug_enable_sensitive_logging_summary">Günlüklerde şifreler görünebilir.</string> <string name="debug_enable_sensitive_logging_summary">Günlüklerde şifreler görünebilir.</string>
<string name="message_header_mua">Android için K-9 Posta</string>
<string name="combined_inbox_title">Bütün Postalar</string> <string name="combined_inbox_title">Bütün Postalar</string>
<string name="combined_inbox_label">Bütün hesaplardan gelen yeni mesajlar</string> <string name="combined_inbox_label">Bütün hesaplardan gelen yeni mesajlar</string>
<string name="combined_inbox_list_title">Gelen Kutusu bütün postaları</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">Gelen Kutusu bütün postaları</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

1177
res/values-uk/strings.xml Normal file
View File

File diff suppressed because it is too large Load Diff

2
res/values-zh-rCN/strings.xml
View File

@ -220,8 +220,6 @@
<string name="debug_enable_sensitive_logging_title">记录敏感信息</string> <string name="debug_enable_sensitive_logging_title">记录敏感信息</string>
<string name="debug_enable_sensitive_logging_summary">允许在日志中显示密码。</string> <string name="debug_enable_sensitive_logging_summary">允许在日志中显示密码。</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">全部邮件</string> <string name="combined_inbox_title">全部邮件</string>
<string name="combined_inbox_label">全部账户的最近邮件</string> <string name="combined_inbox_label">全部账户的最近邮件</string>
<string name="combined_inbox_list_title">全部邮件收件箱</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">全部邮件收件箱</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

2
res/values-zh-rTW/strings.xml
View File

@ -223,8 +223,6 @@
<string name="debug_enable_sensitive_logging_title">記錄敏感訊息</string> <string name="debug_enable_sensitive_logging_title">記錄敏感訊息</string>
<string name="debug_enable_sensitive_logging_summary">允許在日誌中顯示密碼。</string> <string name="debug_enable_sensitive_logging_summary">允許在日誌中顯示密碼。</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">全部郵件</string> <string name="combined_inbox_title">全部郵件</string>
<string name="combined_inbox_label">全部帳戶的最近郵件</string> <string name="combined_inbox_label">全部帳戶的最近郵件</string>
<string name="combined_inbox_list_title">全部郵件收件匣</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">全部郵件收件匣</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

20
res/values/arrays.xml
View File

@ -466,26 +466,28 @@
<string-array name="supported_languages"> <string-array name="supported_languages">
<item></item> <item></item>
<item>ca</item> <item>ca</item>
<item>cs</item>
<item>da</item> <item>da</item>
<item>de</item> <item>de</item>
<item>en</item> <item>en</item>
<item>es</item> <item>es</item>
<item>fr</item>
<item>fr_CA</item>
<item>gl</item> <item>gl</item>
<item>it</item>
<item>ja</item>
<item>hu</item> <item>hu</item>
<item>nl</item> <item>nl</item>
<item>pl</item>
<item>pt_BR</item>
<item>ru</item> <item>ru</item>
<item>tr</item> <item>tr</item>
<item>zh_TW</item> <item>fr</item>
<item>zh_CN</item> <item>fr_CA</item>
<item>it</item>
<item>pl</item>
<item>pt_BR</item>
<item>fi</item> <item>fi</item>
<item>sv</item> <item>sv</item>
<item>cs</item>
<item>el</item>
<item>uk</item>
<item>zh_TW</item>
<item>zh_CN</item>
<item>ja</item>
<item>ko</item> <item>ko</item>
</string-array> </string-array>

4
res/values/constants.xml
View File

@ -2,4 +2,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_revision_url">https://github.com/k9mail/k-9/wiki/ReleaseNotes</string> <string name="app_revision_url">https://github.com/k9mail/k-9/wiki/ReleaseNotes</string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string> <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<!-- Licenses - translating legal stuff should be left to experts -->
<string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright © 2006–2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
</resources> </resources>

15
res/values/strings.xml
View File

@ -5,7 +5,6 @@
<string name="app_authors">Google, The K-9 Dog Walkers.</string> <string name="app_authors">Google, The K-9 Dog Walkers.</string>
<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. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Licensed under the Apache License, Version 2.0.</string> <string name="app_license">Licensed under the Apache License, Version 2.0.</string>
<string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright (c) 2006-2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
<string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
<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">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -227,7 +226,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
\n * Message sorting \n * Message sorting
\n * ...and more \n * ...and more
\n \n
\nPlease note that K-9 does not support most free hotmail accounts and, like many mail clients, has some quirks when talking to Microsoft Exchange. \nPlease note that K-9 does not support most free Hotmail accounts and, like many mail clients, has some quirks when talking to Microsoft Exchange.
\n \n
\n Please submit bug reports, contribute new features and ask questions at http://k9mail.googlecode.com/ \n Please submit bug reports, contribute new features and ask questions at http://k9mail.googlecode.com/
@ -239,8 +238,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="debug_enable_sensitive_logging_title">Log sensitive information</string> <string name="debug_enable_sensitive_logging_title">Log sensitive information</string>
<string name="debug_enable_sensitive_logging_summary">May show passwords in logs.</string> <string name="debug_enable_sensitive_logging_summary">May show passwords in logs.</string>
<string name="message_header_mua">K-9 Mail for Android</string>
<string name="combined_inbox_title">All Mail</string> <string name="combined_inbox_title">All Mail</string>
<string name="combined_inbox_label">Recent messages from all accounts</string> <string name="combined_inbox_label">Recent messages from all accounts</string>
<string name="combined_inbox_list_title">All Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox --> <string name="combined_inbox_list_title">All Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
@ -364,6 +361,16 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="global_settings_privacy_mode_title">Lock-screen notifications</string> <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>
<string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string> <string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>
<string name="global_settings_batch_buttons">Batch buttons</string>
<string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>
<string name="global_settings_mark_read">Mark read/unread</string>
<string name="global_settings_delete">Delete</string>
<string name="global_settings_archive">Move to archive</string>
<string name="global_settings_archive_disabled_reason">No archive folders.</string>
<string name="global_settings_move">Move</string>
<string name="global_settings_flag">Flag</string>
<string name="global_settings_unselect">Unselect</string>
<string name="quiet_time">Quiet Time</string> <string name="quiet_time">Quiet Time</string>
<string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string> <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>
<string name="quiet_time_starts">Quiet Time starts</string> <string name="quiet_time_starts">Quiet Time starts</string>

11
res/values/styles.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.K9Dialog" parent="@android:Theme.Light"> <style name="Theme.K9Dialog" parent="@android:Theme.Light">
<item name="android:windowFrame">@null</item> <item name="android:windowFrame">@null</item>
<item name="android:windowBackground">@drawable/popup_background</item> <item name="android:windowBackground">@drawable/popup_background</item>
@ -6,8 +8,15 @@
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowContentOverlay">@drawable/panel_separator</item> <item name="android:windowContentOverlay">@drawable/panel_separator</item>
</style> </style>
<!--
Fix a bug with AutoCompleteTextView
See https://code.google.com/p/android/issues/detail?id=5237
-->
<style name="Widget.K9.AutoCompleteTextView" parent="@android:style/Widget.AutoCompleteTextView">
<item name="android:textColor">@android:color/primary_text_light</item>
</style>
</resources> </resources>

12
res/values/themes.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.K9.Light" parent="android:Theme.Light">
<item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
</style>
<style name="Theme.K9.Dark" parent="@android:style/Theme">
<item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
</style>
</resources>

45
res/xml/global_preferences.xml
View File

@ -157,6 +157,7 @@
android:dependency="messagelist_show_contact_name" android:dependency="messagelist_show_contact_name"
/> />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
@ -237,6 +238,50 @@
android:dialogTitle="@string/global_settings_confirm_actions_title" android:dialogTitle="@string/global_settings_confirm_actions_title"
android:positiveButtonText="@android:string/ok" android:positiveButtonText="@android:string/ok"
android:negativeButtonText="@android:string/cancel" /> android:negativeButtonText="@android:string/cancel" />
<PreferenceScreen
android:title="@string/global_settings_batch_buttons"
android:summary="@string/global_settings_batch_buttons_summary"
android:key="batch_buttons_settings">
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_mark_read"
android:title="@string/global_settings_mark_read"
/>
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_delete"
android:title="@string/global_settings_delete"
/>
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_archive"
android:title="@string/global_settings_archive"
/>
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_move"
android:title="@string/global_settings_move"
/>
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_flag"
android:title="@string/global_settings_flag"
/>
<CheckBoxPreference
android:persistent="false"
android:key="batch_buttons_unselect"
android:title="@string/global_settings_unselect"
/>
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen

12
res/xml/providers.xml
View File

@ -181,16 +181,16 @@
<!-- Yahoo! Mail Variants --> <!-- Yahoo! Mail Variants -->
<provider id="yahoo" label="Yahoo" domain="yahoo.com"> <provider id="yahoo" label="Yahoo" domain="yahoo.com">
<incoming uri="imap+tls://imap.mail.yahoo.com" username="$user" /> <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$user" /> <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
</provider> </provider>
<provider id="ymail" label="YMail" domain="ymail.com"> <provider id="ymail" label="YMail" domain="ymail.com">
<incoming uri="imap+tls://imap.mail.yahoo.com" username="$email" /> <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$email" /> <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
</provider> </provider>
<provider id="rocketmail" label="Rocketmail" domain="rocketmail.com"> <provider id="rocketmail" label="Rocketmail" domain="rocketmail.com">
<incoming uri="imap+tls://imap.mail.yahoo.com" username="$email" /> <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$email" /> <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
</provider> </provider>

111
src/com/fsck/k9/Account.java
View File

@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -76,6 +77,40 @@ public class Account implements BaseAccount {
public static final String IDENTITY_EMAIL_KEY = "email"; public static final String IDENTITY_EMAIL_KEY = "email";
public static final String IDENTITY_DESCRIPTION_KEY = "description"; public static final String IDENTITY_DESCRIPTION_KEY = "description";
public enum SortType {
SORT_DATE(R.string.sort_earliest_first, R.string.sort_latest_first, false),
SORT_ARRIVAL(R.string.sort_earliest_first, R.string.sort_latest_first, false),
SORT_SUBJECT(R.string.sort_subject_alpha, R.string.sort_subject_re_alpha, true),
SORT_SENDER(R.string.sort_sender_alpha, R.string.sort_sender_re_alpha, true),
SORT_UNREAD(R.string.sort_unread_first, R.string.sort_unread_last, true),
SORT_FLAGGED(R.string.sort_flagged_first, R.string.sort_flagged_last, true),
SORT_ATTACHMENT(R.string.sort_attach_first, R.string.sort_unattached_first, true);
private int ascendingToast;
private int descendingToast;
private boolean defaultAscending;
SortType(int ascending, int descending, boolean ndefaultAscending) {
ascendingToast = ascending;
descendingToast = descending;
defaultAscending = ndefaultAscending;
}
public int getToast(boolean ascending) {
if (ascending) {
return ascendingToast;
} else {
return descendingToast;
}
}
public boolean isDefaultAscending() {
return defaultAscending;
}
}
public static final SortType DEFAULT_SORT_TYPE = SortType.SORT_DATE;
public static final boolean DEFAULT_SORT_ASCENDING = false;
/** /**
* <pre> * <pre>
@ -120,6 +155,8 @@ public class Account implements BaseAccount {
private boolean mSaveAllHeaders; private boolean mSaveAllHeaders;
private boolean mPushPollOnConnect; private boolean mPushPollOnConnect;
private boolean mNotifySync; private boolean mNotifySync;
private SortType mSortType;
private HashMap<SortType, Boolean> mSortAscending = new HashMap<SortType, Boolean>();
private ShowPictures mShowPictures; private ShowPictures mShowPictures;
private boolean mEnableMoveButtons; private boolean mEnableMoveButtons;
private boolean mIsSignatureBeforeQuotedText; private boolean mIsSignatureBeforeQuotedText;
@ -213,6 +250,8 @@ public class Account implements BaseAccount {
mFolderSyncMode = FolderMode.FIRST_CLASS; mFolderSyncMode = FolderMode.FIRST_CLASS;
mFolderPushMode = FolderMode.FIRST_CLASS; mFolderPushMode = FolderMode.FIRST_CLASS;
mFolderTargetMode = FolderMode.NOT_SECOND_CLASS; mFolderTargetMode = FolderMode.NOT_SECOND_CLASS;
mSortType = DEFAULT_SORT_TYPE;
mSortAscending.put(DEFAULT_SORT_TYPE, DEFAULT_SORT_ASCENDING);
mShowPictures = ShowPictures.NEVER; mShowPictures = ShowPictures.NEVER;
mEnableMoveButtons = false; mEnableMoveButtons = false;
mIsSignatureBeforeQuotedText = false; mIsSignatureBeforeQuotedText = false;
@ -335,6 +374,15 @@ public class Account implements BaseAccount {
(random.nextInt(0x70) * 0xffff) + (random.nextInt(0x70) * 0xffff) +
0xff000000); 0xff000000);
try {
mSortType = SortType.valueOf(prefs.getString(mUuid + ".sortTypeEnum",
SortType.SORT_DATE.name()));
} catch (Exception e) {
mSortType = SortType.SORT_DATE;
}
mSortAscending.put(mSortType, prefs.getBoolean(mUuid + ".sortAscending", false));
try { try {
mShowPictures = ShowPictures.valueOf(prefs.getString(mUuid + ".showPicturesEnum", mShowPictures = ShowPictures.valueOf(prefs.getString(mUuid + ".showPicturesEnum",
ShowPictures.NEVER.name())); ShowPictures.NEVER.name()));
@ -599,6 +647,8 @@ public class Account implements BaseAccount {
editor.putString(mUuid + ".spamFolderName", mSpamFolderName); editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName); editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
editor.putInt(mUuid + ".accountNumber", mAccountNumber); editor.putInt(mUuid + ".accountNumber", mAccountNumber);
editor.putString(mUuid + ".sortTypeEnum", mSortType.name());
editor.putBoolean(mUuid + ".sortAscending", mSortAscending.get(mSortType));
editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name()); editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name());
editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons); editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons);
editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name()); editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name());
@ -937,6 +987,14 @@ public class Account implements BaseAccount {
mDraftsFolderName = draftsFolderName; mDraftsFolderName = draftsFolderName;
} }
/**
* Checks if this account has a drafts folder set.
* @return true if account has a drafts folder set.
*/
public synchronized boolean hasDraftsFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(mDraftsFolderName);
}
public synchronized String getSentFolderName() { public synchronized String getSentFolderName() {
return mSentFolderName; return mSentFolderName;
} }
@ -949,6 +1007,15 @@ public class Account implements BaseAccount {
mSentFolderName = sentFolderName; mSentFolderName = sentFolderName;
} }
/**
* Checks if this account has a sent folder set.
* @return true if account has a sent folder set.
*/
public synchronized boolean hasSentFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(mSentFolderName);
}
public synchronized String getTrashFolderName() { public synchronized String getTrashFolderName() {
return mTrashFolderName; return mTrashFolderName;
} }
@ -957,6 +1024,14 @@ public class Account implements BaseAccount {
mTrashFolderName = trashFolderName; mTrashFolderName = trashFolderName;
} }
/**
* Checks if this account has a trash folder set.
* @return true if account has a trash folder set.
*/
public synchronized boolean hasTrashFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(mTrashFolderName);
}
public synchronized String getArchiveFolderName() { public synchronized String getArchiveFolderName() {
return mArchiveFolderName; return mArchiveFolderName;
} }
@ -965,6 +1040,14 @@ public class Account implements BaseAccount {
mArchiveFolderName = archiveFolderName; mArchiveFolderName = archiveFolderName;
} }
/**
* Checks if this account has an archive folder set.
* @return true if account has an archive folder set.
*/
public synchronized boolean hasArchiveFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(mArchiveFolderName);
}
public synchronized String getSpamFolderName() { public synchronized String getSpamFolderName() {
return mSpamFolderName; return mSpamFolderName;
} }
@ -973,6 +1056,14 @@ public class Account implements BaseAccount {
mSpamFolderName = spamFolderName; mSpamFolderName = spamFolderName;
} }
/**
* Checks if this account has a spam folder set.
* @return true if account has a spam folder set.
*/
public synchronized boolean hasSpamFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(mSpamFolderName);
}
public synchronized String getOutboxFolderName() { public synchronized String getOutboxFolderName() {
return OUTBOX; return OUTBOX;
} }
@ -1035,6 +1126,25 @@ public class Account implements BaseAccount {
this.mNotifySync = showOngoing; this.mNotifySync = showOngoing;
} }
public synchronized SortType getSortType() {
return mSortType;
}
public synchronized void setSortType(SortType sortType) {
mSortType = sortType;
}
public synchronized boolean isSortAscending(SortType sortType) {
if (mSortAscending.get(sortType) == null) {
mSortAscending.put(sortType, sortType.isDefaultAscending());
}
return mSortAscending.get(sortType);
}
public synchronized void setSortAscending(SortType sortType, boolean sortAscending) {
mSortAscending.put(sortType, sortAscending);
}
public synchronized ShowPictures getShowPictures() { public synchronized ShowPictures getShowPictures() {
return mShowPictures; return mShowPictures;
} }
@ -1306,7 +1416,6 @@ public class Account implements BaseAccount {
* Only to be called durin initial account-setup!<br/> * Only to be called durin initial account-setup!<br/>
* Side-effect: changes {@link #mLocalStorageProviderId}. * Side-effect: changes {@link #mLocalStorageProviderId}.
* *
* @param context
* @param newStorageProviderId * @param newStorageProviderId
* Never <code>null</code>. * Never <code>null</code>.
* @throws MessagingException * @throws MessagingException

15
src/com/fsck/k9/EmailAddressAdapter.java
View File

@ -25,22 +25,11 @@ import android.widget.ResourceCursorAdapter;
import android.widget.TextView; import android.widget.TextView;
public class EmailAddressAdapter extends ResourceCursorAdapter { public class EmailAddressAdapter extends ResourceCursorAdapter {
private static EmailAddressAdapter sInstance;
public static EmailAddressAdapter getInstance(Context context) {
if (sInstance == null) {
sInstance = new EmailAddressAdapter(context);
}
return sInstance;
}
private final Contacts mContacts; private final Contacts mContacts;
private EmailAddressAdapter(Context context) { public EmailAddressAdapter(Context context) {
super(context, R.layout.recipient_dropdown_item, null); super(context, R.layout.recipient_dropdown_item, null);
mContacts = Contacts.getInstance(context); mContacts = Contacts.getInstance(context.getApplicationContext());
} }
@Override @Override

96
src/com/fsck/k9/K9.java
View File

@ -4,6 +4,7 @@ package com.fsck.k9;
import java.io.File; import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@ -27,6 +28,7 @@ import android.text.TextUtils;
import android.text.format.Time; import android.text.format.Time;
import android.util.Log; import android.util.Log;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageCompose;
import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.controller.MessagingListener;
@ -175,10 +177,21 @@ public class K9 extends Application {
private static String mQuietTimeEnds = null; private static String mQuietTimeEnds = null;
private static boolean compactLayouts = false; private static boolean compactLayouts = false;
private static String mAttachmentDefaultPath = ""; private static String mAttachmentDefaultPath = "";
private static boolean mBatchButtonsMarkRead = true;
private static boolean mBatchButtonsDelete = true;
private static boolean mBatchButtonsArchive = false;
private static boolean mBatchButtonsMove = false;
private static boolean mBatchButtonsFlag = true;
private static boolean mBatchButtonsUnselect = true;
private static boolean useGalleryBugWorkaround = false; private static boolean useGalleryBugWorkaround = false;
private static boolean galleryBuggy; private static boolean galleryBuggy;
private static String mDeviceId = null; private static String mDeviceId = null;
private static SortType mSortType;
private static HashMap<SortType, Boolean> mSortAscending = new HashMap<SortType, Boolean>();
/** /**
* The MIME type(s) of attachments we're willing to view. * The MIME type(s) of attachments we're willing to view.
*/ */
@ -414,6 +427,14 @@ public class K9 extends Application {
editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont); editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont);
editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList); editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList);
editor.putBoolean("messageViewShowNext", mMessageViewShowNext); editor.putBoolean("messageViewShowNext", mMessageViewShowNext);
editor.putBoolean("batchButtonsMarkRead", mBatchButtonsMarkRead);
editor.putBoolean("batchButtonsDelete", mBatchButtonsDelete);
editor.putBoolean("batchButtonsArchive", mBatchButtonsArchive);
editor.putBoolean("batchButtonsMove", mBatchButtonsMove);
editor.putBoolean("batchButtonsFlag", mBatchButtonsFlag);
editor.putBoolean("batchButtonsUnselect", mBatchButtonsUnselect);
editor.putString("language", language); editor.putString("language", language);
editor.putInt("theme", theme); editor.putInt("theme", theme);
editor.putBoolean("useGalleryBugWorkaround", useGalleryBugWorkaround); editor.putBoolean("useGalleryBugWorkaround", useGalleryBugWorkaround);
@ -434,6 +455,9 @@ public class K9 extends Application {
super.onCreate(); super.onCreate();
app = this; app = this;
mSortType = Account.DEFAULT_SORT_TYPE;
mSortAscending.put(Account.DEFAULT_SORT_TYPE, Account.DEFAULT_SORT_ASCENDING);
galleryBuggy = checkForBuggyGallery(); galleryBuggy = checkForBuggyGallery();
Preferences prefs = Preferences.getPreferences(this); Preferences prefs = Preferences.getPreferences(this);
@ -521,7 +545,6 @@ public class K9 extends Application {
// let observers know a fetch occurred // let observers know a fetch occurred
K9.this.sendBroadcast(new Intent(K9.Intents.EmailReceived.ACTION_REFRESH_OBSERVER, null)); K9.this.sendBroadcast(new Intent(K9.Intents.EmailReceived.ACTION_REFRESH_OBSERVER, null));
} }
}); });
notifyObservers(); notifyObservers();
@ -556,6 +579,14 @@ public class K9 extends Application {
mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false); mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false); mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
mMessageViewShowNext = sprefs.getBoolean("messageViewShowNext", false); mMessageViewShowNext = sprefs.getBoolean("messageViewShowNext", false);
mBatchButtonsMarkRead = sprefs.getBoolean("batchButtonsMarkRead", true);
mBatchButtonsDelete = sprefs.getBoolean("batchButtonsDelete", true);
mBatchButtonsArchive = sprefs.getBoolean("batchButtonsArchive", true);
mBatchButtonsMove = sprefs.getBoolean("batchButtonsMove", true);
mBatchButtonsFlag = sprefs.getBoolean("batchButtonsFlag", true);
mBatchButtonsUnselect = sprefs.getBoolean("batchButtonsUnselect", true);
useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy()); useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy());
mConfirmDelete = sprefs.getBoolean("confirmDelete", false); mConfirmDelete = sprefs.getBoolean("confirmDelete", false);
mConfirmDeleteStarred = sprefs.getBoolean("confirmDeleteStarred", false); mConfirmDeleteStarred = sprefs.getBoolean("confirmDeleteStarred", false);
@ -642,7 +673,7 @@ public class K9 extends Application {
} }
public static int getK9ThemeResourceId(int theme) { public static int getK9ThemeResourceId(int theme) {
return (theme == THEME_LIGHT) ? android.R.style.Theme_Light : android.R.style.Theme; return (theme == THEME_LIGHT) ? R.style.Theme_K9_Light : R.style.Theme_K9_Dark;
} }
public static int getK9ThemeResourceId() { public static int getK9ThemeResourceId() {
@ -992,6 +1023,48 @@ public class K9 extends Application {
K9.compactLayouts = compactLayouts; K9.compactLayouts = compactLayouts;
} }
public static boolean batchButtonsMarkRead() {
return mBatchButtonsMarkRead;
}
public static void setBatchButtonsMarkRead(final boolean state) {
mBatchButtonsMarkRead = state;
}
public static boolean batchButtonsDelete() {
return mBatchButtonsDelete;
}
public static void setBatchButtonsDelete(final boolean state) {
mBatchButtonsDelete = state;
}
public static boolean batchButtonsArchive() {
return mBatchButtonsArchive;
}
public static void setBatchButtonsArchive(final boolean state) {
mBatchButtonsArchive = state;
}
public static boolean batchButtonsMove() {
return mBatchButtonsMove;
}
public static void setBatchButtonsMove(final boolean state) {
mBatchButtonsMove = state;
}
public static boolean batchButtonsFlag() {
return mBatchButtonsFlag;
}
public static void setBatchButtonsFlag(final boolean state) {
mBatchButtonsFlag = state;
}
public static boolean batchButtonsUnselect() {
return mBatchButtonsUnselect;
}
public static void setBatchButtonsUnselect(final boolean state) {
mBatchButtonsUnselect = state;
}
/** /**
* Check if this system contains a buggy Gallery 3D package. * Check if this system contains a buggy Gallery 3D package.
* *
@ -1019,6 +1092,25 @@ public class K9 extends Application {
K9.mAttachmentDefaultPath = attachmentDefaultPath; K9.mAttachmentDefaultPath = attachmentDefaultPath;
} }
public static synchronized SortType getSortType() {
return mSortType;
}
public static synchronized void setSortType(SortType sortType) {
mSortType = sortType;
}
public static synchronized boolean isSortAscending(SortType sortType) {
if (mSortAscending.get(sortType) == null) {
mSortAscending.put(sortType, sortType.isDefaultAscending());
}
return mSortAscending.get(sortType);
}
public static synchronized void setSortAscending(SortType sortType, boolean sortAscending) {
mSortAscending.put(sortType, sortAscending);
}
/** /**
* Generates a uuid that is to identify this application on this device. * Generates a uuid that is to identify this application on this device.
* The uuid is only generated once, and then persisted. * The uuid is only generated once, and then persisted.

2
src/com/fsck/k9/activity/Accounts.java
View File

@ -1176,7 +1176,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
private void onAbout() { private void onAbout() {
String appName = getString(R.string.app_name); String appName = getString(R.string.app_name);
String year = "2011"; String year = "2012";
WebView wv = new WebView(this); WebView wv = new WebView(this);
StringBuilder html = new StringBuilder() StringBuilder html = new StringBuilder()
.append("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />") .append("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />")

53
src/com/fsck/k9/activity/EmailAddressList.java Normal file
View File

@ -0,0 +1,53 @@
package com.fsck.k9.activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import com.fsck.k9.R;
import com.fsck.k9.helper.ContactItem;
public class EmailAddressList extends K9ListActivity implements OnItemClickListener {
public static final String EXTRA_CONTACT_ITEM = "contact";
public static final String EXTRA_EMAIL_ADDRESS = "emailAddress";
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.email_address_list);
Intent i = getIntent();
ContactItem contact = (ContactItem) i.getSerializableExtra(EXTRA_CONTACT_ITEM);
if (contact == null) {
finish();
return;
}
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
R.layout.email_address_list_item, contact.emailAddresses);
ListView listView = getListView();
listView.setOnItemClickListener(this);
listView.setAdapter(adapter);
setTitle(contact.displayName);
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
String item = (String)parent.getItemAtPosition(position);
Toast.makeText(EmailAddressList.this, item, Toast.LENGTH_LONG).show();
Intent intent = new Intent();
intent.putExtra(EXTRA_EMAIL_ADDRESS, item);
setResult(RESULT_OK, intent);
finish();
}
}

71
src/com/fsck/k9/activity/FolderInfoHolder.java
View File

@ -98,34 +98,53 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
this.status = truncateStatus(folder.getStatus()); this.status = truncateStatus(folder.getStatus());
if (this.name.equalsIgnoreCase(account.getInboxFolderName())) { this.displayName = getDisplayName(context, folder);
this.displayName = context.getString(R.string.special_mailbox_name_inbox); }
/**
* Returns the display name for a folder.
*
* <p>
* This will return localized strings for special folders like the Inbox or the Trash folder.
* </p>
*
* @param context
* A {@link Context} instance that is used to get the string resources.
* @param folder
* The {@link Folder} instance for which to return the display name.
*
* @return The localized name for the provided folder if it's a special folder or the original
* folder name if it's a non-special folder.
*/
public static String getDisplayName(Context context, Folder folder) {
Account account = folder.getAccount();
String name = folder.getName();
final String displayName;
if (name.equals(account.getSpamFolderName())) {
displayName = String.format(
context.getString(R.string.special_mailbox_name_spam_fmt), name);
} else if (name.equals(account.getArchiveFolderName())) {
displayName = String.format(
context.getString(R.string.special_mailbox_name_archive_fmt), name);
} else if (name.equals(account.getSentFolderName())) {
displayName = String.format(
context.getString(R.string.special_mailbox_name_sent_fmt), name);
} else if (name.equals(account.getTrashFolderName())) {
displayName = String.format(
context.getString(R.string.special_mailbox_name_trash_fmt), name);
} else if (name.equals(account.getDraftsFolderName())) {
displayName = String.format(
context.getString(R.string.special_mailbox_name_drafts_fmt), name);
} else if (name.equals(account.getOutboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_outbox);
// FIXME: We really shouldn't do a case-insensitive comparison here
} else if (name.equalsIgnoreCase(account.getInboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_inbox);
} else { } else {
this.displayName = folder.getName(); displayName = name;
} }
if (this.name.equals(account.getOutboxFolderName())) { return displayName;
this.displayName = context.getString(R.string.special_mailbox_name_outbox);
}
if (this.name.equals(account.getDraftsFolderName())) {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_drafts_fmt), this.displayName);
}
if (this.name.equals(account.getTrashFolderName())) {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_trash_fmt), this.displayName);
}
if (this.name.equals(account.getSentFolderName())) {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_sent_fmt), this.displayName);
}
if (this.name.equals(account.getArchiveFolderName())) {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_archive_fmt), this.displayName);
}
if (this.name.equals(account.getSpamFolderName())) {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_spam_fmt), this.displayName);
}
} }
} }

178
src/com/fsck/k9/activity/FolderList.java
View File

@ -24,6 +24,7 @@ import android.widget.AdapterView.OnItemClickListener;
import com.fsck.k9.*; import com.fsck.k9.*;
import com.fsck.k9.Account.FolderMode; import com.fsck.k9.Account.FolderMode;
import com.fsck.k9.activity.FolderInfoHolder; import com.fsck.k9.activity.FolderInfoHolder;
import com.fsck.k9.activity.FolderList.FolderListAdapter.FolderListFilter;
import com.fsck.k9.activity.setup.Prefs; import com.fsck.k9.activity.setup.Prefs;
import com.fsck.k9.activity.setup.AccountSettings; import com.fsck.k9.activity.setup.AccountSettings;
import com.fsck.k9.activity.setup.FolderSettings; import com.fsck.k9.activity.setup.FolderSettings;
@ -50,9 +51,12 @@ import java.util.List;
*/ */
public class FolderList extends K9ListActivity { public class FolderList extends K9ListActivity {
/*
* Constants for showDialog() etc.
*/
private static final int DIALOG_MARK_ALL_AS_READ = 1; private static final int DIALOG_MARK_ALL_AS_READ = 1;
private static final int DIALOG_EMPTY_TRASH = 2; private static final int DIALOG_FIND_FOLDER = 2;
private static final int DIALOG_EMPTY_TRASH = 3;
private static final String EXTRA_ACCOUNT = "account"; private static final String EXTRA_ACCOUNT = "account";
@ -411,6 +415,7 @@ public class FolderList extends K9ListActivity {
if (mAccount.getFolderPushMode() != FolderMode.NONE) { if (mAccount.getFolderPushMode() != FolderMode.NONE) {
MailService.actionRestartPushers(this, null); MailService.actionRestartPushers(this, null);
} }
mAdapter.getFilter().filter(null);
onRefresh(false); onRefresh(false);
} }
@ -423,44 +428,7 @@ public class FolderList extends K9ListActivity {
* Filter {@link #mAdapter} with the user-input. * Filter {@link #mAdapter} with the user-input.
*/ */
private void onEnterFilter() { private void onEnterFilter() {
final AlertDialog.Builder filterAlert = new AlertDialog.Builder(this); showDialog(DIALOG_FIND_FOLDER);
final EditText input = new EditText(this);
input.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
mAdapter.getFilter().filter(input.getText().toString());
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count,
int after) {
}
@Override
public void afterTextChanged(Editable s) {
}
});
input.setHint(R.string.folder_list_filter_hint);
filterAlert.setView(input);
filterAlert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
String value = input.getText().toString().trim();
mAdapter.getFilter().filter(value);
}
});
filterAlert.setNegativeButton("Cancel",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
mAdapter.getFilter().filter("");
}
});
filterAlert.show();
} }
private void onEditPrefs() { private void onEditPrefs() {
@ -665,33 +633,72 @@ public class FolderList extends K9ListActivity {
@Override @Override
public Dialog onCreateDialog(int id) { public Dialog onCreateDialog(int id) {
switch (id) { switch (id) {
case DIALOG_MARK_ALL_AS_READ: case DIALOG_MARK_ALL_AS_READ:
return ConfirmationDialog.create(this, return ConfirmationDialog.create(this, id, R.string.mark_all_as_read_dlg_title,
id, getString(R.string.mark_all_as_read_dlg_instructions_fmt,
R.string.mark_all_as_read_dlg_title,
getString(R.string.mark_all_as_read_dlg_instructions_fmt,
mSelectedContextFolder.displayName), mSelectedContextFolder.displayName),
R.string.okay_action, R.string.okay_action, R.string.cancel_action,
R.string.cancel_action, new Runnable() {
new Runnable() { @Override
@Override public void run() {
public void run() { markAllAsRead();
markAllAsRead(); }
} });
}); case DIALOG_FIND_FOLDER: {
case DIALOG_EMPTY_TRASH: AlertDialog.Builder builder = new AlertDialog.Builder(this);
return ConfirmationDialog.create(this, builder.setTitle(R.string.filter_folders_action);
id,
R.string.empty_trash_dlg_title, final EditText input = new EditText(this);
R.string.empty_trash_dlg_instructions, input.setId(R.id.filter_folders);
R.string.okay_action, input.setHint(R.string.folder_list_filter_hint);
R.string.cancel_action, input.addTextChangedListener(new TextWatcher() {
new Runnable() { @Override
@Override public void onTextChanged(CharSequence s, int start, int before, int count) {
public void run() { mAdapter.getFilter().filter(input.getText());
emptyTrash(); }
}
}); @Override
public void beforeTextChanged(CharSequence s, int start, int count,
int after) { /* not used */ }
@Override
public void afterTextChanged(Editable s) { /* not used */ }
});
builder.setView(input);
builder.setPositiveButton(getString(R.string.okay_action),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
String value = input.getText().toString();
mAdapter.getFilter().filter(value);
}
});
builder.setNegativeButton(getString(R.string.cancel_action),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
mAdapter.getFilter().filter(null);
}
});
return builder.create();
}
case DIALOG_EMPTY_TRASH:
return ConfirmationDialog.create(this,
id,
R.string.empty_trash_dlg_title,
R.string.empty_trash_dlg_instructions,
R.string.okay_action,
R.string.cancel_action,
new Runnable() {
@Override
public void run() {
emptyTrash();
}
});
} }
return super.onCreateDialog(id); return super.onCreateDialog(id);
@ -700,15 +707,30 @@ public class FolderList extends K9ListActivity {
@Override @Override
public void onPrepareDialog(int id, Dialog dialog) { public void onPrepareDialog(int id, Dialog dialog) {
switch (id) { switch (id) {
case DIALOG_MARK_ALL_AS_READ: case DIALOG_MARK_ALL_AS_READ: {
((AlertDialog)dialog).setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt, AlertDialog alertDialog = (AlertDialog) dialog;
mSelectedContextFolder.displayName)); alertDialog.setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
break; mSelectedContextFolder.displayName));
case DIALOG_EMPTY_TRASH: break;
((AlertDialog)dialog).setMessage(getString(R.string.empty_trash_dlg_instructions)); }
break; case DIALOG_FIND_FOLDER: {
default: AlertDialog alertDialog = (AlertDialog) dialog;
super.onPrepareDialog(id, dialog); EditText input = (EditText) alertDialog.findViewById(R.id.filter_folders);
// Populate the EditText with the current search term
FolderListFilter filter = (FolderListFilter) mAdapter.getFilter();
input.setText(filter.getSearchTerm());
// Place the cursor at the end of the text
input.setSelection(input.getText().length());
break;
}
case DIALOG_EMPTY_TRASH:
((AlertDialog)dialog).setMessage(getString(R.string.empty_trash_dlg_instructions));
break;
default: {
super.onPrepareDialog(id, dialog);
}
} }
} }
@ -1180,6 +1202,11 @@ public class FolderList extends K9ListActivity {
* @author Marcus@Wolschon.biz * @author Marcus@Wolschon.biz
*/ */
public class FolderListFilter extends Filter { public class FolderListFilter extends Filter {
private CharSequence mSearchTerm;
public CharSequence getSearchTerm() {
return mSearchTerm;
}
/** /**
* Do the actual search. * Do the actual search.
@ -1189,6 +1216,7 @@ public class FolderList extends K9ListActivity {
*/ */
@Override @Override
protected FilterResults performFiltering(CharSequence searchTerm) { protected FilterResults performFiltering(CharSequence searchTerm) {
mSearchTerm = searchTerm;
FilterResults results = new FilterResults(); FilterResults results = new FilterResults();
if ((searchTerm == null) || (searchTerm.length() == 0)) { if ((searchTerm == null) || (searchTerm.length() == 0)) {

18
src/com/fsck/k9/activity/K9Activity.java
View File

@ -19,7 +19,9 @@ import com.fsck.k9.K9;
public class K9Activity extends Activity { public class K9Activity extends Activity {
private GestureDetector gestureDetector; protected static final int BEZEL_SWIPE_THRESHOLD = 20;
protected GestureDetector mGestureDetector;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@ -27,10 +29,6 @@ public class K9Activity extends Activity {
setTheme(K9.getK9ThemeResourceId()); setTheme(K9.getK9ThemeResourceId());
super.onCreate(icicle); super.onCreate(icicle);
setupFormats(); setupFormats();
// Gesture detection
gestureDetector = new GestureDetector(new MyGestureDetector());
} }
public static void setLanguage(Context context, String language) { public static void setLanguage(Context context, String language) {
@ -51,8 +49,10 @@ public class K9Activity extends Activity {
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
super.dispatchTouchEvent(ev); if (mGestureDetector != null) {
return gestureDetector.onTouchEvent(ev); mGestureDetector.onTouchEvent(ev);
}
return super.dispatchTouchEvent(ev);
} }
@Override @Override
@ -184,6 +184,10 @@ public class K9Activity extends Activity {
Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe did not meet minimum distance requirements."); Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe did not meet minimum distance requirements.");
return false; return false;
} }
// successful fling, cancel the 2nd event to prevent any other action from happening
// see http://code.google.com/p/android/issues/detail?id=8497
e2.setAction(MotionEvent.ACTION_CANCEL);
} catch (Exception e) { } catch (Exception e) {
// nothing // nothing
} }

129
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -26,7 +26,6 @@ import android.content.pm.ActivityInfo;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Parcelable; import android.os.Parcelable;
@ -73,6 +72,7 @@ import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.controller.MessagingListener;
import com.fsck.k9.crypto.CryptoProvider; import com.fsck.k9.crypto.CryptoProvider;
import com.fsck.k9.crypto.PgpData; import com.fsck.k9.crypto.PgpData;
import com.fsck.k9.helper.ContactItem;
import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.Contacts;
import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.Utility;
import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.Message.RecipientType;
@ -135,9 +135,12 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private static final int MSG_DISCARDED_DRAFT = 6; private static final int MSG_DISCARDED_DRAFT = 6;
private static final int ACTIVITY_REQUEST_PICK_ATTACHMENT = 1; private static final int ACTIVITY_REQUEST_PICK_ATTACHMENT = 1;
private static final int CONTACT_PICKER_TO = 2; private static final int CONTACT_PICKER_TO = 4;
private static final int CONTACT_PICKER_CC = 3; private static final int CONTACT_PICKER_CC = 5;
private static final int CONTACT_PICKER_BCC = 4; private static final int CONTACT_PICKER_BCC = 6;
private static final int CONTACT_PICKER_TO2 = 7;
private static final int CONTACT_PICKER_CC2 = 8;
private static final int CONTACT_PICKER_BCC2 = 9;
private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[0]; private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[0];
@ -413,7 +416,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mContacts = Contacts.getInstance(MessageCompose.this); mContacts = Contacts.getInstance(MessageCompose.this);
mAddressAdapter = EmailAddressAdapter.getInstance(this); mAddressAdapter = new EmailAddressAdapter(this);
mAddressValidator = new EmailAddressValidator(); mAddressValidator = new EmailAddressValidator();
mChooseIdentityButton = (Button) findViewById(R.id.identity); mChooseIdentityButton = (Button) findViewById(R.id.identity);
@ -756,13 +759,17 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
} }
/* /*
* Note: According to the documenation ACTION_VIEW and ACTION_SENDTO * Note: According to the documenation ACTION_VIEW and ACTION_SENDTO don't accept
* don't accept EXTRA_* parameters. Contrary to the AOSP Email application * EXTRA_* parameters.
* we don't accept those EXTRAs. * And previously we didn't process these EXTRAs. But it looks like nobody bothers to
* Dear developer, if your application is using those EXTRAs you're doing * read the official documentation and just copies wrong sample code that happens to
* it wrong! So go fix your program or get AOSP to change the documentation. * work with the AOSP Email application. And because even big players get this wrong,
* we're now finally giving in and read the EXTRAs for ACTION_SENDTO (below).
*/ */
} else if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) { }
if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action) ||
Intent.ACTION_SENDTO.equals(action)) {
/* /*
* Note: Here we allow a slight deviation from the documentated behavior. * Note: Here we allow a slight deviation from the documentated behavior.
* EXTRA_TEXT is used as message body (if available) regardless of the MIME * EXTRA_TEXT is used as message body (if available) regardless of the MIME
@ -770,7 +777,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
* using EXTRA_STREAM. * using EXTRA_STREAM.
*/ */
CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT); CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);
if (text != null) { // Only use EXTRA_TEXT if the body hasn't already been set by the mailto URI
if (text != null && mMessageContentView.getText().length() == 0) {
mMessageContentView.setText(text); mMessageContentView.setText(text);
} }
@ -793,7 +801,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
} }
String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT); String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
if (subject != null) { // Only use EXTRA_SUBJECT if the subject hasn't already been set by the mailto URI
if (subject != null && mSubjectView.getText().length() == 0) {
mSubjectView.setText(subject); mSubjectView.setText(subject);
} }
@ -802,16 +811,16 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
String[] extraBcc = intent.getStringArrayExtra(Intent.EXTRA_BCC); String[] extraBcc = intent.getStringArrayExtra(Intent.EXTRA_BCC);
if (extraEmail != null) { if (extraEmail != null) {
setRecipients(mToView, Arrays.asList(extraEmail)); addRecipients(mToView, Arrays.asList(extraEmail));
} }
boolean ccOrBcc = false; boolean ccOrBcc = false;
if (extraCc != null) { if (extraCc != null) {
ccOrBcc |= setRecipients(mCcView, Arrays.asList(extraCc)); ccOrBcc |= addRecipients(mCcView, Arrays.asList(extraCc));
} }
if (extraBcc != null) { if (extraBcc != null) {
ccOrBcc |= setRecipients(mBccView, Arrays.asList(extraBcc)); ccOrBcc |= addRecipients(mBccView, Arrays.asList(extraBcc));
} }
if (ccOrBcc) { if (ccOrBcc) {
@ -821,19 +830,31 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
} }
} }
private boolean setRecipients(TextView view, List<String> recipients) { private boolean addRecipients(TextView view, List<String> recipients) {
boolean recipientAdded = false; if (recipients == null || recipients.size() == 0) {
if (recipients != null) { return false;
StringBuilder addressList = new StringBuilder();
for (String recipient : recipients) {
addressList.append(recipient);
addressList.append(", ");
recipientAdded = true;
}
view.setText(addressList);
} }
return recipientAdded; StringBuilder addressList = new StringBuilder();
// Read current contents of the TextView
String text = view.getText().toString();
addressList.append(text);
// Add comma if necessary
if (text.length() != 0 && !(text.endsWith(", ") || text.endsWith(","))) {
addressList.append(", ");
}
// Add recipients
for (String recipient : recipients) {
addressList.append(recipient);
addressList.append(", ");
}
view.setText(addressList);
return true;
} }
private void initializeCrypto() { private void initializeCrypto() {
@ -1546,7 +1567,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private void saveIfNeeded() { private void saveIfNeeded() {
if (!mDraftNeedsSaving || mPreventDraftSaving || mPgpData.hasEncryptionKeys() || if (!mDraftNeedsSaving || mPreventDraftSaving || mPgpData.hasEncryptionKeys() ||
mEncryptCheckbox.isChecked() || isDraftsFolderDisabled()) { mEncryptCheckbox.isChecked() || !mAccount.hasDraftsFolder()) {
return; return;
} }
@ -1790,11 +1811,33 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
case CONTACT_PICKER_TO: case CONTACT_PICKER_TO:
case CONTACT_PICKER_CC: case CONTACT_PICKER_CC:
case CONTACT_PICKER_BCC: case CONTACT_PICKER_BCC:
String email = mContacts.getEmailFromContactPicker(data); ContactItem contact = mContacts.extractInfoFromContactPickerIntent(data);
if (email.length() == 0) { if (contact == null) {
Toast.makeText(this, getString(R.string.error_contact_address_not_found), Toast.LENGTH_LONG).show(); Toast.makeText(this, getString(R.string.error_contact_address_not_found), Toast.LENGTH_LONG).show();
return; return;
} }
if (contact.emailAddresses.size() > 1) {
Intent i = new Intent(this, EmailAddressList.class);
i.putExtra(EmailAddressList.EXTRA_CONTACT_ITEM, contact);
if (requestCode == CONTACT_PICKER_TO) {
startActivityForResult(i, CONTACT_PICKER_TO2);
} else if (requestCode == CONTACT_PICKER_CC) {
startActivityForResult(i, CONTACT_PICKER_CC2);
} else if (requestCode == CONTACT_PICKER_BCC) {
startActivityForResult(i, CONTACT_PICKER_BCC2);
}
return;
}
if (K9.DEBUG) {
List<String> emails = contact.emailAddresses;
for (int i = 0; i < emails.size(); i++) {
Log.v(K9.LOG_TAG, "email[" + i + "]: " + emails.get(i));
}
}
String email = contact.emailAddresses.get(0);
if (requestCode == CONTACT_PICKER_TO) { if (requestCode == CONTACT_PICKER_TO) {
addAddress(mToView, new Address(email, "")); addAddress(mToView, new Address(email, ""));
} else if (requestCode == CONTACT_PICKER_CC) { } else if (requestCode == CONTACT_PICKER_CC) {
@ -1807,6 +1850,18 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
break;
case CONTACT_PICKER_TO2:
case CONTACT_PICKER_CC2:
case CONTACT_PICKER_BCC2:
String emailAddr = data.getStringExtra(EmailAddressList.EXTRA_EMAIL_ADDRESS);
if (requestCode == CONTACT_PICKER_TO2) {
addAddress(mToView, new Address(emailAddr, ""));
} else if (requestCode == CONTACT_PICKER_CC2) {
addAddress(mCcView, new Address(emailAddr, ""));
} else if (requestCode == CONTACT_PICKER_BCC2) {
addAddress(mBccView, new Address(emailAddr, ""));
}
break; break;
} }
} }
@ -1995,7 +2050,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
getMenuInflater().inflate(R.menu.message_compose_option, menu); getMenuInflater().inflate(R.menu.message_compose_option, menu);
// Disable the 'Save' menu option if Drafts folder is set to -NONE- // Disable the 'Save' menu option if Drafts folder is set to -NONE-
if (isDraftsFolderDisabled()) { if (!mAccount.hasDraftsFolder()) {
menu.findItem(R.id.save).setEnabled(false); menu.findItem(R.id.save).setEnabled(false);
} }
@ -2025,7 +2080,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
if (mDraftNeedsSaving) { if (mDraftNeedsSaving) {
if (mEncryptCheckbox.isChecked()) { if (mEncryptCheckbox.isChecked()) {
showDialog(DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED); showDialog(DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED);
} else if (isDraftsFolderDisabled()) { } else if (!mAccount.hasDraftsFolder()) {
showDialog(DIALOG_CONFIRM_DISCARD_ON_BACK); showDialog(DIALOG_CONFIRM_DISCARD_ON_BACK);
} else { } else {
showDialog(DIALOG_SAVE_OR_DISCARD_DRAFT_MESSAGE); showDialog(DIALOG_SAVE_OR_DISCARD_DRAFT_MESSAGE);
@ -2040,10 +2095,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
} }
} }
private boolean isDraftsFolderDisabled() {
return mAccount.getDraftsFolderName().equals(K9.FOLDER_NONE);
}
@Override @Override
public Dialog onCreateDialog(int id) { public Dialog onCreateDialog(int id) {
switch (id) { switch (id) {
@ -2969,13 +3020,13 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
to = new ArrayList<String>(to); to = new ArrayList<String>(to);
to.add(0, recipient); to.add(0, recipient);
} }
setRecipients(mToView, to); addRecipients(mToView, to);
// Read carbon copy recipients from the "cc" parameter. // Read carbon copy recipients from the "cc" parameter.
boolean ccOrBcc = setRecipients(mCcView, uri.getQueryParameters("cc")); boolean ccOrBcc = addRecipients(mCcView, uri.getQueryParameters("cc"));
// Read blind carbon copy recipients from the "bcc" parameter. // Read blind carbon copy recipients from the "bcc" parameter.
ccOrBcc |= setRecipients(mBccView, uri.getQueryParameters("bcc")); ccOrBcc |= addRecipients(mBccView, uri.getQueryParameters("bcc"));
if (ccOrBcc) { if (ccOrBcc) {
// Display CC and BCC text fields if CC or BCC recipients were set by the intent. // Display CC and BCC text fields if CC or BCC recipients were set by the intent.

164
src/com/fsck/k9/activity/MessageList.java
View File

@ -51,6 +51,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.AccountStats; import com.fsck.k9.AccountStats;
import com.fsck.k9.BaseAccount; import com.fsck.k9.BaseAccount;
import com.fsck.k9.FontSizes; import com.fsck.k9.FontSizes;
@ -63,7 +64,6 @@ import com.fsck.k9.activity.setup.AccountSettings;
import com.fsck.k9.activity.setup.FolderSettings; import com.fsck.k9.activity.setup.FolderSettings;
import com.fsck.k9.activity.setup.Prefs; import com.fsck.k9.activity.setup.Prefs;
import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingController.SORT_TYPE;
import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.controller.MessagingListener;
import com.fsck.k9.helper.MessageHelper; import com.fsck.k9.helper.MessageHelper;
import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.Utility;
@ -233,21 +233,21 @@ public class MessageList
private static final String EXTRA_RETURN_FROM_MESSAGE_VIEW = "returnFromMessageView"; private static final String EXTRA_RETURN_FROM_MESSAGE_VIEW = "returnFromMessageView";
/** /**
* Maps a {@link SORT_TYPE} to a {@link Comparator} implementation. * Maps a {@link SortType} to a {@link Comparator} implementation.
*/ */
private static final Map<SORT_TYPE, Comparator<MessageInfoHolder>> SORT_COMPARATORS; private static final Map<SortType, Comparator<MessageInfoHolder>> SORT_COMPARATORS;
static { static {
// fill the mapping at class time loading // fill the mapping at class time loading
final Map<SORT_TYPE, Comparator<MessageInfoHolder>> map = new EnumMap<SORT_TYPE, Comparator<MessageInfoHolder>>(SORT_TYPE.class); final Map<SortType, Comparator<MessageInfoHolder>> map = new EnumMap<SortType, Comparator<MessageInfoHolder>>(SortType.class);
map.put(SORT_TYPE.SORT_ATTACHMENT, new AttachmentComparator()); map.put(SortType.SORT_ATTACHMENT, new AttachmentComparator());
map.put(SORT_TYPE.SORT_DATE, new DateComparator()); map.put(SortType.SORT_DATE, new DateComparator());
map.put(SORT_TYPE.SORT_ARRIVAL, new ArrivalComparator()); map.put(SortType.SORT_ARRIVAL, new ArrivalComparator());
map.put(SORT_TYPE.SORT_FLAGGED, new FlaggedComparator()); map.put(SortType.SORT_FLAGGED, new FlaggedComparator());
map.put(SORT_TYPE.SORT_SENDER, new SenderComparator()); map.put(SortType.SORT_SENDER, new SenderComparator());
map.put(SORT_TYPE.SORT_SUBJECT, new SubjectComparator()); map.put(SortType.SORT_SUBJECT, new SubjectComparator());
map.put(SORT_TYPE.SORT_UNREAD, new UnreadComparator()); map.put(SortType.SORT_UNREAD, new UnreadComparator());
// make it immutable to prevent accidental alteration (content is immutable already) // make it immutable to prevent accidental alteration (content is immutable already)
SORT_COMPARATORS = Collections.unmodifiableMap(map); SORT_COMPARATORS = Collections.unmodifiableMap(map);
@ -292,10 +292,9 @@ public class MessageList
private MessageListHandler mHandler = new MessageListHandler(); private MessageListHandler mHandler = new MessageListHandler();
private SORT_TYPE sortType = SORT_TYPE.SORT_DATE; private SortType mSortType = SortType.SORT_DATE;
private boolean mSortAscending = true;
private boolean sortAscending = true; private boolean mSortDateAscending = false;
private boolean sortDateAscending = false;
private boolean mStars = true; private boolean mStars = true;
private boolean mCheckboxes = true; private boolean mCheckboxes = true;
@ -305,6 +304,8 @@ public class MessageList
private ImageButton mBatchReadButton; private ImageButton mBatchReadButton;
private ImageButton mBatchDeleteButton; private ImageButton mBatchDeleteButton;
private ImageButton mBatchFlagButton; private ImageButton mBatchFlagButton;
private ImageButton mBatchArchiveButton;
private ImageButton mBatchMoveButton;
private ImageButton mBatchDoneButton; private ImageButton mBatchDoneButton;
private FontSizes mFontSizes = K9.getFontSizes(); private FontSizes mFontSizes = K9.getFontSizes();
@ -460,8 +461,8 @@ public class MessageList
{ {
// add the specified comparator // add the specified comparator
final Comparator<MessageInfoHolder> comparator = SORT_COMPARATORS.get(sortType); final Comparator<MessageInfoHolder> comparator = SORT_COMPARATORS.get(mSortType);
if (sortAscending) { if (mSortAscending) {
chain.add(comparator); chain.add(comparator);
} else { } else {
chain.add(new ReverseComparator<MessageInfoHolder>(comparator)); chain.add(new ReverseComparator<MessageInfoHolder>(comparator));
@ -470,9 +471,9 @@ public class MessageList
{ {
// add the date comparator if not already specified // add the date comparator if not already specified
if (sortType != SORT_TYPE.SORT_DATE && sortType != SORT_TYPE.SORT_ARRIVAL) { if (mSortType != SortType.SORT_DATE && mSortType != SortType.SORT_ARRIVAL) {
final Comparator<MessageInfoHolder> comparator = SORT_COMPARATORS.get(SORT_TYPE.SORT_DATE); final Comparator<MessageInfoHolder> comparator = SORT_COMPARATORS.get(SortType.SORT_DATE);
if (sortDateAscending) { if (mSortDateAscending) {
chain.add(comparator); chain.add(comparator);
} else { } else {
chain.add(new ReverseComparator<MessageInfoHolder>(comparator)); chain.add(new ReverseComparator<MessageInfoHolder>(comparator));
@ -692,6 +693,9 @@ public class MessageList
mPreviewLines = K9.messageListPreviewLines(); mPreviewLines = K9.messageListPreviewLines();
initializeMessageList(getIntent(), true); initializeMessageList(getIntent(), true);
// Enable gesture detection for MessageLists
mGestureDetector = new GestureDetector(new MyGestureDetector(true));
} }
@Override @Override
@ -823,18 +827,20 @@ public class MessageList
mStars = K9.messageListStars(); mStars = K9.messageListStars();
mCheckboxes = K9.messageListCheckboxes(); mCheckboxes = K9.messageListCheckboxes();
sortType = mController.getSortType();
sortAscending = mController.isSortAscending(sortType);
sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE);
mController.addListener(mAdapter.mListener); mController.addListener(mAdapter.mListener);
Account[] accountsWithNotification; Account[] accountsWithNotification;
if (mAccount != null) { if (mAccount != null) {
accountsWithNotification = new Account[] { mAccount }; accountsWithNotification = new Account[] { mAccount };
mSortType = mAccount.getSortType();
mSortAscending = mAccount.isSortAscending(mSortType);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
} else { } else {
Preferences preferences = Preferences.getPreferences(this); Preferences preferences = Preferences.getPreferences(this);
accountsWithNotification = preferences.getAccounts(); accountsWithNotification = preferences.getAccounts();
mSortType = K9.getSortType(); // ASH
mSortAscending = K9.isSortAscending(mSortType);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
} }
for (Account accountWithNotification : accountsWithNotification) { for (Account accountWithNotification : accountsWithNotification) {
@ -844,8 +850,14 @@ public class MessageList
if (mAdapter.messages.isEmpty()) { if (mAdapter.messages.isEmpty()) {
if (mFolderName != null) { if (mFolderName != null) {
mController.listLocalMessages(mAccount, mFolderName, mAdapter.mListener); mController.listLocalMessages(mAccount, mFolderName, mAdapter.mListener);
// Hide the archive button if we don't have an archive folder.
if (!mAccount.hasArchiveFolder()) {
mBatchArchiveButton.setVisibility(View.GONE);
}
} else if (mQueryString != null) { } else if (mQueryString != null) {
mController.searchLocalMessages(mAccountUuids, mFolderNames, null, mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, mAdapter.mListener); mController.searchLocalMessages(mAccountUuids, mFolderNames, null, mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, mAdapter.mListener);
// Don't show the archive button if this is a search.
mBatchArchiveButton.setVisibility(View.GONE);
} }
} else { } else {
@ -906,23 +918,19 @@ public class MessageList
mBatchDeleteButton.setOnClickListener(this); mBatchDeleteButton.setOnClickListener(this);
mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button); mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
mBatchFlagButton.setOnClickListener(this); mBatchFlagButton.setOnClickListener(this);
mBatchArchiveButton = (ImageButton) findViewById(R.id.batch_archive_button);
mBatchArchiveButton.setOnClickListener(this);
mBatchMoveButton = (ImageButton) findViewById(R.id.batch_move_button);
mBatchMoveButton.setOnClickListener(this);
mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button); mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
mBatchDoneButton.setOnClickListener(this); mBatchDoneButton.setOnClickListener(this);
// Gesture detection mBatchReadButton.setVisibility(K9.batchButtonsMarkRead() ? View.VISIBLE : View.GONE);
gestureDetector = new GestureDetector(new MyGestureDetector(true)); mBatchDeleteButton.setVisibility(K9.batchButtonsDelete() ? View.VISIBLE : View.GONE);
gestureListener = new View.OnTouchListener() { mBatchArchiveButton.setVisibility(K9.batchButtonsArchive() ? View.VISIBLE : View.GONE);
@Override mBatchMoveButton.setVisibility(K9.batchButtonsMove() ? View.VISIBLE : View.GONE);
public boolean onTouch(View v, MotionEvent event) { mBatchFlagButton.setVisibility(K9.batchButtonsFlag() ? View.VISIBLE : View.GONE);
if (gestureDetector.onTouchEvent(event)) { mBatchDoneButton.setVisibility(K9.batchButtonsUnselect() ? View.VISIBLE : View.GONE);
return true;
}
return false;
}
};
mListView.setOnTouchListener(gestureListener);
} }
/** /**
@ -1193,20 +1201,27 @@ public class MessageList
AccountSettings.actionSettings(this, mAccount); AccountSettings.actionSettings(this, mAccount);
} }
private void changeSort(SORT_TYPE newSortType) { private void changeSort(SortType sortType) {
if (sortType == newSortType) { if (mSortType == sortType) {
onToggleSortAscending(); onToggleSortAscending();
} else { } else {
sortType = newSortType; mSortType = sortType;
mController.setSortType(sortType); if (mAccount != null) {
sortAscending = mController.isSortAscending(sortType); mAccount.setSortType(mSortType);
sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE); mSortAscending = mAccount.isSortAscending(mSortType);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
mAccount.save(Preferences.getPreferences(this));
} else {
K9.setSortType(mSortType);
mSortAscending = K9.isSortAscending(mSortType);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
}
reSort(); reSort();
} }
} }
private void reSort() { private void reSort() {
int toastString = sortType.getToast(sortAscending); int toastString = mSortType.getToast(mSortAscending);
Toast toast = Toast.makeText(this, toastString, Toast.LENGTH_SHORT); Toast toast = Toast.makeText(this, toastString, Toast.LENGTH_SHORT);
toast.show(); toast.show();
@ -1215,11 +1230,11 @@ public class MessageList
} }
private void onCycleSort() { private void onCycleSort() {
SORT_TYPE[] sorts = SORT_TYPE.values(); SortType[] sorts = SortType.values();
int curIndex = 0; int curIndex = 0;
for (int i = 0; i < sorts.length; i++) { for (int i = 0; i < sorts.length; i++) {
if (sorts[i] == sortType) { if (sorts[i] == mSortType) {
curIndex = i; curIndex = i;
break; break;
} }
@ -1235,11 +1250,15 @@ public class MessageList
} }
private void onToggleSortAscending() { private void onToggleSortAscending() {
mController.setSortAscending(sortType, !sortAscending); mSortAscending = !mSortAscending;
if (mAccount != null) {
sortAscending = mController.isSortAscending(sortType); mAccount.setSortAscending(mSortType, mSortAscending);
sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE); mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
mAccount.save(Preferences.getPreferences(this));
} else {
K9.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
}
reSort(); reSort();
} }
@ -1450,31 +1469,31 @@ public class MessageList
return true; return true;
} }
case R.id.set_sort_date: { case R.id.set_sort_date: {
changeSort(SORT_TYPE.SORT_DATE); changeSort(SortType.SORT_DATE);
return true; return true;
} }
case R.id.set_sort_arrival: { case R.id.set_sort_arrival: {
changeSort(SORT_TYPE.SORT_ARRIVAL); changeSort(SortType.SORT_ARRIVAL);
return true; return true;
} }
case R.id.set_sort_subject: { case R.id.set_sort_subject: {
changeSort(SORT_TYPE.SORT_SUBJECT); changeSort(SortType.SORT_SUBJECT);
return true; return true;
} }
case R.id.set_sort_sender: { case R.id.set_sort_sender: {
changeSort(SORT_TYPE.SORT_SENDER); changeSort(SortType.SORT_SENDER);
return true; return true;
} }
case R.id.set_sort_flag: { case R.id.set_sort_flag: {
changeSort(SORT_TYPE.SORT_FLAGGED); changeSort(SortType.SORT_FLAGGED);
return true; return true;
} }
case R.id.set_sort_unread: { case R.id.set_sort_unread: {
changeSort(SORT_TYPE.SORT_UNREAD); changeSort(SortType.SORT_UNREAD);
return true; return true;
} }
case R.id.set_sort_attach: { case R.id.set_sort_attach: {
changeSort(SORT_TYPE.SORT_ATTACHMENT); changeSort(SortType.SORT_ATTACHMENT);
return true; return true;
} }
case R.id.select_all: case R.id.select_all:
@ -1623,10 +1642,10 @@ public class MessageList
if (mCurrentFolder != null && K9.ERROR_FOLDER_NAME.equals(mCurrentFolder.name)) { if (mCurrentFolder != null && K9.ERROR_FOLDER_NAME.equals(mCurrentFolder.name)) {
menu.findItem(R.id.expunge).setVisible(false); menu.findItem(R.id.expunge).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())) { if (!mAccount.hasArchiveFolder()) {
menu.findItem(R.id.batch_archive_op).setVisible(false); menu.findItem(R.id.batch_archive_op).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) { if (!mAccount.hasSpamFolder()) {
menu.findItem(R.id.batch_spam_op).setVisible(false); menu.findItem(R.id.batch_spam_op).setVisible(false);
} }
@ -1781,7 +1800,9 @@ public class MessageList
* @param selected true if this was an attempt to select (i.e. left to right). * @param selected true if this was an attempt to select (i.e. left to right).
*/ */
private void handleSwipe(final MotionEvent downMotion, final boolean selected) { private void handleSwipe(final MotionEvent downMotion, final boolean selected) {
int position = mListView.pointToPosition((int) downMotion.getX(), (int) downMotion.getY()); int[] listPosition = new int[2];
mListView.getLocationOnScreen(listPosition);
int position = mListView.pointToPosition((int) downMotion.getRawX() - listPosition[0], (int) downMotion.getRawY() - listPosition[1]);
if (position != AdapterView.INVALID_POSITION) { if (position != AdapterView.INVALID_POSITION) {
MessageInfoHolder msgInfoHolder = (MessageInfoHolder) mAdapter.getItem(position); MessageInfoHolder msgInfoHolder = (MessageInfoHolder) mAdapter.getItem(position);
@ -1831,10 +1852,11 @@ public class MessageList
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(account.getArchiveFolderName())) { if (!account.hasArchiveFolder()) {
menu.findItem(R.id.archive).setVisible(false); menu.findItem(R.id.archive).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(account.getSpamFolderName())) {
if (!account.hasSpamFolder()) {
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
} }
@ -2537,8 +2559,6 @@ public class MessageList
} }
}); });
} }
static class FooterViewHolder { static class FooterViewHolder {
@ -2598,6 +2618,18 @@ public class MessageList
newState = computeBatchDirection(false); newState = computeBatchDirection(false);
} }
if (v == mBatchArchiveButton) {
final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
onArchive(selection);
return;
}
if (v == mBatchMoveButton) {
final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
onMove(selection);
return;
}
synchronized (mAdapter.messages) { synchronized (mAdapter.messages) {
for (MessageInfoHolder holder : mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.messages) {
if (holder.selected) { if (holder.selected) {

40
src/com/fsck/k9/activity/MessageView.java
View File

@ -81,6 +81,18 @@ public class MessageView extends K9Activity implements OnClickListener {
*/ */
private Bundle mMessageListExtras; private Bundle mMessageListExtras;
/**
* Screen width in pixels.
*
* <p>
* Used to detect right-to-left bezel swipes.
* </p>
*
* @see #onSwipeRightToLeft(MotionEvent, MotionEvent)
*/
private int mScreenWidthInPixels;
private final class StorageListenerImplementation implements StorageManager.StorageListener { private final class StorageListenerImplementation implements StorageManager.StorageListener {
@Override @Override
public void onUnmount(String providerId) { public void onUnmount(String providerId) {
@ -381,6 +393,11 @@ public class MessageView extends K9Activity implements OnClickListener {
mNext.requestFocus(); mNext.requestFocus();
} }
mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
// Enable gesture detection for MessageViews
mGestureDetector = new GestureDetector(new MyGestureDetector(false));
setupButtonViews(); setupButtonViews();
displayMessage(mMessageReference); displayMessage(mMessageReference);
} }
@ -451,12 +468,12 @@ public class MessageView extends K9Activity implements OnClickListener {
mPrevious.setEnabled(mPreviousMessage != null); mPrevious.setEnabled(mPreviousMessage != null);
// If moving isn't support at all, then all of them must be disabled anyway. // If moving isn't support at all, then all of them must be disabled anyway.
if (mController.isMoveCapable(mAccount)) { if (mController.isMoveCapable(mAccount)) {
// Only enable the button if the Archive folder is not the current folder and not NONE. // Only enable the button if they have an archive folder and it's not the current folder.
mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) && mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
!K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())); mAccount.hasArchiveFolder());
// Only enable the button if the Spam folder is not the current folder and not NONE. // Only enable the button if the Spam folder is not the current folder and not NONE.
mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) && mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
!K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())); mAccount.hasSpamFolder());
mMove.setEnabled(true); mMove.setEnabled(true);
} else { } else {
disableMoveButtons(); disableMoveButtons();
@ -713,19 +730,24 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
/** /**
* Handle a right-to-left swipe as "move to next message." * Handle a right-to-left swipe starting at the edge of the screen as "move to next message."
*/ */
@Override @Override
protected void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) { protected void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
onNext(); if ((int) e1.getRawX() > mScreenWidthInPixels - BEZEL_SWIPE_THRESHOLD) {
onNext();
}
} }
/** /**
* Handle a left-to-right swipe as "move to previous message." * Handle a left-to-right swipe starting at the edge of the screen as
* "move to previous message."
*/ */
@Override @Override
protected void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) { protected void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
onPrevious(); if ((int) e1.getRawX() < BEZEL_SWIPE_THRESHOLD) {
onPrevious();
}
} }
protected void onNext() { protected void onNext() {
@ -880,10 +902,10 @@ public class MessageView extends K9Activity implements OnClickListener {
menu.findItem(R.id.archive).setVisible(false); menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())) { if (!mAccount.hasArchiveFolder()) {
menu.findItem(R.id.archive).setVisible(false); menu.findItem(R.id.archive).setVisible(false);
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) { if (!mAccount.hasSpamFolder()) {
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
} }
return true; return true;

4
src/com/fsck/k9/activity/setup/FolderSettings.java
View File

@ -9,6 +9,7 @@ import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.util.Log; import android.util.Log;
import com.fsck.k9.*; import com.fsck.k9.*;
import com.fsck.k9.activity.FolderInfoHolder;
import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.activity.K9PreferenceActivity;
import com.fsck.k9.mail.Folder.FolderClass; import com.fsck.k9.mail.Folder.FolderClass;
import com.fsck.k9.mail.Folder.OpenMode; import com.fsck.k9.mail.Folder.OpenMode;
@ -73,8 +74,9 @@ public class FolderSettings extends K9PreferenceActivity {
addPreferencesFromResource(R.xml.folder_settings_preferences); addPreferencesFromResource(R.xml.folder_settings_preferences);
String displayName = FolderInfoHolder.getDisplayName(this, mFolder);
Preference category = findPreference(PREFERENCE_TOP_CATERGORY); Preference category = findPreference(PREFERENCE_TOP_CATERGORY);
category.setTitle(mFolder.getName()); category.setTitle(displayName);
mInTopGroup = (CheckBoxPreference)findPreference(PREFERENCE_IN_TOP_GROUP); mInTopGroup = (CheckBoxPreference)findPreference(PREFERENCE_IN_TOP_GROUP);
mInTopGroup.setChecked(mFolder.isInTopGroup()); mInTopGroup.setChecked(mFolder.isInTopGroup());

46
src/com/fsck/k9/activity/setup/Prefs.java
View File

@ -19,6 +19,7 @@ import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.widget.Toast; import android.widget.Toast;
import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.Preferences; import com.fsck.k9.Preferences;
import com.fsck.k9.R; import com.fsck.k9.R;
@ -74,7 +75,12 @@ public class Prefs extends K9PreferenceActivity {
private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled"; private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled";
private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts"; private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts";
private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends"; private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends";
private static final String PREFERENCE_BATCH_BUTTONS_MARK_READ = "batch_buttons_mark_read";
private static final String PREFERENCE_BATCH_BUTTONS_DELETE = "batch_buttons_delete";
private static final String PREFERENCE_BATCH_BUTTONS_ARCHIVE = "batch_buttons_archive";
private static final String PREFERENCE_BATCH_BUTTONS_MOVE = "batch_buttons_move";
private static final String PREFERENCE_BATCH_BUTTONS_FLAG = "batch_buttons_flag";
private static final String PREFERENCE_BATCH_BUTTONS_UNSELECT = "batch_buttons_unselect";
private static final String PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT = "messageview_mobile_layout"; private static final String PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT = "messageview_mobile_layout";
private static final String PREFERENCE_BACKGROUND_OPS = "background_ops"; private static final String PREFERENCE_BACKGROUND_OPS = "background_ops";
@ -121,6 +127,12 @@ public class Prefs extends K9PreferenceActivity {
private com.fsck.k9.preferences.TimePickerPreference mQuietTimeEnds; private com.fsck.k9.preferences.TimePickerPreference mQuietTimeEnds;
private Preference mAttachmentPathPreference; private Preference mAttachmentPathPreference;
private CheckBoxPreference mBatchButtonsMarkRead;
private CheckBoxPreference mBatchButtonsDelete;
private CheckBoxPreference mBatchButtonsArchive;
private CheckBoxPreference mBatchButtonsMove;
private CheckBoxPreference mBatchButtonsFlag;
private CheckBoxPreference mBatchButtonsUnselect;
public static void actionPrefs(Context context) { public static void actionPrefs(Context context) {
Intent i = new Intent(context, Prefs.class); Intent i = new Intent(context, Prefs.class);
@ -342,6 +354,32 @@ public class Prefs extends K9PreferenceActivity {
} }
}; };
}); });
mBatchButtonsMarkRead = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MARK_READ);
mBatchButtonsDelete = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_DELETE);
mBatchButtonsArchive = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_ARCHIVE);
mBatchButtonsMove = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MOVE);
mBatchButtonsFlag = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_FLAG);
mBatchButtonsUnselect = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_UNSELECT);
mBatchButtonsMarkRead.setChecked(K9.batchButtonsMarkRead());
mBatchButtonsDelete.setChecked(K9.batchButtonsDelete());
mBatchButtonsArchive.setChecked(K9.batchButtonsArchive());
mBatchButtonsMove.setChecked(K9.batchButtonsMove());
mBatchButtonsFlag.setChecked(K9.batchButtonsFlag());
mBatchButtonsUnselect.setChecked(K9.batchButtonsUnselect());
// If we don't have any accounts with an archive folder, then don't enable the preference.
boolean hasArchiveFolder = false;
for (final Account acct : Preferences.getPreferences(this).getAccounts()) {
if (acct.hasArchiveFolder()) {
hasArchiveFolder = true;
break;
}
}
if (!hasArchiveFolder) {
mBatchButtonsArchive.setEnabled(false);
mBatchButtonsArchive.setSummary(R.string.global_settings_archive_disabled_reason);
}
} }
private void saveSettings() { private void saveSettings() {
@ -380,6 +418,12 @@ public class Prefs extends K9PreferenceActivity {
K9.setQuietTimeStarts(mQuietTimeStarts.getTime()); K9.setQuietTimeStarts(mQuietTimeStarts.getTime());
K9.setQuietTimeEnds(mQuietTimeEnds.getTime()); K9.setQuietTimeEnds(mQuietTimeEnds.getTime());
K9.setBatchButtonsMarkRead(mBatchButtonsMarkRead.isChecked());
K9.setBatchButtonsDelete(mBatchButtonsDelete.isChecked());
K9.setBatchButtonsArchive(mBatchButtonsArchive.isChecked());
K9.setBatchButtonsMove(mBatchButtonsMove.isChecked());
K9.setBatchButtonsFlag(mBatchButtonsFlag.isChecked());
K9.setBatchButtonsUnselect(mBatchButtonsUnselect.isChecked());
K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked()); K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked());
K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString()); K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());

278
src/com/fsck/k9/controller/MessagingController.java
View File

@ -16,12 +16,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import android.app.Application; import android.app.Application;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Process; import android.os.Process;
@ -38,6 +36,7 @@ import com.fsck.k9.SearchSpecification;
import com.fsck.k9.K9.Intents; import com.fsck.k9.K9.Intents;
import com.fsck.k9.activity.FolderList; import com.fsck.k9.activity.FolderList;
import com.fsck.k9.activity.MessageList; import com.fsck.k9.activity.MessageList;
import com.fsck.k9.helper.NotificationBuilder;
import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.Utility;
import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager;
import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
@ -136,8 +135,6 @@ public class MessagingController implements Runnable {
private Thread mThread; private Thread mThread;
private Set<MessagingListener> mListeners = new CopyOnWriteArraySet<MessagingListener>(); private Set<MessagingListener> mListeners = new CopyOnWriteArraySet<MessagingListener>();
private HashMap<SORT_TYPE, Boolean> sortAscending = new HashMap<SORT_TYPE, Boolean>();
private final ConcurrentHashMap<String, AtomicInteger> sendCount = new ConcurrentHashMap<String, AtomicInteger>(); private final ConcurrentHashMap<String, AtomicInteger> sendCount = new ConcurrentHashMap<String, AtomicInteger>();
private ConcurrentHashMap<Account, Pusher> pushers = new ConcurrentHashMap<Account, Pusher>(); private ConcurrentHashMap<Account, Pusher> pushers = new ConcurrentHashMap<Account, Pusher>();
@ -146,39 +143,6 @@ public class MessagingController implements Runnable {
private final ExecutorService threadPool = Executors.newCachedThreadPool(); private final ExecutorService threadPool = Executors.newCachedThreadPool();
public enum SORT_TYPE {
SORT_DATE(R.string.sort_earliest_first, R.string.sort_latest_first, false),
SORT_ARRIVAL(R.string.sort_earliest_first, R.string.sort_latest_first, false),
SORT_SUBJECT(R.string.sort_subject_alpha, R.string.sort_subject_re_alpha, true),
SORT_SENDER(R.string.sort_sender_alpha, R.string.sort_sender_re_alpha, true),
SORT_UNREAD(R.string.sort_unread_first, R.string.sort_unread_last, true),
SORT_FLAGGED(R.string.sort_flagged_first, R.string.sort_flagged_last, true),
SORT_ATTACHMENT(R.string.sort_attach_first, R.string.sort_unattached_first, true);
private int ascendingToast;
private int descendingToast;
private boolean defaultAscending;
SORT_TYPE(int ascending, int descending, boolean ndefaultAscending) {
ascendingToast = ascending;
descendingToast = descending;
defaultAscending = ndefaultAscending;
}
public int getToast(boolean ascending) {
if (ascending) {
return ascendingToast;
} else {
return descendingToast;
}
}
public boolean isDefaultAscending() {
return defaultAscending;
}
}
private SORT_TYPE sortType = SORT_TYPE.SORT_DATE;
private MessagingListener checkMailListener = null; private MessagingListener checkMailListener = null;
private MemorizingListener memorizingListener = new MemorizingListener(); private MemorizingListener memorizingListener = new MemorizingListener();
@ -3184,80 +3148,139 @@ public class MessagingController implements Runnable {
private void cancelNotification(int id) { private void cancelNotification(int id) {
NotificationManager notifMgr = NotificationManager notifMgr =
(NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE); (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
notifMgr.cancel(id); notifMgr.cancel(id);
} }
private void notifyWhileSendingDone(Account account) { private void notifyWhileSendingDone(Account account) {
if (account.isShowOngoing()) { if (account.isShowOngoing()) {
cancelNotification(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber()); cancelNotification(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber());
} }
} }
/**
* Display an ongoing notification while a message is being sent.
*
* @param account
* The account the message is sent from. Never {@code null}.
*/
private void notifyWhileSending(Account account) { private void notifyWhileSending(Account account) {
if (!account.isShowOngoing()) { if (!account.isShowOngoing()) {
return; return;
} }
NotificationManager notifMgr = NotificationManager notifMgr =
(NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE); (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
Notification notif = new Notification(R.drawable.ic_menu_refresh,
mApplication.getString(R.string.notification_bg_send_ticker, account.getDescription()), System.currentTimeMillis()); NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, account.getInboxFolderName()); builder.setSmallIcon(R.drawable.ic_menu_refresh);
builder.setWhen(System.currentTimeMillis());
builder.setOngoing(true);
builder.setTicker(mApplication.getString(R.string.notification_bg_send_ticker,
account.getDescription()));
builder.setContentTitle(mApplication.getString(R.string.notification_bg_send_title));
builder.setContentText(account.getDescription());
Intent intent = MessageList.actionHandleFolderIntent(mApplication, account,
account.getInboxFolderName());
PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0); PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0);
notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.notification_bg_send_title), builder.setContentIntent(pi);
account.getDescription() , pi);
notif.flags = Notification.FLAG_ONGOING_EVENT;
if (K9.NOTIFICATION_LED_WHILE_SYNCING) { if (K9.NOTIFICATION_LED_WHILE_SYNCING) {
configureNotification(notif, null, null, account.getNotificationSetting().getLedColor(), K9.NOTIFICATION_LED_BLINK_FAST, true); configureNotification(builder, null, null,
account.getNotificationSetting().getLedColor(),
K9.NOTIFICATION_LED_BLINK_FAST, true);
} }
notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(), notif); notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(),
builder.getNotification());
} }
private void notifySendTempFailed(Account account, Exception lastFailure) { private void notifySendTempFailed(Account account, Exception lastFailure) {
notifySendFailed(account, lastFailure, account.getOutboxFolderName()); notifySendFailed(account, lastFailure, account.getOutboxFolderName());
} }
private void notifySendPermFailed(Account account, Exception lastFailure) { private void notifySendPermFailed(Account account, Exception lastFailure) {
notifySendFailed(account, lastFailure, account.getDraftsFolderName()); notifySendFailed(account, lastFailure, account.getDraftsFolderName());
} }
/**
* Display a notification when sending a message has failed.
*
* @param account
* The account that was used to sent the message.
* @param lastFailure
* The {@link Exception} instance that indicated sending the message has failed.
* @param openFolder
* The name of the folder to open when the notification is clicked.
*/
private void notifySendFailed(Account account, Exception lastFailure, String openFolder) { private void notifySendFailed(Account account, Exception lastFailure, String openFolder) {
NotificationManager notifMgr = (NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager notifMgr =
Notification notif = new Notification(R.drawable.stat_notify_email_generic, mApplication.getString(R.string.send_failure_subject), System.currentTimeMillis()); (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
builder.setSmallIcon(R.drawable.stat_notify_email_generic);
builder.setWhen(System.currentTimeMillis());
builder.setAutoCancel(true);
builder.setTicker(mApplication.getString(R.string.send_failure_subject));
builder.setContentTitle(mApplication.getString(R.string.send_failure_subject));
builder.setContentText(getRootCauseMessage(lastFailure));
Intent i = FolderList.actionHandleNotification(mApplication, account, openFolder); Intent i = FolderList.actionHandleNotification(mApplication, account, openFolder);
PendingIntent pi = PendingIntent.getActivity(mApplication, 0, i, 0); PendingIntent pi = PendingIntent.getActivity(mApplication, 0, i, 0);
builder.setContentIntent(pi);
notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.send_failure_subject), getRootCauseMessage(lastFailure), pi); configureNotification(builder, null, null, K9.NOTIFICATION_LED_SENDING_FAILURE_COLOR,
K9.NOTIFICATION_LED_BLINK_FAST, true);
configureNotification(notif, null, null, K9.NOTIFICATION_LED_SENDING_FAILURE_COLOR, K9.NOTIFICATION_LED_BLINK_FAST, true); notifMgr.notify(K9.SEND_FAILED_NOTIFICATION - account.getAccountNumber(),
notif.flags |= Notification.FLAG_AUTO_CANCEL; builder.getNotification());
notifMgr.notify(K9.SEND_FAILED_NOTIFICATION - account.getAccountNumber(), notif);
} }
/**
* Display an ongoing notification while checking for new messages on the server.
*
* @param account
* The account that is checked for new messages. Never {@code null}.
* @param folder
* The folder that is being checked for new messages. Never {@code null}.
*/
private void notifyFetchingMail(final Account account, final Folder folder) { private void notifyFetchingMail(final Account account, final Folder folder) {
if (account.isShowOngoing()) { if (!account.isShowOngoing()) {
final NotificationManager notifMgr = (NotificationManager)mApplication return;
.getSystemService(Context.NOTIFICATION_SERVICE);
Notification notif = new Notification(R.drawable.ic_menu_refresh,
mApplication.getString(R.string.notification_bg_sync_ticker, account.getDescription(), folder.getName()),
System.currentTimeMillis());
Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, account.getInboxFolderName());
PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0);
notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.notification_bg_sync_title), account.getDescription()
+ mApplication.getString(R.string.notification_bg_title_separator) + folder.getName(), pi);
notif.flags = Notification.FLAG_ONGOING_EVENT;
if (K9.NOTIFICATION_LED_WHILE_SYNCING) {
configureNotification(notif, null, null, account.getNotificationSetting().getLedColor(), K9.NOTIFICATION_LED_BLINK_FAST, true);
}
notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(), notif);
} }
final NotificationManager notifMgr =
(NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
builder.setSmallIcon(R.drawable.ic_menu_refresh);
builder.setWhen(System.currentTimeMillis());
builder.setOngoing(true);
builder.setTicker(mApplication.getString(
R.string.notification_bg_sync_ticker, account.getDescription(), folder.getName()));
builder.setContentTitle(mApplication.getString(R.string.notification_bg_sync_title));
builder.setContentText(account.getDescription() +
mApplication.getString(R.string.notification_bg_title_separator) +
folder.getName());
Intent intent = MessageList.actionHandleFolderIntent(mApplication, account,
account.getInboxFolderName());
PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0);
builder.setContentIntent(pi);
if (K9.NOTIFICATION_LED_WHILE_SYNCING) {
configureNotification(builder, null, null,
account.getNotificationSetting().getLedColor(),
K9.NOTIFICATION_LED_BLINK_FAST, true);
}
notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(),
builder.getNotification());
} }
private void notifyFetchingMailCancel(final Account account) { private void notifyFetchingMailCancel(final Account account) {
if (account.isShowOngoing()) { if (account.isShowOngoing()) {
cancelNotification(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber()); cancelNotification(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber());
@ -3368,9 +3391,9 @@ public class MessagingController implements Runnable {
for (MessagingListener l : getListeners()) { for (MessagingListener l : getListeners()) {
l.synchronizeMailboxProgress(account, account.getSentFolderName(), progress, todo); l.synchronizeMailboxProgress(account, account.getSentFolderName(), progress, todo);
} }
if (K9.FOLDER_NONE.equals(account.getSentFolderName())) { if (!account.hasSentFolder()) {
if (K9.DEBUG) if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Sent folder set to " + K9.FOLDER_NONE + ", deleting sent message"); Log.i(K9.LOG_TAG, "Account does not have a sent mail folder; deleting sent message");
message.setFlag(Flag.DELETED, true); message.setFlag(Flag.DELETED, true);
} else { } else {
LocalFolder localSentFolder = (LocalFolder) localStore.getFolder(account.getSentFolderName()); LocalFolder localSentFolder = (LocalFolder) localStore.getFolder(account.getSentFolderName());
@ -3703,7 +3726,7 @@ public class MessagingController implements Runnable {
Store localStore = account.getLocalStore(); Store localStore = account.getLocalStore();
localFolder = localStore.getFolder(folder); localFolder = localStore.getFolder(folder);
Map<String, String> uidMap = null; Map<String, String> uidMap = null;
if (folder.equals(account.getTrashFolderName()) || K9.FOLDER_NONE.equals(account.getTrashFolderName())) { if (folder.equals(account.getTrashFolderName()) || !account.hasTrashFolder()) {
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Deleting messages in trash folder or trash set to -None-, not copying"); Log.d(K9.LOG_TAG, "Deleting messages in trash folder or trash set to -None-, not copying");
@ -4313,22 +4336,30 @@ public class MessagingController implements Runnable {
} }
NotificationManager notifMgr = NotificationManager notifMgr =
(NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE); (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
Notification notif = new Notification(R.drawable.stat_notify_email_generic, messageNotice, System.currentTimeMillis());
NotificationBuilder builder = NotificationBuilder.createInstance(context);
builder.setSmallIcon(R.drawable.stat_notify_email_generic);
builder.setWhen(System.currentTimeMillis());
builder.setTicker(messageNotice);
final int unreadCount = previousUnreadMessageCount + newMessageCount.get(); final int unreadCount = previousUnreadMessageCount + newMessageCount.get();
if (account.isNotificationShowsUnreadCount()) { if (account.isNotificationShowsUnreadCount()) {
notif.number = unreadCount; builder.setNumber(unreadCount);
} }
String accountDescr = (account.getDescription() != null) ?
account.getDescription() : account.getEmail();
String accountNotice = context.getString(R.string.notification_new_one_account_fmt,
unreadCount, accountDescr);
builder.setContentTitle(accountNotice);
builder.setContentText(messageNotice);
Intent i = FolderList.actionHandleNotification(context, account, message.getFolder().getRemoteName()); Intent i = FolderList.actionHandleNotification(context, account, message.getFolder().getRemoteName());
PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0); PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
builder.setContentIntent(pi);
String accountDescr = (account.getDescription() != null) ? account.getDescription() : account.getEmail(); // Only ring or vibrate if we have not done so already on this account and fetch
String accountNotice = context.getString(R.string.notification_new_one_account_fmt, unreadCount, accountDescr);
notif.setLatestEventInfo(context, accountNotice, messageNotice, pi);
// Only ring or vibrate if we have not done so already on this
// account and fetch
boolean ringAndVibrate = false; boolean ringAndVibrate = false;
if (!account.isRingNotified()) { if (!account.isRingNotified()) {
account.setRingNotified(true); account.setRingNotified(true);
@ -4337,38 +4368,36 @@ public class MessagingController implements Runnable {
NotificationSetting n = account.getNotificationSetting(); NotificationSetting n = account.getNotificationSetting();
configureNotification( configureNotification(
notif, builder,
(n.shouldRing()) ? n.getRingtone() : null, (n.shouldRing()) ? n.getRingtone() : null,
(n.shouldVibrate()) ? n.getVibration() : null, (n.shouldVibrate()) ? n.getVibration() : null,
(n.isLed()) ? Integer.valueOf(n.getLedColor()) : null, (n.isLed()) ? Integer.valueOf(n.getLedColor()) : null,
K9.NOTIFICATION_LED_BLINK_SLOW, K9.NOTIFICATION_LED_BLINK_SLOW,
ringAndVibrate); ringAndVibrate);
notifMgr.notify(account.getAccountNumber(), notif); notifMgr.notify(account.getAccountNumber(), builder.getNotification());
} }
/** /**
* @param notification * Configure the notification sound and LED
* Object to configure. Never <code>null</code>. *
* @param builder
* {@link NotificationBuilder} instance used to configure the notification.
* Never {@code null}.
* @param ringtone * @param ringtone
* String name of ringtone. <code>null</code> if no ringtone should be played * String name of ringtone. {@code null}, if no ringtone should be played.
* @param vibrationPattern * @param vibrationPattern
* <code>long[]</code> vibration pattern. <code>null</code> if no vibration should be played * {@code long[]} vibration pattern. {@code null}, if no vibration should be played.
* @param ledColor * @param ledColor
* <code>Integer</code> Color to flash LED. <code>null</code> if no LED flash should happen * Color to flash LED. {@code null}, if no LED flash should happen.
* @param ledSpeed * @param ledSpeed
* <code>int</code> should LEDs flash K9.NOTIFICATION_LED_BLINK_SLOW or K9.NOTIFICATION_LED_BLINK_FAST * Either {@link K9#NOTIFICATION_LED_BLINK_SLOW} or
* {@link K9#NOTIFICATION_LED_BLINK_FAST}.
* @param ringAndVibrate * @param ringAndVibrate
* <code>true</code> if ringtone/vibration are allowed, * {@code true}, if ringtone/vibration are allowed. {@code false}, otherwise.
* <code>false</code> otherwise.
*/ */
private void configureNotification(final Notification notification, private void configureNotification(NotificationBuilder builder, String ringtone,
final String ringtone, long[] vibrationPattern, Integer ledColor, int ledSpeed, boolean ringAndVibrate) {
final long[] vibrationPattern,
final Integer ledColor,
final int ledSpeed,
final boolean ringAndVibrate) {
// if it's quiet time, then we shouldn't be ringing, buzzing or flashing // if it's quiet time, then we shouldn't be ringing, buzzing or flashing
if (K9.isQuietTime()) { if (K9.isQuietTime()) {
@ -4376,25 +4405,27 @@ public class MessagingController implements Runnable {
} }
if (ringAndVibrate) { if (ringAndVibrate) {
if (ringtone != null) { if (ringtone != null && !TextUtils.isEmpty(ringtone)) {
notification.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone); builder.setSound(Uri.parse(ringtone));
notification.audioStreamType = AudioManager.STREAM_NOTIFICATION;
} }
if (vibrationPattern != null) { if (vibrationPattern != null) {
notification.vibrate = vibrationPattern; builder.setVibrate(vibrationPattern);
} }
} }
if (ledColor != null) { if (ledColor != null) {
notification.flags |= Notification.FLAG_SHOW_LIGHTS; int ledOnMS;
notification.ledARGB = ledColor; int ledOffMS;
if (ledSpeed == K9.NOTIFICATION_LED_BLINK_SLOW) { if (ledSpeed == K9.NOTIFICATION_LED_BLINK_SLOW) {
notification.ledOnMS = K9.NOTIFICATION_LED_ON_TIME; ledOnMS = K9.NOTIFICATION_LED_ON_TIME;
notification.ledOffMS = K9.NOTIFICATION_LED_OFF_TIME; ledOffMS = K9.NOTIFICATION_LED_OFF_TIME;
} else if (ledSpeed == K9.NOTIFICATION_LED_BLINK_FAST) { } else {
notification.ledOnMS = K9.NOTIFICATION_LED_FAST_ON_TIME; ledOnMS = K9.NOTIFICATION_LED_FAST_ON_TIME;
notification.ledOffMS = K9.NOTIFICATION_LED_FAST_OFF_TIME; ledOffMS = K9.NOTIFICATION_LED_FAST_OFF_TIME;
} }
builder.setLights(ledColor, ledOnMS, ledOffMS);
} }
} }
@ -4513,25 +4544,6 @@ public class MessagingController implements Runnable {
} }
} }
public SORT_TYPE getSortType() {
return sortType;
}
public void setSortType(SORT_TYPE sortType) {
this.sortType = sortType;
}
public boolean isSortAscending(SORT_TYPE sortType) {
Boolean sortAsc = sortAscending.get(sortType);
if (sortAsc == null) {
return sortType.isDefaultAscending();
} else return sortAsc;
}
public void setSortAscending(SORT_TYPE sortType, boolean nsortAscending) {
sortAscending.put(sortType, nsortAscending);
}
public Collection<Pusher> getPushers() { public Collection<Pusher> getPushers() {
return pushers.values(); return pushers.values();
} }

17
src/com/fsck/k9/helper/ContactItem.java Executable file
View File

@ -0,0 +1,17 @@
package com.fsck.k9.helper;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
public class ContactItem implements Serializable {
private static final long serialVersionUID = 4893328130147843375L;
public final String displayName;
public final List<String> emailAddresses;
public ContactItem(String displayName, List<String> emailAddresses) {
this.displayName = displayName;
this.emailAddresses = Collections.unmodifiableList(emailAddresses);
}
}

13
src/com/fsck/k9/helper/Contacts.java
View File

@ -2,6 +2,7 @@ package com.fsck.k9.helper;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@ -174,13 +175,15 @@ public abstract class Contacts {
public abstract Intent contactPickerIntent(); public abstract Intent contactPickerIntent();
/** /**
* Given a contact picker intent, returns the primary email address of that * Given a contact picker intent, returns a {@code ContactItem} instance for that contact.
* contact.
* *
* @param intent The {@link Intent} returned by this contact picker. * @param intent
* @return The primary email address of the picked contact. * The {@link Intent} returned by the contact picker.
*
* @return A {@link ContactItem} instance describing the picked contact. Or {@code null} if the
* contact doesn't have any email addresses.
*/ */
public abstract String getEmailFromContactPicker(final Intent intent); public abstract ContactItem extractInfoFromContactPickerIntent(final Intent intent);
/** /**
* Does the device actually have a Contacts application suitable for * Does the device actually have a Contacts application suitable for

40
src/com/fsck/k9/helper/ContactsSdk5.java
View File

@ -1,5 +1,7 @@
package com.fsck.k9.helper; package com.fsck.k9.helper;
import java.util.ArrayList;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
@ -191,23 +193,43 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
} }
@Override @Override
public String getEmailFromContactPicker(final Intent data) { public ContactItem extractInfoFromContactPickerIntent(final Intent data) {
Cursor cursor = null; Cursor cursor = null;
String email = ""; ArrayList<String> email = new ArrayList<String>();
try { try {
Uri result = data.getData(); Uri result = data.getData();
String displayName = null;
// Get the contact id from the Uri // Get the contact id from the Uri
String id = result.getLastPathSegment(); String id = result.getLastPathSegment();
cursor = mContentResolver.query(Email.CONTENT_URI,
null, Email.CONTACT_ID + "=?", new String[] { id },
null);
int emailIdx = cursor.getColumnIndex(Email.DATA); cursor = mContentResolver.query(Email.CONTENT_URI, PROJECTION,
Email.CONTACT_ID + "=?", new String[] { id }, null);
if (cursor.moveToFirst()) { if (cursor != null) {
email = cursor.getString(emailIdx); while (cursor.moveToNext()) {
String address = cursor.getString(EMAIL_INDEX);
if (address != null) {
email.add(address);
}
if (displayName == null) {
displayName = cursor.getString(NAME_INDEX);
}
}
// Return 'null' if no email addresses have been found
if (email.size() == 0) {
return null;
}
// Use the first email address found as display name
if (displayName == null) {
displayName = email.get(0);
}
return new ContactItem(displayName, email);
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(K9.LOG_TAG, "Failed to get email data", e); Log.e(K9.LOG_TAG, "Failed to get email data", e);
@ -215,7 +237,7 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
Utility.closeQuietly(cursor); Utility.closeQuietly(cursor);
} }
return email; return null;
} }
/** /**

89
src/com/fsck/k9/helper/HtmlConverter.java
View File

@ -190,6 +190,12 @@ public class HtmlConverter {
return buff.toString(); return buff.toString();
} }
private static final String HTML_BLOCKQUOTE_COLOR_TOKEN = "$$COLOR$$";
private static final String HTML_BLOCKQUOTE_START = "<blockquote class=\"gmail_quote\" " +
"style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid $$COLOR$$; padding-left: 1ex;\">";
private static final String HTML_BLOCKQUOTE_END = "</blockquote>";
private static final String HTML_NEWLINE = "<br />";
/** /**
* Convert a text string into an HTML document. * Convert a text string into an HTML document.
* *
@ -217,14 +223,19 @@ public class HtmlConverter {
} }
StringReader reader = new StringReader(text); StringReader reader = new StringReader(text);
StringBuilder buff = new StringBuilder(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH); StringBuilder buff = new StringBuilder(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH);
int c; boolean isStartOfLine = false; // Are we currently at the start of a line?
int quoteDepth = 0; // Number of DIVs deep we are.
int quotesThisLine = 0; // How deep we should be quoting for this line.
try { try {
int c;
while ((c = reader.read()) != -1) { while ((c = reader.read()) != -1) {
switch (c) { switch (c) {
case '\n': case '\n':
// pine treats <br> as two newlines, but <br/> as one newline. Use <br/> so our messages aren't // pine treats <br> as two newlines, but <br/> as one newline. Use <br/> so our messages aren't
// doublespaced. // doublespaced.
buff.append("<br />"); buff.append(HTML_NEWLINE);
isStartOfLine = true;
quotesThisLine = 0;
break; break;
case '&': case '&':
buff.append("&amp;"); buff.append("&amp;");
@ -233,11 +244,39 @@ public class HtmlConverter {
buff.append("&lt;"); buff.append("&lt;");
break; break;
case '>': case '>':
buff.append("&gt;"); if (isStartOfLine) {
quotesThisLine++;
} else {
buff.append("&gt;");
}
break; break;
case '\r': case '\r':
break; break;
case ' ':
if (isStartOfLine) {
// If we're still in the start of the line and we have spaces, don't output them, since they
// may be collapsed by our div-converting magic.
break;
}
default: default:
if (isStartOfLine) {
// Not a quote character and not a space. Content is starting now.
isStartOfLine = false;
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "currentQuoteDepth: " + quoteDepth + " quotesThisLine: " + quotesThisLine);
}
// Add/remove blockquotes by comparing this line's quotes to the previous line's quotes.
if (quotesThisLine > quoteDepth) {
for (int i = quoteDepth; i < quotesThisLine; i++) {
buff.append(HTML_BLOCKQUOTE_START.replace(HTML_BLOCKQUOTE_COLOR_TOKEN, getQuoteColor(i + 1)));
}
} else if (quotesThisLine < quoteDepth) {
for (int i = quoteDepth; i > quotesThisLine; i--) {
buff.append(HTML_BLOCKQUOTE_END);
}
}
quoteDepth = quotesThisLine;
}
buff.append((char)c); buff.append((char)c);
}//switch }//switch
} }
@ -245,8 +284,21 @@ public class HtmlConverter {
//Should never happen //Should never happen
Log.e(K9.LOG_TAG, "Could not read string to convert text to HTML:", e); Log.e(K9.LOG_TAG, "Could not read string to convert text to HTML:", e);
} }
// Close off any quotes we may have opened.
if (quoteDepth > 0) {
for (int i = quoteDepth; i > 0; i--) {
buff.append(HTML_BLOCKQUOTE_END);
}
}
text = buff.toString(); text = buff.toString();
// Make newlines at the end of blockquotes nicer by putting newlines beyond the first one outside of the
// blockquote.
text = text.replaceAll(
"\\Q" + HTML_NEWLINE + "\\E((\\Q" + HTML_NEWLINE + "\\E)+?)\\Q" + HTML_BLOCKQUOTE_END + "\\E",
HTML_BLOCKQUOTE_END + "$1"
);
// Replace lines of -,= or _ with horizontal rules // Replace lines of -,= or _ with horizontal rules
text = text.replaceAll("\\s*([-=_]{30,}+)\\s*", "<hr />"); text = text.replaceAll("\\s*([-=_]{30,}+)\\s*", "<hr />");
@ -275,6 +327,35 @@ public class HtmlConverter {
return text; return text;
} }
protected static final String QUOTE_COLOR_DEFAULT = "#ccc";
protected static final String QUOTE_COLOR_LEVEL_1 = "#729fcf";
protected static final String QUOTE_COLOR_LEVEL_2 = "#ad7fa8";
protected static final String QUOTE_COLOR_LEVEL_3 = "#8ae234";
protected static final String QUOTE_COLOR_LEVEL_4 = "#fcaf3e";
protected static final String QUOTE_COLOR_LEVEL_5 = "#e9b96e";
/**
* Return an HTML hex color string for a given quote level.
* @param level Quote level
* @return Hex color string with prepended #.
*/
protected static String getQuoteColor(final int level) {
switch(level) {
case 1:
return QUOTE_COLOR_LEVEL_1;
case 2:
return QUOTE_COLOR_LEVEL_2;
case 3:
return QUOTE_COLOR_LEVEL_3;
case 4:
return QUOTE_COLOR_LEVEL_4;
case 5:
return QUOTE_COLOR_LEVEL_5;
default:
return QUOTE_COLOR_DEFAULT;
}
}
/** /**
* Searches for link-like text in a string and turn it into a link. Append the result to * Searches for link-like text in a string and turn it into a link. Append the result to
* <tt>outputBuffer</tt>. <tt>text</tt> is not modified. * <tt>outputBuffer</tt>. <tt>text</tt> is not modified.
@ -1168,7 +1249,7 @@ public class HtmlConverter {
final String font = K9.messageViewFixedWidthFont() final String font = K9.messageViewFixedWidthFont()
? "monospace" ? "monospace"
: "sans-serif"; : "sans-serif";
return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: " + font + "\">"; return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: " + font + "; margin-top: 0px\">";
} }
private static String htmlifyMessageFooter() { private static String htmlifyMessageFooter() {

164
src/com/fsck/k9/helper/NotificationBuilder.java Normal file
View File

@ -0,0 +1,164 @@
package com.fsck.k9.helper;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.os.Vibrator;
/**
* Helper class to create system notifications
*
* @see NotificationBuilderApi1
* @see NotificationBuilderApi11
*/
public abstract class NotificationBuilder {
/**
* Create instance of an API-specific {@code NotificationBuilder} subclass.
*
* @param context
* A {@link Context} instance.
*
* @return Appropriate {@link NotificationBuilder} instance for this device.
*/
public static NotificationBuilder createInstance(Context context) {
Context appContext = context.getApplicationContext();
NotificationBuilder instance;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
instance = new NotificationBuilderApi1(appContext);
} else {
instance = new NotificationBuilderApi11(appContext);
}
return instance;
}
protected Context mContext;
/**
* Constructor
*
* @param context
* A {@link Context} instance.
*/
protected NotificationBuilder(Context context) {
mContext = context;
}
/**
* Set the small icon to use in the notification layouts.
*
* @param icon
* A resource ID in the application's package of the drawble to use.
*/
public abstract void setSmallIcon(int icon);
/**
* Set the time that the event occurred.
*
* @param when
* Timestamp of when the event occurred.
*/
public abstract void setWhen(long when);
/**
* Set the text that is displayed in the status bar when the notification first arrives.
*
* @param tickerText
* The text to display.
*/
public abstract void setTicker(CharSequence tickerText);
/**
* Set the title (first row) of the notification, in a standard notification.
*
* @param title
* The text to display as notification title.
*/
public abstract void setContentTitle(CharSequence title);
/**
* Set the text (second row) of the notification, in a standard notification.
*
* @param text
* The text to display.
*/
public abstract void setContentText(CharSequence text);
/**
* Supply a PendingIntent to send when the notification is clicked.
*
* @param intent
* The intent that will be sent when the notification was clicked.
*/
public abstract void setContentIntent(PendingIntent intent);
/**
* Set the large number at the right-hand side of the notification.
*
* @param number
* The number to display in the notification.
*/
public abstract void setNumber(int number);
/**
* Set whether this is an ongoing notification.
*
* @param ongoing
* {@code true}, if it this is an ongoing notification. {@code false}, otherwise.
*/
public abstract void setOngoing(boolean ongoing);
/**
* Setting this flag will make it so the notification is automatically canceled when the user
* clicks it in the panel.
*
* @param autoCancel
* {@code true}, if the notification should be automatically cancelled when the user
* clicks on it. {@code false}, otherwise.
*/
public abstract void setAutoCancel(boolean autoCancel);
/**
* Set the sound to play.
*
* It will play on the notification stream.
*
* @param sound
* The URI of the sound to play.
*/
public abstract void setSound(Uri sound);
/**
* Set the vibration pattern to use.
*
* @param pattern
* An array of longs of times for which to turn the vibrator on or off.
*
* @see Vibrator#vibrate(long[], int)
*/
public abstract void setVibrate(long[] pattern);
/**
* Set the color that you would like the LED on the device to blink, as well as the rate.
*
* @param argb
* The color the LED should blink.
* @param onMs
* The number of milliseconds the LED should be on.
* @param offMs
* The number of milliseconds the LED should be off.
*/
public abstract void setLights(int argb, int onMs, int offMs);
/**
* Combine all of the options that have been set and return a new {@link Notification} object.
*
* @return A new {@code Notification} object configured by this {@link NotificationBuilder}.
*/
public abstract Notification getNotification();
}

130
src/com/fsck/k9/helper/NotificationBuilderApi1.java Normal file
View File

@ -0,0 +1,130 @@
package com.fsck.k9.helper;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.Context;
import android.media.AudioManager;
import android.net.Uri;
/**
* Create notifications using the now deprecated {@link Notification} constructor.
*/
public class NotificationBuilderApi1 extends NotificationBuilder {
private int mSmallIcon;
private long mWhen;
private CharSequence mTickerText;
private CharSequence mContentText;
private CharSequence mContentTitle;
private PendingIntent mContentIntent;
private int mNumber;
private boolean mOngoing;
private boolean mAutoCancel;
private Uri mSoundUri;
private long[] mVibrationPattern;
private int mLedColor;
private int mLedOnMS;
private int mLedOffMS;
private boolean mBlinkLed;
protected NotificationBuilderApi1(Context context) {
super(context);
}
@Override
public void setSmallIcon(int icon) {
mSmallIcon = icon;
}
@Override
public void setWhen(long when) {
mWhen = when;
}
@Override
public void setTicker(CharSequence tickerText) {
mTickerText = tickerText;
}
@Override
public void setContentTitle(CharSequence title) {
mContentTitle = title;
}
@Override
public void setContentText(CharSequence text) {
mContentText = text;
}
@Override
public void setContentIntent(PendingIntent intent) {
mContentIntent = intent;
}
@Override
public void setNumber(int number) {
mNumber = number;
}
@Override
public void setOngoing(boolean ongoing) {
mOngoing = ongoing;
}
@Override
public void setAutoCancel(boolean autoCancel) {
mAutoCancel = autoCancel;
}
@Override
public void setSound(Uri sound) {
mSoundUri = sound;
}
@Override
public void setVibrate(long[] pattern) {
mVibrationPattern = pattern;
}
@Override
public void setLights(int argb, int onMs, int offMs) {
mBlinkLed = true;
mLedColor = argb;
mLedOnMS = onMs;
mLedOffMS = offMs;
}
@SuppressWarnings("deprecation")
@Override
public Notification getNotification() {
Notification notification = new Notification(mSmallIcon, mTickerText, mWhen);
notification.number = mNumber;
notification.setLatestEventInfo(mContext, mContentTitle, mContentText, mContentIntent);
if (mSoundUri != null) {
notification.sound = mSoundUri;
notification.audioStreamType = AudioManager.STREAM_NOTIFICATION;
}
if (mVibrationPattern != null) {
notification.vibrate = mVibrationPattern;
}
if (mBlinkLed) {
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
notification.ledARGB = mLedColor;
notification.ledOnMS = mLedOnMS;
notification.ledOffMS = mLedOffMS;
}
if (mAutoCancel) {
notification.flags |= Notification.FLAG_AUTO_CANCEL;
}
if (mOngoing) {
notification.flags |= Notification.FLAG_ONGOING_EVENT;
}
return notification;
}
}

86
src/com/fsck/k9/helper/NotificationBuilderApi11.java Normal file
View File

@ -0,0 +1,86 @@
package com.fsck.k9.helper;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.Context;
import android.media.AudioManager;
import android.net.Uri;
/**
* Create notifications using the new {@link android.app.Notification.Builder} class.
*/
public class NotificationBuilderApi11 extends NotificationBuilder {
private Notification.Builder mBuilder;
protected NotificationBuilderApi11(Context context) {
super(context);
mBuilder = new Notification.Builder(context);
}
@Override
public void setSmallIcon(int icon) {
mBuilder.setSmallIcon(icon);
}
@Override
public void setWhen(long when) {
mBuilder.setWhen(when);
}
@Override
public void setTicker(CharSequence tickerText) {
mBuilder.setTicker(tickerText);
}
@Override
public void setContentTitle(CharSequence title) {
mBuilder.setContentTitle(title);
}
@Override
public void setContentText(CharSequence text) {
mBuilder.setContentText(text);
}
@Override
public void setContentIntent(PendingIntent intent) {
mBuilder.setContentIntent(intent);
}
@Override
public void setNumber(int number) {
mBuilder.setNumber(number);
mBuilder.setContentInfo("" + number);
}
@Override
public void setOngoing(boolean ongoing) {
mBuilder.setOngoing(ongoing);
}
@Override
public void setAutoCancel(boolean autoCancel) {
mBuilder.setAutoCancel(autoCancel);
}
@Override
public void setSound(Uri sound) {
mBuilder.setSound(sound, AudioManager.STREAM_NOTIFICATION);
}
@Override
public void setVibrate(long[] pattern) {
mBuilder.setVibrate(pattern);
}
@Override
public void setLights(int argb, int onMs, int offMs) {
mBuilder.setLights(argb, onMs, offMs);
}
@Override
public Notification getNotification() {
return mBuilder.getNotification();
}
}

4
src/com/fsck/k9/mail/internet/MimeHeader.java
View File

@ -118,12 +118,12 @@ public class MimeHeader {
writer.flush(); writer.flush();
} }
// encode non printable characters except LF/CR codes. // encode non printable characters except LF/CR/TAB codes.
public boolean hasToBeEncoded(String text) { public boolean hasToBeEncoded(String text) {
for (int i = 0; i < text.length(); i++) { for (int i = 0; i < text.length(); i++) {
char c = text.charAt(i); char c = text.charAt(i);
if (c < 0x20 || 0x7e < c) { // non printable if (c < 0x20 || 0x7e < c) { // non printable
if (c != 0x0a && c != 0x0d) { // non LF/CR if (c != 0x0a && c != 0x0d && c != 0x09) { // non LF/CR/TAB
return true; return true;
} }
} }

21
src/com/fsck/k9/mail/internet/MimeUtility.java
View File

@ -15,6 +15,7 @@ import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -22,6 +23,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.IllegalCharsetNameException;
@ -1033,6 +1035,25 @@ public class MimeUtility {
* We've got a text part, so let's see if it needs to be processed further. * We've got a text part, so let's see if it needs to be processed further.
*/ */
String charset = getHeaderParameter(part.getContentType(), "charset"); String charset = getHeaderParameter(part.getContentType(), "charset");
/*
* determine the charset from HTML message.
*/
if (mimeType.equalsIgnoreCase("text/html") && charset == null) {
InputStreamReader in = new InputStreamReader(part.getBody().getInputStream(),
"US-ASCII");
char[] buf = new char[256];
in.read(buf, 0, buf.length);
String str = new String(buf);
if (str.length() == 0) {
return "";
}
Pattern p = Pattern.compile("<meta http-equiv=\"?Content-Type\"? content=\"text/html; charset=(.+?)\">", Pattern.CASE_INSENSITIVE);
Matcher m = p.matcher(str);
if (m.find()) {
charset = m.group(1);
}
}
charset = fixupCharset(charset, getMessageFromPart(part)); charset = fixupCharset(charset, getMessageFromPart(part));
/* /*

6
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -2341,12 +2341,6 @@ public class ImapStore extends Store {
mOut = new BufferedOutputStream(mOut, 1024); mOut = new BufferedOutputStream(mOut, 1024);
try { try {
// Yahoo! requires a custom IMAP command to work right over a non-3G network
if (mSettings.getHost().endsWith("yahoo.com")) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "Found Yahoo! account. Sending proprietary commands.");
executeSimpleCommand("ID (\"GUID\" \"1\")");
}
if (mSettings.getAuthType() == AuthType.CRAM_MD5) { if (mSettings.getAuthType() == AuthType.CRAM_MD5) {
authCramMD5(); authCramMD5();
// The authCramMD5 method called on the previous line does not allow for handling updated capabilities // The authCramMD5 method called on the previous line does not allow for handling updated capabilities

41
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -35,6 +35,7 @@ import com.fsck.k9.AccountStats;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.Preferences; import com.fsck.k9.Preferences;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.Account.MessageFormat;
import com.fsck.k9.controller.MessageRemovalListener; import com.fsck.k9.controller.MessageRemovalListener;
import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.controller.MessageRetrievalListener;
import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.Utility;
@ -1616,23 +1617,26 @@ public class LocalStore extends Store implements Serializable {
MimeBodyPart bp = new MimeBodyPart(body, "text/plain"); MimeBodyPart bp = new MimeBodyPart(body, "text/plain");
mp.addBodyPart(bp); mp.addBodyPart(bp);
} }
if (htmlContent != null) {
TextBody body = new TextBody(htmlContent);
MimeBodyPart bp = new MimeBodyPart(body, "text/html");
mp.addBodyPart(bp);
}
// If we have both text and html content and our MIME type if (mAccount.getMessageFormat() == MessageFormat.HTML) {
// isn't multipart/alternative, then corral them into a new if (htmlContent != null) {
// multipart/alternative part and put that into the parent. TextBody body = new TextBody(htmlContent);
// If it turns out that this is the only part in the parent MimeBodyPart bp = new MimeBodyPart(body, "text/html");
// MimeMultipart, it'll get fixed below before we attach to mp.addBodyPart(bp);
// the message. }
if (textContent != null && htmlContent != null && !mimeType.equalsIgnoreCase("multipart/alternative")) {
MimeMultipart alternativeParts = mp; // If we have both text and html content and our MIME type
alternativeParts.setSubType("alternative"); // isn't multipart/alternative, then corral them into a new
mp = new MimeMultipart(); // multipart/alternative part and put that into the parent.
mp.addBodyPart(new MimeBodyPart(alternativeParts)); // If it turns out that this is the only part in the parent
// MimeMultipart, it'll get fixed below before we attach to
// the message.
if (textContent != null && htmlContent != null && !mimeType.equalsIgnoreCase("multipart/alternative")) {
MimeMultipart alternativeParts = mp;
alternativeParts.setSubType("alternative");
mp = new MimeMultipart();
mp.addBodyPart(new MimeBodyPart(alternativeParts));
}
} }
} else if (mimeType != null && mimeType.equalsIgnoreCase("text/plain")) { } else if (mimeType != null && mimeType.equalsIgnoreCase("text/plain")) {
// If it's text, add only the plain part. The MIME // If it's text, add only the plain part. The MIME
@ -2816,6 +2820,8 @@ public class LocalStore extends Store implements Serializable {
text = text.replaceAll("(?m)^On .*wrote.?$", ""); text = text.replaceAll("(?m)^On .*wrote.?$", "");
// Remove a more generic quote header from the preview // Remove a more generic quote header from the preview
text = text.replaceAll("(?m)^.*\\w+:$", ""); text = text.replaceAll("(?m)^.*\\w+:$", "");
// Remove horizontal rules.
text = text.replaceAll("\\s*([-=_]{30,}+)\\s*", " ");
// URLs in the preview should just be shown as "..." - They're not // URLs in the preview should just be shown as "..." - They're not
// clickable and they usually overwhelm the preview // clickable and they usually overwhelm the preview
@ -2824,6 +2830,9 @@ public class LocalStore extends Store implements Serializable {
text = text.replaceAll("(\\r|\\n)+", " "); text = text.replaceAll("(\\r|\\n)+", " ");
// Collapse whitespace in the preview // Collapse whitespace in the preview
text = text.replaceAll("\\s+", " "); text = text.replaceAll("\\s+", " ");
// Remove any whitespace at the beginning and end of the string.
text = text.trim();
if (text.length() <= 512) { if (text.length() <= 512) {
return text; return text;
} else { } else {

5
src/com/fsck/k9/mail/store/LockableDatabase.java
View File

@ -6,6 +6,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import android.app.Application; import android.app.Application;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.util.Log; import android.util.Log;
@ -370,12 +371,12 @@ public class LockableDatabase {
try { try {
final File databaseFile = prepareStorage(mStorageProviderId); final File databaseFile = prepareStorage(mStorageProviderId);
try { try {
mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null); mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
} catch (SQLiteException e) { } catch (SQLiteException e) {
// try to gracefully handle DB corruption - see issue 2537 // try to gracefully handle DB corruption - see issue 2537
Log.w(K9.LOG_TAG, "Unable to open DB " + databaseFile + " - removing file and retrying", e); Log.w(K9.LOG_TAG, "Unable to open DB " + databaseFile + " - removing file and retrying", e);
databaseFile.delete(); databaseFile.delete();
mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null); mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
} }
if (mDb.getVersion() != mSchemaDefinition.getVersion()) { if (mDb.getVersion() != mSchemaDefinition.getVersion()) {
mSchemaDefinition.doDbUpgrade(mDb); mSchemaDefinition.doDbUpgrade(mDb);

12
src/com/fsck/k9/preferences/AccountSettings.java
View File

@ -9,6 +9,7 @@ import java.util.TreeMap;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.Account.FolderMode; import com.fsck.k9.Account.FolderMode;
@ -24,6 +25,11 @@ public class AccountSettings {
Map<String, TreeMap<Integer, SettingsDescription>> s = Map<String, TreeMap<Integer, SettingsDescription>> s =
new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>(); new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>();
/**
* When adding new settings here, be sure to increment {@link Settings.VERSION}
* and use that for whatever you add here.
*/
s.put("archiveFolderName", Settings.versions( s.put("archiveFolderName", Settings.versions(
new V(1, new StringSetting("Archive")) new V(1, new StringSetting("Archive"))
)); ));
@ -159,6 +165,12 @@ public class AccountSettings {
s.put("sentFolderName", Settings.versions( s.put("sentFolderName", Settings.versions(
new V(1, new StringSetting("Sent")) new V(1, new StringSetting("Sent"))
)); ));
s.put("sortTypeEnum", Settings.versions(
new V(9, new EnumSetting(SortType.class, Account.DEFAULT_SORT_TYPE))
));
s.put("sortAscending", Settings.versions(
new V(9, new BooleanSetting(Account.DEFAULT_SORT_ASCENDING))
));
s.put("showPicturesEnum", Settings.versions( s.put("showPicturesEnum", Settings.versions(
new V(1, new EnumSetting(Account.ShowPictures.class, Account.ShowPictures.NEVER)) new V(1, new EnumSetting(Account.ShowPictures.class, Account.ShowPictures.NEVER))
)); ));

5
src/com/fsck/k9/preferences/FolderSettings.java
View File

@ -20,6 +20,11 @@ public class FolderSettings {
Map<String, TreeMap<Integer, SettingsDescription>> s = Map<String, TreeMap<Integer, SettingsDescription>> s =
new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>(); new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>();
/**
* When adding new settings here, be sure to increment {@link Settings.VERSION}
* and use that for whatever you add here.
*/
s.put("displayMode", Settings.versions( s.put("displayMode", Settings.versions(
new V(1, new EnumSetting(FolderClass.class, FolderClass.NO_CLASS)) new V(1, new EnumSetting(FolderClass.class, FolderClass.NO_CLASS))
)); ));

23
src/com/fsck/k9/preferences/GlobalSettings.java
View File

@ -26,6 +26,11 @@ public class GlobalSettings {
Map<String, TreeMap<Integer, SettingsDescription>> s = Map<String, TreeMap<Integer, SettingsDescription>> s =
new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>(); new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>();
/**
* When adding new settings here, be sure to increment {@link Settings.VERSION}
* and use that for whatever you add here.
*/
s.put("animations", Settings.versions( s.put("animations", Settings.versions(
new V(1, new BooleanSetting(false)) new V(1, new BooleanSetting(false))
)); ));
@ -196,6 +201,24 @@ public class GlobalSettings {
new V(1, new BooleanSetting(false)), new V(1, new BooleanSetting(false)),
new V(4, new BooleanSetting(true)) new V(4, new BooleanSetting(true))
)); ));
s.put("batchButtonsMarkRead", Settings.versions(
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsDelete", Settings.versions(
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsArchive", Settings.versions(
new V(8, new BooleanSetting(false))
));
s.put("batchButtonsMove", Settings.versions(
new V(8, new BooleanSetting(false))
));
s.put("batchButtonsFlag", Settings.versions(
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsUnselect", Settings.versions(
new V(8, new BooleanSetting(true))
));
SETTINGS = Collections.unmodifiableMap(s); SETTINGS = Collections.unmodifiableMap(s);

5
src/com/fsck/k9/preferences/IdentitySettings.java
View File

@ -22,6 +22,11 @@ public class IdentitySettings {
Map<String, TreeMap<Integer, SettingsDescription>> s = Map<String, TreeMap<Integer, SettingsDescription>> s =
new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>(); new LinkedHashMap<String, TreeMap<Integer, SettingsDescription>>();
/**
* When adding new settings here, be sure to increment {@link Settings.VERSION}
* and use that for whatever you add here.
*/
s.put("signature", Settings.versions( s.put("signature", Settings.versions(
new V(1, new SignatureSetting()) new V(1, new SignatureSetting())
)); ));

2
src/com/fsck/k9/preferences/Settings.java
View File

@ -35,7 +35,7 @@ public class Settings {
* *
* @see SettingsExporter * @see SettingsExporter
*/ */
public static final int VERSION = 7; public static final int VERSION = 9;
public static Map<String, Object> validate(int version, Map<String, public static Map<String, Object> validate(int version, Map<String,
TreeMap<Integer, SettingsDescription>> settings, TreeMap<Integer, SettingsDescription>> settings,

7
src/com/fsck/k9/preferences/SettingsImporter.java
View File

@ -353,7 +353,7 @@ public class SettingsImporter {
} }
// Make sure the account name is unique // Make sure the account name is unique
String accountName = (account.name != null) ? account.name : "Imported"; String accountName = account.name;
if (isAccountNameUsed(accountName, accounts)) { if (isAccountNameUsed(accountName, accounts)) {
// Account name is already in use. So generate a new one by appending " (x)", where x // Account name is already in use. So generate a new one by appending " (x)", where x
// is the first number >= 1 that results in an unused account name. // is the first number >= 1 that results in an unused account name.
@ -943,6 +943,11 @@ public class SettingsImporter {
Log.i(K9.LOG_TAG, "Skipping account with UUID " + uuid); Log.i(K9.LOG_TAG, "Skipping account with UUID " + uuid);
} }
// If we couldn't find an account name use the UUID
if (account.name == null) {
account.name = uuid;
}
return account; return account;
} }

8
src/com/fsck/k9/view/MessageWebView.java
View File

@ -98,7 +98,13 @@ public class MessageWebView extends WebView {
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS); webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
} }
if (Integer.parseInt(Build.VERSION.SDK) >= 9 ) { /*
* Build.VERSION.SDK is deprecated cause it just returns the
* "its raw String representation"
* http://developer.android.com/reference/android/os/Build.VERSION_CODES.html#GINGERBREAD
* http://developer.android.com/reference/android/os/Build.VERSION.html#SDK
*/
if (Build.VERSION.SDK_INT >= 9) {
setOverScrollMode(OVER_SCROLL_NEVER); setOverScrollMode(OVER_SCROLL_NEVER);
} }

2
tests/project.properties
View File

@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-10 target=android-15

86
tests/src/com/fsck/k9/helper/HtmlConverterTest.java Normal file
View File

@ -0,0 +1,86 @@
package com.fsck.k9.helper;
import junit.framework.TestCase;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
public class HtmlConverterTest extends TestCase {
// Useful if you want to write stuff to a file for debugging in a browser.
private static final boolean WRITE_TO_FILE = Boolean.parseBoolean(System.getProperty("k9.htmlConverterTest.writeToFile", "false"));
private static final String OUTPUT_FILE = "C:/temp/parse.html";
public void testTextQuoteToHtmlBlockquote() {
String message = "Panama!\n" +
"\n" +
"Bob Barker <bob@aol.com> wrote:\n" +
"> a canal\n" +
">\n" +
"> Dorothy Jo Gideon <dorothy@aol.com> espoused:\n" +
"> >A man, a plan...\n" +
"> Too easy!\n" +
"\n" +
"Nice job :)\n" +
">> Guess!";
String result = HtmlConverter.textToHtml(message, false);
writeToFile(result);
assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">Panama!<br /><br />Bob Barker &lt;bob@aol.com&gt; wrote:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">a canal<br /><br />Dorothy Jo Gideon &lt;dorothy@aol.com&gt; espoused:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">A man, a plan...<br /></blockquote>Too easy!</blockquote><br />Nice job :)<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\"><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">Guess!</blockquote></blockquote></pre>", result);
}
public void testTextQuoteToHtmlBlockquoteIndented() {
String message = "*facepalm*\n" +
"\n" +
"Bob Barker <bob@aol.com> wrote:\n" +
"> A wise man once said...\n" +
">\n" +
"> LOL F1RST!!!!!\n" +
">\n" +
"> :)";
String result = HtmlConverter.textToHtml(message, false);
writeToFile(result);
assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">*facepalm*<br /><br />Bob Barker &lt;bob@aol.com&gt; wrote:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">A wise man once said...<br /><br />LOL F1RST!!!!!<br /><br />:)</blockquote></pre>", result);
}
public void testQuoteDepthColor() {
assertEquals(HtmlConverter.getQuoteColor(1), HtmlConverter.QUOTE_COLOR_LEVEL_1);
assertEquals(HtmlConverter.getQuoteColor(2), HtmlConverter.QUOTE_COLOR_LEVEL_2);
assertEquals(HtmlConverter.getQuoteColor(3), HtmlConverter.QUOTE_COLOR_LEVEL_3);
assertEquals(HtmlConverter.getQuoteColor(4), HtmlConverter.QUOTE_COLOR_LEVEL_4);
assertEquals(HtmlConverter.getQuoteColor(5), HtmlConverter.QUOTE_COLOR_LEVEL_5);
assertEquals(HtmlConverter.getQuoteColor(-1), HtmlConverter.QUOTE_COLOR_DEFAULT);
assertEquals(HtmlConverter.getQuoteColor(0), HtmlConverter.QUOTE_COLOR_DEFAULT);
assertEquals(HtmlConverter.getQuoteColor(6), HtmlConverter.QUOTE_COLOR_DEFAULT);
String message = "zero\n" +
"> one\n" +
">> two\n" +
">>> three\n" +
">>>> four\n" +
">>>>> five\n" +
">>>>>> six";
String result = HtmlConverter.textToHtml(message, false);
writeToFile(result);
assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">zero<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">one<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">two<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #8ae234; padding-left: 1ex;\">three<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #fcaf3e; padding-left: 1ex;\">four<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #e9b96e; padding-left: 1ex;\">five<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ccc; padding-left: 1ex;\">six</blockquote></blockquote></blockquote></blockquote></blockquote></blockquote></pre>", result);
}
private void writeToFile(final String content) {
if (!WRITE_TO_FILE) {
return;
}
try {
System.err.println(content);
File f = new File(OUTPUT_FILE);
f.delete();
FileWriter fstream = new FileWriter(OUTPUT_FILE);
BufferedWriter out = new BufferedWriter(fstream);
out.write(content);
out.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}