moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 09:08:49 -05:00
Code Issues Releases Wiki Activity

Merge branch 'refs/heads/master' of git@github.com:k9mail/k-9.git

Browse Source
This commit is contained in:
Marcus Wolschon 2011-06-14 15:23:20 +02:00
commit 5eec09d37a
30 changed files with 817 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
local.properties local.properties
bin bin
gen gen
.settings

10
AndroidManifest.xml
View File

@ -26,6 +26,10 @@
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- In order to properly manage the BACK key, we do some check on the running tasks -->
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" /> <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
<permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"
@ -77,6 +81,9 @@
android:name="com.fsck.k9.activity.setup.Prefs" android:name="com.fsck.k9.activity.setup.Prefs"
android:label="@string/prefs_title" android:label="@string/prefs_title"
android:configChanges="locale" android:configChanges="locale"
android:taskAffinity="com.fsck.k9.activity.setup.Prefs"
android:launchMode="singleTask"
android:excludeFromRecents="true"
> >
</activity> </activity>
<activity <activity
@ -132,6 +139,7 @@
android:theme="@style/Theme.K9Dialog" android:theme="@style/Theme.K9Dialog"
android:label="@string/choose_folder_title" android:label="@string/choose_folder_title"
android:configChanges="locale" android:configChanges="locale"
android:noHistory="true"
> >
</activity> </activity>
<activity <activity
@ -193,7 +201,7 @@
</activity> </activity>
<activity <activity
android:name="com.fsck.k9.activity.MessageList" android:name="com.fsck.k9.activity.MessageList"
android:launchMode="singleTask" android:launchMode="singleInstance"
android:configChanges="locale" android:configChanges="locale"
> >
</activity> </activity>

9
build.xml
View File

@ -102,7 +102,7 @@
<echo>Creating library ${rclib} for remote control <echo>Creating library ${rclib} for remote control
applications</echo> applications</echo>
<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" /> <jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
</target> </target>
<target name="upload" depends="clean,get-version,release"> <target name="upload" depends="clean,get-version,release">
@ -159,6 +159,7 @@
<echo> bump-version: ant -Dversion-name=3.123</echo> <echo> bump-version: ant -Dversion-name=3.123</echo>
<echo> Bumps the project version to 3.123,tags and commits it</echo> <echo> Bumps the project version to 3.123,tags and commits it</echo>
<echo> astyle: Make K-9's source look like it's supposed to</echo> <echo> astyle: Make K-9's source look like it's supposed to</echo>
<echo> eclipse: Apply template Eclipse settings</echo>
</target> </target>
@ -182,4 +183,10 @@
--> -->
<setup /> <setup />
<target name="eclipse" description="Apply template Eclipse settings">
<copy todir=".settings">
<fileset dir="tools/eclipse-settings"/>
</copy>
</target>
</project> </project>

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

@ -6,9 +6,7 @@
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcions de Copyright 2006-<xliff:g>%s</xliff:g> Projecte de codi obert d\'Android.</string> <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcions de Copyright 2006-<xliff:g>%s</xliff:g> Projecte de codi obert d\'Android.</string>
<string name="app_license">Llicenciat sota Llicència Apache, Versió 2.0.</string> <string name="app_license">Llicenciat sota Llicència Apache, Versió 2.0.</string>
<string name="app_authors_fmt">Autors: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autors: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Informació de la revisió: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Informació de la revisió: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Fem servir les següents biblioteques de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Fem servir les següents biblioteques de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Icones Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Icones Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1026,7 +1024,21 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="dialog_confirm_delete_cancel_button">No esborris</string> <string name="dialog_confirm_delete_cancel_button">No esborris</string>
<string name="dialog_confirm_spam_title">Confirma moure\'l carpeta brossa</string> <string name="dialog_confirm_spam_title">Confirma moure\'l carpeta brossa</string>
<string name="dialog_confirm_spam_message">Realment vols moure aquest missatge a la carpeta brossa?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Realment vols moure aquest missatge a la carpeta brossa?</item>
<item quantity="other">Realment vols moure aquest missatge a la carpeta brossa?</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>
<string name="dialog_confirm_spam_confirm_button">Sí</string> <string name="dialog_confirm_spam_confirm_button">Sí</string>
<string name="dialog_confirm_spam_cancel_button">No</string> <string name="dialog_confirm_spam_cancel_button">No</string>

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

@ -11,9 +11,7 @@
<!-- 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_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>--> <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
<string name="app_authors_fmt">Autoři: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autoři: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>--> <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <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>--> <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
@ -1033,7 +1031,20 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="dialog_confirm_delete_cancel_button">Nemazat</string> <string name="dialog_confirm_delete_cancel_button">Nemazat</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<!-- 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_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">Lizensiert unter der Apache License, Version 2.0.</string> <string name="app_license">Lizensiert unter der Apache License, Version 2.0.</string>
<string name="app_authors_fmt">Autoren: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autoren: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Versionsinformationen: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Versionsinformationen: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Wir benutzen die folgenden externen Bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Wir benutzen die folgenden externen Bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji Bilder: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji Bilder: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1023,7 +1021,21 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="dialog_confirm_delete_cancel_button">Nicht löschen</string> <string name="dialog_confirm_delete_cancel_button">Nicht löschen</string>
<string name="dialog_confirm_spam_title">Als Spam markieren</string> <string name="dialog_confirm_spam_title">Als Spam markieren</string>
<string name="dialog_confirm_spam_message">Wollen Sie diese Nachricht in den Spam-Ordner verschieben?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Wollen Sie diese Nachricht in den Spam-Ordner verschieben?</item>
<item quantity="other">Wollen Sie diese Nachricht in den Spam-Ordner verschieben?</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>
<string name="dialog_confirm_spam_confirm_button">Ja</string> <string name="dialog_confirm_spam_confirm_button">Ja</string>
<string name="dialog_confirm_spam_cancel_button">Nein</string> <string name="dialog_confirm_spam_cancel_button">Nein</string>

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

@ -6,9 +6,7 @@
<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_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_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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</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>
<string name="app_emoji_icons">Iconos de Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Iconos de Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1023,7 +1021,20 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<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>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<string name="app_copyright_fmt">Tekijänoikeudet 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions tekijänoikeudet -<xliff:g>%s</xliff:g> Androidin avoimen lähdekoodin hanke.</string> <string name="app_copyright_fmt">Tekijänoikeudet 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions tekijänoikeudet -<xliff:g>%s</xliff:g> Androidin avoimen lähdekoodin hanke.</string>
<string name="app_license">Lisensoitu Apache-lisenssillä, versio 2.0.</string> <string name="app_license">Lisensoitu Apache-lisenssillä, versio 2.0.</string>
<string name="app_authors_fmt">Tekijät: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Tekijät: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Versiotiedot: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Versiotiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Me käytämme seuraavia kolmannen osapuolen kirjastoja: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Me käytämme seuraavia kolmannen osapuolen kirjastoja: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji-kuvakkeet: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji-kuvakkeet: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1020,7 +1018,20 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="dialog_confirm_delete_cancel_button">Älä poista</string> <string name="dialog_confirm_delete_cancel_button">Älä poista</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

4
res/values-fr-rCA/strings.xml
View File

@ -42,9 +42,9 @@
<string name="batch_spam_op">Déplacer vers Pourriels</string> <string name="batch_spam_op">Déplacer vers Pourriels</string>
<string name="account_setup_push_limit_label">Maximum de dossiers poussés à vérifier</string> <string name="account_setup_push_limit_label">Maximum de dossiers poussés à vérifier</string>
<string name="error_contact_address_not_found">Aucune adresse courriel trouvée</string> <string name="error_contact_address_not_found">Aucune adresse courriel trouvée</string>
<string name="global_settings_show_correspondent_names_summary">Affiche le nom des correspondants plutôt que leurs adresses courriel</string> <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses courriel</string>
<plurals name="dialog_confirm_spam_message"> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Voulez-vous déplacer ce message vers le dossiers à pourriels\u00A0?</item> <item quantity="one">Voulez-vous déplacer ce message vers le dossiers à pourriels\u00A0?</item>
<item quantity="other">Voulez-vous déplacer %1$d messages vers le dossiers à pourriels\u00A0?</item> <item quantity="other">Voulez-vous déplacer <xliff:g id="message_count">%1$d</xliff:g> messages vers le dossiers à pourriels\u00A0?</item>
</plurals> </plurals>
</resources> </resources>

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

@ -29,9 +29,7 @@
<string name="app_authors">Google, Les K-9 Dog Walkers.</string> <string name="app_authors">Google, Les K-9 Dog Walkers.</string>
<string name="app_authors_fmt">Auteurs\u00A0: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Auteurs\u00A0: <xliff:g id="app_authors">%s</xliff:g></string>
<!-- can license text be localized? app_copyright_fmt/app_license --> <!-- can license text be localized? app_copyright_fmt/app_license -->
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Information de révision\u00A0: %s</string> <string name="app_revision_fmt">Information de révision\u00A0: %s</string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Tierces librairies utilisées\u00A0: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Tierces librairies utilisées\u00A0: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Icônes Emoji\u00A0: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Icônes Emoji\u00A0: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -304,10 +302,10 @@
<string name="global_settings_touchable_summary">Fournit plus d\'espace dans les éléments des listes</string> <string name="global_settings_touchable_summary">Fournit plus d\'espace dans les éléments des listes</string>
<string name="global_settings_preview_lines_label">Lignes dʼaperçu</string> <string name="global_settings_preview_lines_label">Lignes dʼaperçu</string>
<string name="global_settings_show_correspondent_names_label">Afficher le nom des correspondants</string> <string name="global_settings_show_correspondent_names_label">Afficher le nom des correspondants</string>
<string name="global_settings_show_correspondent_names_summary">Affiche le nom des correspondants plutôt que leurs adresses e-mail</string> <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses e-mail</string>
<string name="global_settings_show_contact_name_label">Afficher les noms des contacts connus</string> <string name="global_settings_show_contact_name_label">Utiliser les noms du carnet d\'adresses</string>
<string name="global_settings_show_contact_name_summary">Utiliser les noms du carnet d\'adresses</string> <string name="global_settings_show_contact_name_summary">Utiliser en priorité les noms du carnet d\'adresses</string>
<string name="global_settings_registered_name_color_label">Couleur des contacts connus</string> <string name="global_settings_registered_name_color_label">Couleur des contacts connus</string>
<string name="global_settings_registered_name_color_default">Ne pas mettre en évidence les contacts connus</string> <string name="global_settings_registered_name_color_default">Ne pas mettre en évidence les contacts connus</string>
<string name="global_settings_registered_name_color_changed">Mettre en évidence (couleur) les contacts connus</string> <string name="global_settings_registered_name_color_changed">Mettre en évidence (couleur) les contacts connus</string>
@ -315,7 +313,7 @@
<string name="global_settings_messageview_fixedwidth_label">Polices à taille fixe</string> <string name="global_settings_messageview_fixedwidth_label">Polices à taille fixe</string>
<string name="global_settings_messageview_fixedwidth_summary">Utiliser une police à taille fixe pour les messages en texte brut</string> <string name="global_settings_messageview_fixedwidth_summary">Utiliser une police à taille fixe pour les messages en texte brut</string>
<string name="global_settings_messageview_return_to_list_label">Retour à la liste après suppression</string> <string name="global_settings_messageview_return_to_list_label">Retour à la liste après suppression</string>
<string name="global_settings_messageview_return_to_list_summary">Retourne à la liste de messages après la suppression d\'un message</string> <string name="global_settings_messageview_return_to_list_summary">Retourner à la liste de messages après la suppression d\'un message</string>
<string name="global_settings_confirm_actions_title">Confirmer les actions</string> <string name="global_settings_confirm_actions_title">Confirmer les actions</string>
<string name="global_settings_confirm_actions_summary">Demander une confirmation pour chacune des actions sélectionnées</string> <string name="global_settings_confirm_actions_summary">Demander une confirmation pour chacune des actions sélectionnées</string>
@ -498,7 +496,7 @@
<string name="account_settings_notification_opens_unread_label">Ouvrir message non lu via notification</string> <string name="account_settings_notification_opens_unread_label">Ouvrir message non lu via notification</string>
<string name="account_settings_notification_opens_unread_summary">Recherche des messages non lus après un accès à partir des notifications</string> <string name="account_settings_notification_opens_unread_summary">Recherche des messages non lus après un accès à partir des notifications</string>
<string name="account_settings_notification_unread_count_label">Afficher le nombre de messages non lus</string> <string name="account_settings_notification_unread_count_label">Afficher le nombre de messages non lus</string>
<string name="account_settings_notification_unread_count_summary">Affiche le nombre de messages non lus dans la barre de notification</string> <string name="account_settings_notification_unread_count_summary">Afficher le nombre de messages non lus dans la barre de notification</string>
<string name="account_settings_hide_buttons_label">Défiler les boutons de navigation</string> <string name="account_settings_hide_buttons_label">Défiler les boutons de navigation</string>
<string name="account_settings_hide_buttons_never">Jamais</string> <string name="account_settings_hide_buttons_never">Jamais</string>
@ -517,10 +515,10 @@
<string name="account_settings_composition">Composition de messages</string> <string name="account_settings_composition">Composition de messages</string>
<string name="account_settings_default_quoted_text_shown_label">Citer le message original</string> <string name="account_settings_default_quoted_text_shown_label">Citer le message original</string>
<string name="account_settings_default_quoted_text_shown_summary">Le contenu du message d\'origine sera inclu dans votre réponse</string> <string name="account_settings_default_quoted_text_shown_summary">Inclure le message d\'origine dans la réponse</string>
<string name="account_settings_reply_after_quote_label">Réponse après la citation</string> <string name="account_settings_reply_after_quote_label">Réponse après la citation</string>
<string name="account_settings_reply_after_quote_summary">Lors d\'une réponse, le texte d\'origine précèdera votre réponse</string> <string name="account_settings_reply_after_quote_summary">Faire précéder la réponse par le texte d\'origine</string>
<string name="account_settings_message_format_label">Format du message</string> <string name="account_settings_message_format_label">Format du message</string>
<string name="account_settings_message_format_html">HTML (formattage et images conservés)</string> <string name="account_settings_message_format_html">HTML (formattage et images conservés)</string>
@ -816,7 +814,7 @@
<string name="gestures_summary">Accepter le contrôle par gestuelle</string> <string name="gestures_summary">Accepter le contrôle par gestuelle</string>
<string name="compact_layouts_title">Agencement compact</string> <string name="compact_layouts_title">Agencement compact</string>
<string name="compact_layouts_summary">Modifie l\'agencement pour afficher plus d\'éléments par page</string> <string name="compact_layouts_summary">Modifier l\'agencement pour afficher plus d\'éléments par page</string>
<string name="volume_navigation_title">Navigation à l\'aide du volume</string> <string name="volume_navigation_title">Navigation à l\'aide du volume</string>
<string name="volume_navigation_summary">Passer d\'un élément à l\'autre grâce aux touches de volume</string> <string name="volume_navigation_summary">Passer d\'un élément à l\'autre grâce aux touches de volume</string>
@ -833,7 +831,7 @@
<string name="count_search_summary">Désactiver pour un affichage plus rapide</string> <string name="count_search_summary">Désactiver pour un affichage plus rapide</string>
<string name="hide_special_accounts_title">Cacher les comptes spéciaux</string> <string name="hide_special_accounts_title">Cacher les comptes spéciaux</string>
<string name="hide_special_accounts_summary">Cache «\u00A0Boîte de messagerie unifiée\u00A0» et «\u00A0Tous les messages\u00A0»</string> <string name="hide_special_accounts_summary">Cacher «\u00A0Boîte de messagerie unifiée\u00A0» et «\u00A0Tous les messages\u00A0»</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"> - Avec étoile</string> <string name="flagged_modifier"> - Avec étoile</string>
@ -901,7 +899,7 @@
<string name="btn_verify">Vérifier</string> <string name="btn_verify">Vérifier</string>
<string name="unknown_crypto_signature_user_id">«\u00A0inconnu\u00A0»</string> <string name="unknown_crypto_signature_user_id">«\u00A0inconnu\u00A0»</string>
<string name="key_id">id\u00A0: %s</string> <string name="key_id">id\u00A0: %s</string>
<string name="insufficient_apg_permissions">K-9 n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 pour corriger cela.</string> <string name="insufficient_apg_permissions">K-9 Mail n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 Mail pour corriger cela.</string>
<string name="pgp_mime_unsupported">Les messages PGP/MIME ne sont pas encore supportés</string> <string name="pgp_mime_unsupported">Les messages PGP/MIME ne sont pas encore supportés</string>
<string name="attachment_encryption_unsupported">Attention\u00A0: La signature et le chiffrement des pièces jointes ne sont pas encore supportés.</string> <string name="attachment_encryption_unsupported">Attention\u00A0: La signature et le chiffrement des pièces jointes ne sont pas encore supportés.</string>
<string name="send_aborted">Envoi annulé.</string> <string name="send_aborted">Envoi annulé.</string>
@ -920,7 +918,18 @@
<string name="dialog_confirm_spam_title">Confirmer le déplacement</string> <string name="dialog_confirm_spam_title">Confirmer le déplacement</string>
<plurals name="dialog_confirm_spam_message"> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Voulez-vous déplacer ce message vers le dossiers à spams\u00A0?</item> <item quantity="one">Voulez-vous déplacer ce message vers le dossiers à spams\u00A0?</item>
<item quantity="other">Voulez-vous déplacer %1$d messages vers le dossiers à spams\u00A0?</item> <item quantity="other">Voulez-vous déplacer <xliff:g id="message_count">%1$d</xliff:g> messages vers le dossiers à spams\u00A0?</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">Déplacer</string> <string name="dialog_confirm_spam_confirm_button">Déplacer</string>
<string name="dialog_confirm_spam_cancel_button">Ne pas déplacer</string> <string name="dialog_confirm_spam_cancel_button">Ne pas déplacer</string>

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

@ -6,9 +6,7 @@
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcións 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. Porcións Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Licienciado baixo a Licencia Apache, Version 2.0.</string> <string name="app_license">Licienciado baixo a Licencia Apache, Version 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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Información da revisión: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Información da revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Usamos as seguintes librerías de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Usamos as seguintes librerías de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Iconos Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Iconos Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1023,7 +1021,21 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="dialog_confirm_delete_cancel_button">Non borrar</string> <string name="dialog_confirm_delete_cancel_button">Non borrar</string>
<string name="dialog_confirm_spam_title">Confirmar antes de mover á carpeta spam</string> <string name="dialog_confirm_spam_title">Confirmar antes de mover á carpeta spam</string>
<string name="dialog_confirm_spam_message">Queres mover esta mensaxe á carpeta spam?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Queres mover esta mensaxe á carpeta spam?</item>
<item quantity="other">Queres mover esta mensaxe á carpeta spam?</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>
<string name="dialog_confirm_spam_confirm_button">Si</string> <string name="dialog_confirm_spam_confirm_button">Si</string>
<string name="dialog_confirm_spam_cancel_button">Non</string> <string name="dialog_confirm_spam_cancel_button">Non</string>

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

@ -6,9 +6,7 @@
<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">Rilasciato sotto Licenza Apache, Versione 2.0.</string> <string name="app_license">Rilasciato sotto Licenza Apache, Versione 2.0.</string>
<string name="app_authors_fmt">Autori: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Autori: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Informazioni: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Informazioni: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Ci avvaliamo delle seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Ci avvaliamo delle seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Icone emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Icone emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1027,7 +1025,20 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="dialog_confirm_delete_cancel_button">Non eliminare</string> <string name="dialog_confirm_delete_cancel_button">Non eliminare</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<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_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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</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>
@ -1019,7 +1017,21 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="dialog_confirm_delete_cancel_button">削除しない</string> <string name="dialog_confirm_delete_cancel_button">削除しない</string>
<string name="dialog_confirm_spam_title">迷惑メールフォルダへの移動の確認</string> <string name="dialog_confirm_spam_title">迷惑メールフォルダへの移動の確認</string>
<string name="dialog_confirm_spam_message">本当にこのメッセージを迷惑メールフォルダに移動しますか？</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">本当にこのメッセージを迷惑メールフォルダに移動しますか？</item>
<item quantity="other">本当にこのメッセージを迷惑メールフォルダに移動しますか？</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>
<string name="dialog_confirm_spam_confirm_button">はい</string> <string name="dialog_confirm_spam_confirm_button">はい</string>
<string name="dialog_confirm_spam_cancel_button">いいえ</string> <string name="dialog_confirm_spam_cancel_button">いいえ</string>

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

@ -3,9 +3,7 @@
<string name="app_name">K-9 메일</string> <string name="app_name">K-9 메일</string>
<string name="beta_app_name">K-9 메일 베타</string> <string name="beta_app_name">K-9 메일 베타</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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">K-9 메일은 아래의 서드파티 라이브러리를 이용합니다 : <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">K-9 메일은 아래의 서드파티 라이브러리를 이용합니다 : <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji 아이콘: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji 아이콘: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1023,7 +1021,21 @@ K-9 메일 설치를 환영합니다. K-9은 안드로이드용 오픈소스
<string name="dialog_confirm_delete_cancel_button">삭제하지 않음</string> <string name="dialog_confirm_delete_cancel_button">삭제하지 않음</string>
<string name="dialog_confirm_spam_title">스팸폴더로 이동 확인</string> <string name="dialog_confirm_spam_title">스팸폴더로 이동 확인</string>
<string name="dialog_confirm_spam_message">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</item>
<item quantity="other">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</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>
<string name="dialog_confirm_spam_confirm_button">예</string> <string name="dialog_confirm_spam_confirm_button">예</string>
<string name="dialog_confirm_spam_cancel_button">아니오</string> <string name="dialog_confirm_spam_cancel_button">아니오</string>

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

@ -6,9 +6,7 @@
<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_authors_fmt">Auteurs: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Auteurs: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Revisie Informatie: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Revisie Informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">De volgende externe bibliotheken worden gebruikt: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">De volgende externe bibliotheken worden gebruikt: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1023,7 +1021,21 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="dialog_confirm_delete_cancel_button">Niet verwijderen</string> <string name="dialog_confirm_delete_cancel_button">Niet verwijderen</string>
<string name="dialog_confirm_spam_title">Bevestig verplaatsing naar spam map</string> <string name="dialog_confirm_spam_title">Bevestig verplaatsing naar spam map</string>
<string name="dialog_confirm_spam_message">Wil je dit bericht echt verplaatsen naar de spam map?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Wil je dit bericht echt verplaatsen naar de spam map?</item>
<item quantity="other">Wil je dit bericht echt verplaatsen naar de spam map?</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>
<string name="dialog_confirm_spam_confirm_button">Ja</string> <string name="dialog_confirm_spam_confirm_button">Ja</string>
<string name="dialog_confirm_spam_cancel_button">Nee</string> <string name="dialog_confirm_spam_cancel_button">Nee</string>

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

@ -19,9 +19,7 @@
<!-- 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_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>--> <!-- 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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>--> <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <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>--> <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
@ -1035,7 +1033,21 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="dialog_confirm_delete_cancel_button">Nie usuwaj</string> <string name="dialog_confirm_delete_cancel_button">Nie usuwaj</string>
<string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string> <string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string>
<string name="dialog_confirm_spam_message">Na pewno przenieśc do spamu?</string> <plurals name="dialog_confirm_spam_message">
<item quantity="one">Na pewno przenieśc do spamu?</item>
<item quantity="other">Na pewno przenieśc 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>
<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>

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

@ -6,9 +6,7 @@
<!-- 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_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>--> <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Revisões e informações: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Revisões e informações: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>--> <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <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>--> <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
@ -1020,7 +1018,20 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="dialog_confirm_delete_cancel_button">Não excluir</string> <string name="dialog_confirm_delete_cancel_button">Não excluir</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<!-- 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_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>--> <!-- NEW: <string name="app_license">Licensed under the 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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>--> <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <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>--> <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
@ -1017,7 +1015,20 @@
<!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>--> <!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>-->
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Vissa delar Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string> <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Vissa delar Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Licensierat under Apache-licensen, version 2.0.</string> <string name="app_license">Licensierat under Apache-licensen, version 2.0.</string>
<string name="app_authors_fmt">Upphovsmän: <xliff:g id="app_authors">%s</xliff:g></string> <string name="app_authors_fmt">Upphovsmän: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
<string name="app_revision_fmt">Revisionsinformation: <xliff:g id="app_revision_url">%s</xliff:g></string> <string name="app_revision_fmt">Revisionsinformation: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
<string name="app_libraries">Vi använder följande tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string> <string name="app_libraries">Vi använder följande tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji-ikoner: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji-ikoner: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1026,7 +1024,20 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="dialog_confirm_delete_cancel_button">Radera inte</string> <string name="dialog_confirm_delete_cancel_button">Radera inte</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

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

@ -6,9 +6,7 @@
<!-- 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_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>--> <!-- NEW: <string name="app_license">Licensed under the 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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>--> <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <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>--> <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
@ -1007,7 +1005,20 @@
<string name="dialog_confirm_delete_cancel_button">不要删除</string> <string name="dialog_confirm_delete_cancel_button">不要删除</string>
<!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>--> <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
<!-- NEW: <string name="dialog_confirm_spam_message">Do you really want to move this message to the spam folder?</string>--> <!-- NEW: <plurals name="dialog_confirm_spam_message">
<item quantity="one">Do you really want to move this message to the spam folder?</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>
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>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>--> <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>--> <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->

5
res/values/constants.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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_webpage_url">http://code.google.com/p/k9mail/</string>
</resources>

15
res/values/strings.xml
View File

@ -6,9 +6,7 @@
<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_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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</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>
<string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string> <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
@ -1037,7 +1035,18 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="dialog_confirm_spam_title">Confirm move to spam folder</string> <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>
<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">Do you really want to move this message to the spam folder?</item>
<item quantity="other">Do you really want to move %1$d messages to the spam folder?</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>
<!--
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">Yes</string> <string name="dialog_confirm_spam_confirm_button">Yes</string>
<string name="dialog_confirm_spam_cancel_button">No</string> <string name="dialog_confirm_spam_cancel_button">No</string>

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

@ -23,7 +23,7 @@ public class ConfirmationDialog {
final String message, final int confirmButton, final int cancelButton, final String message, final int confirmButton, final int cancelButton,
final Runnable action) { final Runnable action) {
return create(activity, dialogId, title, message, confirmButton, cancelButton, return create(activity, dialogId, title, message, confirmButton, cancelButton,
action, null); action, null);
} }
/** /**

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

@ -1139,9 +1139,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
*/ */
bp.addHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, String.format( bp.addHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, String.format(
"attachment;\n filename=\"%s\";\n size=%d", "attachment;\n filename=\"%s\";\n size=%d",
EncoderUtil.encodeIfNecessary(attachment.name, attachment.name, attachment.size));
EncoderUtil.Usage.WORD_ENTITY, 7),
attachment.size));
mp.addBodyPart(bp); mp.addBodyPart(bp);
} }

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

@ -1070,7 +1070,7 @@ public class MessageList
MessageReference ref = message.message.makeMessageReference(); MessageReference ref = message.message.makeMessageReference();
Log.i(K9.LOG_TAG, "MessageList sending message " + ref); Log.i(K9.LOG_TAG, "MessageList sending message " + ref);
MessageView.actionView(this, ref, messageRefs); MessageView.actionView(this, ref, messageRefs, getIntent());
} }
/* /*
@ -1325,7 +1325,7 @@ public class MessageList
final int selectionSize = mActiveMessages.size(); final int selectionSize = mActiveMessages.size();
final String message; final String message;
message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize, message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize,
Integer.valueOf(selectionSize)); Integer.valueOf(selectionSize));
((AlertDialog) dialog).setMessage(message); ((AlertDialog) dialog).setMessage(message);
} }
break; break;
@ -2728,7 +2728,7 @@ public class MessageList
// message check // message check
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
Toast.LENGTH_LONG); Toast.LENGTH_LONG);
toast.show(); toast.show();
return false; return false;
} }
@ -2818,13 +2818,13 @@ public class MessageList
return; return;
} }
} else if (!account.equals(message.getFolder().getAccount()) } else if (!account.equals(message.getFolder().getAccount())
|| !folderName.equals(message.getFolder().getName())) { || !folderName.equals(message.getFolder().getName())) {
// make sure all messages come from the same account/folder? // make sure all messages come from the same account/folder?
return; return;
} }
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
Toast.LENGTH_LONG); Toast.LENGTH_LONG);
toast.show(); toast.show();
// XXX return meaningful error value? // XXX return meaningful error value?
@ -2837,11 +2837,11 @@ public class MessageList
if (operation == FolderOperation.MOVE) { if (operation == FolderOperation.MOVE) {
mController.moveMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, mController.moveMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination,
null); null);
mHandler.removeMessages(holders); mHandler.removeMessages(holders);
} else { } else {
mController.copyMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, mController.copyMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination,
null); null);
} }
} }

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

@ -1,5 +1,7 @@
package com.fsck.k9.activity; package com.fsck.k9.activity;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.Dialog; import android.app.Dialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
@ -27,11 +29,14 @@ import com.fsck.k9.view.SingleMessageView;
import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
import java.io.File; import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*; import java.util.*;
public class MessageView extends K9Activity implements OnClickListener { public class MessageView extends K9Activity implements OnClickListener {
private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference"; private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences"; private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
private static final String EXTRA_ORIGINATING_INTENT = "com.fsck.k9.MessageView_originatingIntent";
private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next"; private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next";
private static final String SHOW_PICTURES = "showPictures"; private static final String SHOW_PICTURES = "showPictures";
private static final String STATE_PGP_DATA = "pgpData"; private static final String STATE_PGP_DATA = "pgpData";
@ -39,6 +44,33 @@ public class MessageView extends K9Activity implements OnClickListener {
private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2; private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
private static final int ACTIVITY_CHOOSE_DIRECTORY = 3; private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
/**
* Whether parent class have the onBackPressed() method (with no argument)
*/
private static final boolean HAS_SUPER_ON_BACK_METHOD;
static {
boolean hasOnBackMethod;
try {
final Class <? super MessageView > superClass = MessageView.class.getSuperclass();
final Method method = superClass.getMethod("onBackPressed", new Class[] {});
hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC;
} catch (final SecurityException e) {
if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Security exception while checking for 'onBackPressed' method", e);
}
hasOnBackMethod = false;
} catch (final NoSuchMethodException e) {
hasOnBackMethod = false;
}
HAS_SUPER_ON_BACK_METHOD = hasOnBackMethod;
}
/**
* If user opt-in for the "Manage BACK button", we have to remember how to get back to the
* originating activity (just recreating a new Intent could lose the calling activity state)
*/
private Intent mCreatorIntent;
private SingleMessageView mMessageView; private SingleMessageView mMessageView;
private PgpData mPgpData; private PgpData mPgpData;
@ -127,6 +159,15 @@ public class MessageView extends K9Activity implements OnClickListener {
@Override @Override
public boolean onKeyDown(final int keyCode, final KeyEvent event) { public boolean onKeyDown(final int keyCode, final KeyEvent event) {
if (
// XXX TODO - when we go to android 2.0, uncomment this
// android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR &&
keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
// Take care of calling this method on earlier versions of
// the platform where it doesn't exist.
onBackPressed();
return true;
}
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP: { case KeyEvent.KEYCODE_VOLUME_UP: {
if (K9.useVolumeKeysForNavigationEnabled()) { if (K9.useVolumeKeysForNavigationEnabled()) {
@ -229,6 +270,34 @@ public class MessageView extends K9Activity implements OnClickListener {
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
@Override
public void onBackPressed() {
// This will be called either automatically for you on 2.0
// or later, or by the code above on earlier versions of the
// platform.
if (K9.manageBack()) {
final ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
// retrieve the current+previous tasks
final List<RunningTaskInfo> runningTasks = activityManager.getRunningTasks(2);
final RunningTaskInfo previousTask = runningTasks.get(1);
final String originatingActivity = mCreatorIntent.getComponent().getClassName();
if (originatingActivity.equals(previousTask.topActivity.getClassName())) {
// we can safely just finish ourself since the most recent task matches our creator
// this enable us not to worry about restoring the state of our creator
} else {
// the previous task top activity doesn't match our creator (previous task is from
// another app and user used long-pressed-HOME to display MessageView)
// launching our creator
startActivity(mCreatorIntent);
}
finish();
} else if (HAS_SUPER_ON_BACK_METHOD) {
super.onBackPressed();
} else {
finish();
}
}
class MessageViewHandler extends Handler { class MessageViewHandler extends Handler {
public void progress(final boolean progress) { public void progress(final boolean progress) {
@ -281,20 +350,35 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences) { public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, final Intent originatingIntent) {
actionView(context, messRef, messReferences, null); actionView(context, messRef, messReferences, null, originatingIntent);
} }
public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, Bundle extras) { /**
* @param context
* @param messRef
* @param messReferences
* @param extras
* @param originatingIntent
* The intent that allow us to get back to the calling screen, for when the 'Manage
* BACK' option is enabled. Never {@code null}.
*/
public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, Bundle extras, final Intent originatingIntent) {
Intent i = new Intent(context, MessageView.class); Intent i = new Intent(context, MessageView.class);
i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef); i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef);
i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences); i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences);
i.putExtra(EXTRA_ORIGINATING_INTENT, originatingIntent);
if (extras != null) { if (extras != null) {
i.putExtras(extras); i.putExtras(extras);
} }
context.startActivity(i); context.startActivity(i);
} }
@Override
protected void onNewIntent(final Intent intent) {
mCreatorIntent = intent.getParcelableExtra(EXTRA_ORIGINATING_INTENT);
}
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle, false); super.onCreate(icicle, false);
@ -334,7 +418,10 @@ public class MessageView extends K9Activity implements OnClickListener {
mMessageView.initialize(this); mMessageView.initialize(this);
setTitle(""); setTitle("");
Intent intent = getIntent(); final Intent intent = getIntent();
mCreatorIntent = getIntent().getParcelableExtra(EXTRA_ORIGINATING_INTENT);
Uri uri = intent.getData(); Uri uri = intent.getData();
if (icicle != null) { if (icicle != null) {
mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE); mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE);

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

@ -18,7 +18,6 @@ import java.util.regex.Pattern;
import com.fsck.k9.helper.HtmlConverter; import com.fsck.k9.helper.HtmlConverter;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.codec.EncoderUtil;
import android.app.Application; import android.app.Application;
import android.content.ContentValues; import android.content.ContentValues;
@ -1670,17 +1669,14 @@ public class LocalStore extends Store implements Serializable {
MimeBodyPart bp = new LocalAttachmentBodyPart(body, id); MimeBodyPart bp = new LocalAttachmentBodyPart(body, id);
bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64"); bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
if (name != null) { if (name != null) {
String encoded_name = EncoderUtil.encodeIfNecessary(name,
EncoderUtil.Usage.WORD_ENTITY, 7);
bp.setHeader(MimeHeader.HEADER_CONTENT_TYPE, bp.setHeader(MimeHeader.HEADER_CONTENT_TYPE,
String.format("%s;\n name=\"%s\"", String.format("%s;\n name=\"%s\"",
type, type,
encoded_name)); name));
bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION,
String.format("%s;\n filename=\"%s\";\n size=%d", String.format("%s;\n filename=\"%s\";\n size=%d",
contentDisposition, contentDisposition,
encoded_name, // TODO: Should use encoded word defined in RFC 2231. name, // TODO: Should use encoded word defined in RFC 2231.
size)); size));
} }
@ -2383,7 +2379,7 @@ public class LocalStore extends Store implements Serializable {
Utility.combine(attachment.getHeader( Utility.combine(attachment.getHeader(
MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ','); MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ',');
String name = MimeUtility.unfoldAndDecode(MimeUtility.getHeaderParameter(attachment.getContentType(), "name")); String name = MimeUtility.getHeaderParameter(attachment.getContentType(), "name");
String contentId = MimeUtility.getHeaderParameter(attachment.getContentId(), null); String contentId = MimeUtility.getHeaderParameter(attachment.getContentId(), null);
String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition()); String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition());
@ -2398,7 +2394,7 @@ public class LocalStore extends Store implements Serializable {
} }
if (name == null && contentDisposition != null) { if (name == null && contentDisposition != null) {
name = MimeUtility.unfoldAndDecode(MimeUtility.getHeaderParameter(contentDisposition, "filename")); name = MimeUtility.getHeaderParameter(contentDisposition, "filename");
} }
if (attachmentId == -1) { if (attachmentId == -1) {
ContentValues cv = new ContentValues(); ContentValues cv = new ContentValues();

3
tools/eclipse-settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,3 @@
#Sat Apr 30 16:23:39 CEST 2011
eclipse.preferences.version=1
encoding/<project>=UTF-8

358
tools/eclipse-settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,358 @@
#Tue Jun 07 20:07:23 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.fieldPrefixes=m
org.eclipse.jdt.core.codeComplete.fieldSuffixes=
org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=s
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=1
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
org.eclipse.jdt.core.formatter.comment.line_length=100
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_empty_lines=false
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=100
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

65
tools/eclipse-settings/org.eclipse.jdt.ui.prefs Normal file
View File

@ -0,0 +1,65 @@
#Tue Jun 07 19:46:27 CEST 2011
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_missing_override_annotations_interface_methods=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=true
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_to_enhanced_for_loop=true
cleanup.correct_indentation=false
cleanup.format_source_code=false
cleanup.format_source_code_changes_only=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=true
cleanup.make_private_fields_final=false
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=true
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=false
cleanup.organize_imports=true
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=true
cleanup.remove_private_constructors=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=true
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_parentheses_in_expressions=false
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup_profile=_K-9 Mail
cleanup_settings_version=2
eclipse.preferences.version=1
formatter_profile=_K-9 Mail
formatter_settings_version=11
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=android;com;junit;net;org;java;javax;
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99