moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into content_provider 

Conflicts:
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/fragment/MessageListFragment.java
This commit is contained in:
cketti 2012-11-05 04:52:45 +01:00
parent 52bfea65d1 c0cb734288
commit d209c0cce3
25 changed files with 446 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ActionBarSherlock.iml
View File

@ -27,6 +27,7 @@
<path>/plugins/ActionBarSherlock/library/res-overlay</path>
</resOverlayFolders>
<includeSystemProguardFile>true</includeSystemProguardFile>
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
<additionalNativeLibs />
</configuration>
</facet>

1
Android-PullToRefresh.iml
View File

@ -27,6 +27,7 @@
<path>/plugins/Android-PullToRefresh/library/res-overlay</path>
</resOverlayFolders>
<includeSystemProguardFile>true</includeSystemProguardFile>
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
<additionalNativeLibs />
</configuration>
</facet>

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="17010"
android:versionName="4.309" package="com.fsck.k9"
android:versionCode="17011"
android:versionName="4.310" package="com.fsck.k9"
>
<uses-sdk
android:minSdkVersion="7"

1
k9mail.iml
View File

@ -25,6 +25,7 @@
<option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
<resOverlayFolders />
<includeSystemProguardFile>false</includeSystemProguardFile>
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
<additionalNativeLibs />
</configuration>
</facet>

2
k9mail.ipr
View File

@ -405,7 +405,7 @@
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.0.3 Platform" project-jdk-type="Android SDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.1 Platform" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="StarteamConfiguration">

10
res/layout/message_list_item.xml
View File

@ -23,6 +23,16 @@
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
android:background="@android:color/transparent" />
<CheckBox
android:id="@+id/selected_checkbox"
android:layout_width="36dip"
android:layout_below="@+id/chip"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_height="fill_parent"
android:focusable="false"
android:gravity="bottom|center"
android:visibility="gone" />
</RelativeLayout>
<TextView

10
res/menu/accounts_option.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/search"
android:icon="?attr/iconActionSearch"
android:showAsAction="always"
android:title="@string/search_action"/>
<item
android:id="@+id/check_mail"
android:alphabeticShortcut="r"
android:icon="?attr/iconActionRefresh"
android:showAsAction="always"
android:title="@string/check_mail_action"/>
<item
android:id="@+id/search"
android:icon="?attr/iconActionSearch"
android:showAsAction="always"
android:title="@string/search_action"/>
<item
android:id="@+id/compose"
android:alphabeticShortcut="c"

5
res/menu/message_list_option.xml
View File

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/search"
android:icon="?attr/iconActionSearch"
android:showAsAction="always"
android:title="@string/search_action"/>
<item
android:id="@+id/search_remote"
android:icon="?attr/iconActionRemoteSearch"

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

@ -544,7 +544,7 @@ http://k9mail.googlecode.com/
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Odpovědět za citovaným textem</string>
<string name="account_settings_reply_after_quote_summary">Při odpovídání na zprávu se původní zpráva objeví ned vaší odpovědí.</string>
<string name="account_settings_reply_after_quote_summary">Při odpovídání na zprávu se původní zpráva objeví nad vaší odpovědí.</string>
<!-- NEW: <string name="account_settings_strip_signature_label">Strip signature from quoted reply</string>-->
<!-- NEW: <string name="account_settings_strip_signature_summary">When replying to messages, the signature of the quoted text will be stripped</string>-->

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

@ -1131,4 +1131,32 @@ de plus</string>
<string name="image_saved_as">Sauvegarder l\'image en tant que \"<xliff:g id="filename">%s</xliff:g>\"</string>
<string name="image_saving_failed">Echec de la sauvegarde de l\'image.</string>
<string name="account_settings_remote_search_num_results_entries_all">Tous</string>
<string name="account_settings_remote_search_num_results_entries_10">10</string>
<string name="account_settings_remote_search_num_results_entries_25">25</string>
<string name="account_settings_remote_search_num_results_entries_50">50</string>
<string name="account_settings_remote_search_num_results_entries_100">100</string>
<string name="account_settings_remote_search_num_results_entries_250">250</string>
<string name="account_settings_remote_search_num_results_entries_500">500</string>
<string name="account_settings_remote_search_num_results_entries_1000">1000</string>
<string name="account_settings_remote_search_num_label">Limite les résultats de la recherche distante</string>
<string name="account_settings_remote_search_num_summary">La recherche s\'arrêtera après que <xliff:g id="num_results">%s</xliff:g> résultats ont été trouvés.</string>
<string name="account_settings_remote_search">Recherche dossier distant</string>
<string name="account_settings_remote_search_full_text">Inclure le corps du texte dans la recherche distante</string>
<string name="account_settings_remote_search_full_text_summary">La recherche dans le corps du texte peut être lente.</string>
<string name="remote_search_sending_query">Envoi de la requête au serveur</string>
<string name="remote_search_downloading">Récupération de %d résultats</string>
<string name="remote_search_downloading_limited">Récupération %1$d sur %2$d résultats</string>
<string name="account_settings_search">Rechercher</string>
<string name="account_settings_remote_search_enabled">Activer la recherche distante</string>
<string name="account_settings_remote_search_enabled_summary">Rechercher des messages sur le serveur en plus de ceux de votre appareil</string>
<string name="action_remote_search">Rechercher des messages distant</string>
<string name="pull_to_refresh_remote_search_from_local_search_pull">Tirez pour la recherche distante…</string>
<string name="pull_to_refresh_remote_search_from_local_search_release">Relâchez pour la recherche distante…</string>
<string name="remote_search_unavailable_no_network">La recherche à distance n\'est pas disponible sans connexion au réseau.</string>
<string name="global_settings_background_as_unread_indicator_label">Utiliser le fond comme indicateur de lecture</string>
<string name="global_settings_background_as_unread_indicator_summary">Montrer les messages lus et non lus avec différentes couleurs de fond</string>
</resources>

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

@ -10,7 +10,7 @@
<string name="beta_app_name">K-9 Mail BETA</string>
<string name="shortcuts_title">K-9 fiókok</string>
<!-- NEW: <string name="unread_widget_label">K-9 Unread</string>-->
<string name="unread_widget_label">K-9 olvasatlan</string>
<string name="remote_control_label">K-9 Mail távoli vezérlés</string>
<string name="remote_control_desc">Lehetővé teszi, hogy az alkalmazás módosítsa a K9 mail beállításait.</string>
@ -56,16 +56,16 @@
<!-- === App Store-specific strings ======================================================= -->
<!-- NEW: <string name="import_dialog_error_message">There is no suitable application to handle the import operation. Please install a file manager application from Google Play Store.</string>-->
<!-- NEW: <string name="open_market">Open Play Store</string>-->
<string name="open_market">Play áruház megnyitása</string>
<!-- === General strings ================================================================== -->
<!-- NEW: <string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>-->
<!-- NEW: <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>-->
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
<!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
<string name="app_authors_fmt">Készítők: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Verzió információk: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">A következő könyvtárakat használjuk: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji ikonok: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
<string name="read_attachment_label">Levélmellékletek megnyitása</string>
<string name="read_attachment_desc">Az alkalmazás engedélyezi a levélmellékletek megnyitását.</string>
@ -74,7 +74,7 @@
<string name="delete_messages_label">Levelek törlése</string>
<string name="delete_messages_desc">Az alkalmazás engedélyezi az emailek törlését.</string>
<string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_title_fmt">A <xliff:g id="app_name">%s</xliff:g> névjegye</string>
<string name="accounts_title">Fióklista</string>
<string name="advanced">Haladó beállítások</string>
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
@ -114,7 +114,7 @@
<string name="forward_action">Továbbítás</string>
<string name="move_action">Áthelyez</string>
<string name="continue_action">Folytatás</string>
<!-- NEW: <string name="back_action">Back</string>-->
<string name="back_action">Vissza</string>
<string name="done_action">Rendben</string>
<string name="discard_action">Mégsem</string>
<string name="save_draft_action">Piszkozat</string>
@ -124,7 +124,7 @@
<string name="send_messages_action">Üzenet küldése</string>
<string name="list_folders_action">Mappa lista</string>
<string name="refresh_folders_action">Mappák frissítése</string>
<!-- NEW: <string name="filter_folders_action">Find folder</string>-->
<string name="filter_folders_action">Mappa keresése</string>
<string name="mark_all_as_read_action">Mindent olvasottnak jelöl</string>
<string name="add_account_action">Új fiók</string>
<string name="compose_action">Levélírás</string>
@ -155,9 +155,9 @@
<string name="mark_as_unread_action">Olvasatlannak jelöl</string>
<string name="add_cc_bcc_action">Másolatot kap</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="read_receipt">Olvasási jelentés</string>
<string name="read_receipt_enabled">Olvasási jelentés lesz kérve</string>
<string name="read_receipt_disabled">Nem lesz Olvasási jelentés lesz kérve</string>
<string name="add_attachment_action">Melléklet</string>
<string name="add_attachment_action_image">Kép-melléklet csatolása</string>
<string name="add_attachment_action_video">Videó-melléklet csatolása</string>
@ -240,7 +240,7 @@
<string name="message_compose_bcc_hint">Titkos másolat</string>
<string name="message_compose_subject_hint">Tárgy</string>
<string name="message_compose_content_hint">Levél szövege</string>
<!-- NEW: <string name="message_compose_signature_hint">Signature</string>-->
<string name="message_compose_signature_hint">Aláírás</string>
<string name="message_compose_quote_header_separator">-------- Eredeti levél --------</string>
<string name="message_compose_quote_header_subject">Tárgy:</string>
<string name="message_compose_quote_header_send_date">Küldve:</string>
@ -251,12 +251,12 @@
<string name="message_compose_error_no_recipients">Legalább egy címzetted adjon meg.</string>
<string name="error_contact_address_not_found">E-mail cím nem található.</string>
<string name="message_compose_attachments_skipped_toast">Néhány mellékletet nem lehet továbbítani, mert nem lettek letöltve.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<!-- NEW: <string name="message_compose_description_add_to">Add recipient (To)</string>-->
<!-- NEW: <string name="message_compose_description_add_cc">Add recipient (CC)</string>-->
<!-- NEW: <string name="message_compose_description_add_bcc">Add recipient (BCC)</string>-->
<!-- NEW: <string name="message_compose_description_delete_quoted_text">Remove quoted text</string>-->
<!-- NEW: <string name="message_compose_description_edit_quoted_text">Edit quoted text</string>-->
<string name="message_compose_show_quoted_text_action">Idézet</string>
<string name="message_compose_description_add_to">Címzett hozzáadása (To)</string>
<string name="message_compose_description_add_cc">Címzett hozzáadása (CC)</string>
<string name="message_compose_description_add_bcc">Címzett hozzáadása (BCC)</string>
<string name="message_compose_description_delete_quoted_text">Idézett szöveg törlése</string>
<string name="message_compose_description_edit_quoted_text">Idézett szöveg szerkesztése</string>
<string name="message_view_from_format">Feladó: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Címzett:</string>
@ -271,13 +271,13 @@
<string name="message_view_status_attachment_saved">%s mellékletei a SD kártyára mentve.</string>
<string name="message_view_status_attachment_not_saved">Nem lehet a mellékletet az SD kártyára menteni.</string>
<string name="message_view_show_pictures_action">Képek mutatása</string>
<!-- NEW: <string name="message_view_show_message_action">Show message</string>-->
<!-- NEW: <string name="message_view_show_attachments_action">Show attachments</string>-->
<!-- NEW: <string name="message_view_show_more_attachments_action">More&#8230;</string>-->
<string name="message_view_show_message_action">Üzenet megjelenítése</string>
<string name="message_view_show_attachments_action">Csatolmányok megjelenítése</string>
<string name="message_view_show_more_attachments_action">Egyéb&#8230;</string>
<string name="message_view_fetching_attachment_toast">Melléklet letöltése.</string>
<string name="message_view_no_viewer">%s nincs társítva semmihez.</string>
<string name="message_view_download_remainder">Teljes üzenet letöltése</string>
<!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
<string name="message_view_downloading">Letöltés…</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
<string name="message_additional_headers_not_downloaded">Nincs minden fejléc letöltve. Válassza a \"Minden levélfejléc letöltése\" opciót a bejövő szerverbeállításoknál.</string>
@ -310,32 +310,32 @@
<string name="global_settings_messageview_fixedwidth_summary">Fix szélességű betűtípus használata a sima szöveges üzeneteknél</string>
<string name="global_settings_messageview_return_to_list_label">Visszalépés törlés után</string>
<string name="global_settings_messageview_return_to_list_summary">Törlés után visszalép a levelek listájára</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_messageview_show_next_label">Mutassa a következő üzenetet törlés után</string>
<string name="global_settings_messageview_show_next_summary">A törlés után alapértelmezetten a következő üzenetet mutatja</string>
<string name="global_settings_confirm_actions_title">Parancsok megerősítése</string>
<string name="global_settings_confirm_actions_summary">Üzenet megjelenítése a parancs végrehatása előtt</string>
<string name="global_settings_confirm_action_archive">Archivál</string>
<string name="global_settings_confirm_action_delete">Törlés (csak üzenetek nézet)</string>
<!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
<string name="global_settings_confirm_action_delete_starred">Csillagozott törlése (csak olvasható üzenet)</string>
<string name="global_settings_confirm_action_spam">Levélszemét</string>
<string name="global_settings_confirm_action_mark_all_as_read">Összes megjelölése olvasottként</string>
<string name="global_settings_confirm_action_send">Küldés</string>
<!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
<string name="global_settings_notification_hide_subject_title">Tárgy elrejtése az értesítésekben</string>
<string name="global_settings_notification_hide_subject_never">Soha</string>
<string name="global_settings_notification_hide_subject_when_locked">Ha a készülék le van zárva</string>
<string name="global_settings_notification_hide_subject_always">Mindig</string>
<!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
<!-- NEW: <string name="global_settings_delete">Delete</string>-->
<!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
<!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
<!-- NEW: <string name="global_settings_move">Move</string>-->
<string name="global_settings_mark_read">Olvasottnak/olvasatlannak jelöl</string>
<string name="global_settings_delete">Törlés</string>
<string name="global_settings_archive">Áthelyezés az archívumba</string>
<string name="global_settings_archive_disabled_reason">Nincs archívum mappa.</string>
<string name="global_settings_move">Áthelyezés</string>
<!-- NEW: <string name="global_settings_flag">Flag</string>-->
<!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
<string name="global_settings_unselect">Kijelölés megszüntetése</string>
<string name="quiet_time">Csendes mód</string>
<string name="quiet_time_description">Éjszakára kikapcsolja a jelzőhangokat, rezgést, villogást</string>
@ -406,7 +406,7 @@
<string name="account_setup_expunge_policy_on_poll">Frissítés után</string>
<string name="account_setup_expunge_policy_manual">Kézileg</string>
<!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>-->
<string name="account_setup_incoming_autodetect_namespace_label">IMAP névtér automatikus felismerése</string>
<string name="account_setup_incoming_imap_path_prefix_label">IMAP útvonal prefix</string>
<string name="drafts_folder_label">Piszkozatok mappája</string>
@ -520,8 +520,8 @@
<string name="account_settings_notification_opens_unread_summary">Értesítésre kattintva megnyitja az olvasatlan üzeneteket</string>
<string name="account_settings_notification_unread_count_label">Olvasatlanok kijelzése</string>
<string name="account_settings_notification_unread_count_summary">Olvasatlan levelek száma az állapotsoron.</string>
<!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
<!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
<string name="account_settings_mark_message_as_read_on_view_label">Üzenet megjelölése olvasottnak megnyitáskor</string>
<string name="account_settings_mark_message_as_read_on_view_summary">Olvasottnak jelöli az üzenetet, ha megnézik</string>
<string name="account_settings_enable_move_buttons_label">Művelet gombok megjelenítése</string>
<string name="account_settings_enable_move_buttons_summary">Mutassa a Mozgatás, Archív és Levélszemét gombokat</string>
@ -533,8 +533,8 @@
<string name="account_settings_composition">Levelek küldése</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_default_quoted_text_shown_label">Válasznál eredeti levél megjelenítése</string>
<string name="account_settings_default_quoted_text_shown_summary">Amikor választ ír, az eredeti üzenet is látható lesz a válszban.</string>
<string name="account_settings_reply_after_quote_label">Válasz az idézet után</string>
<string name="account_settings_reply_after_quote_summary">Válaszlevélnél az eredeti üzenet fent jelenik meg</string>
@ -747,7 +747,7 @@
<string name="sort_by">Rendezés…</string>
<string name="sort_by_date">Dátum</string>
<!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
<string name="sort_by_arrival">Érkezés</string>
<string name="sort_by_sender">Feladó</string>
<string name="sort_by_subject">Tárgy</string>
<string name="sort_by_flag">Csillag</string>
@ -775,14 +775,14 @@
<string name="account_setup_failed_dlg_invalid_certificate_accept">Kulcs elfogadva</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Kulcs elutasítva</string>
<!-- NEW: <string name="message_help_key">Del (or D) - Delete\u000AR -
Reply\u000AA - Reply All\u000AF - Forward\u000AJ or P - Previous
Message\u000AK, N - Next Message\u000AM - Move\u000AY - Copy\u000AZ - Zoom Out\u000AShift-Z -
Zoom In\u000aG - Star</string>
<string name="message_list_help_key">Del (or D) - Delete\u000AR -
Reply\u000AA - Reply All\u000AC - Compose\u000AF - Forward\u000aM -
Move\u000AY - Copy\u000AG - Star\u000AO - Sort type\u000AI - Sort order\u000AQ
- Return to Folders\u000AS - Select/deselect</string>-->
<string name="message_help_key">Del (or D) - Törlés\u000AR -
Válasz\u000AA - Válasz mindenkinek\u000AF - Továbbít\u000AJ or P - Előző
üzenet\u000AK, N - Kövtkető üzenet\u000AM - Move\u000AY - Másolás\u000AZ - Kicsinyít\u000AShift-Z -
Nagyít\u000aG - Csillagoz</string>
<string name="message_list_help_key">Del (or D) - Törlés\u000AR -
Válasz\u000AA - Válasz mindenkinek\u000AC - Írás\u000AF - Továbbít\u000aM -
Áthelyezés\u000AY - Násolás\u000AG - Csillagoz\u000AO - Rendezési típus\u000AI - Rendezési sorrend\u000AQ
- Vissza a mappákba\u000AS - Select/deselect</string>
<!--NEW: <string name="folder_list_help_key">
1 - Display only 1st Class folders\n
@ -792,7 +792,7 @@
Q - Return to Accounts\n
S - Edit Account Settings</string>-->
<!-- NEW: <string name="folder_list_filter_hint">folder name contains</string>-->
<string name="folder_list_filter_hint">mappa neve</string>
<string name="folder_list_display_mode_label">Mappák megjelenítése</string>
<string name="folder_list_display_mode_all">Minen mappa</string>
@ -827,7 +827,7 @@
<string name="background_ops_always">Mindig</string>
<string name="background_ops_enabled">"Ha a 'Háttéradatok' bekapcsolva"</string>
<string name="background_ops_auto_sync">"Ha a 'Háttéradatok' és 'Auto-szink' bekapcsolva"</string>
<!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
<string name="background_ops_auto_sync_only">AMikor az \'Automatikus szinkronizáció\' be van kapcsolva</string>
<string name="no_message_seletected_toast">Nincs levél kiválasztva</string>
@ -931,8 +931,8 @@
<string name="font_size_message_view_date">Dátum</string>
<string name="font_size_message_view_content">Üzenet szövege</string>
<!-- NEW: <string name="font_size_message_compose">Message composition</string>-->
<!-- NEW: <string name="font_size_message_compose_input">Text input fields</string>-->
<string name="font_size_message_compose">Üzenet írása</string>
<string name="font_size_message_compose_input">Szöveg beviteli mezők</string>
<string name="font_size_tiniest">Mini</string>
<string name="font_size_tiny">Pici</string>
@ -975,8 +975,8 @@
<string name="save_or_discard_draft_message_dlg_title">Menti piszkozatként?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Menti vagy mégsem az üzenetet?</string>
<!-- NEW: <string name="confirm_discard_draft_message_title">Discard message?</string>-->
<!-- NEW: <string name="confirm_discard_draft_message">Are you sure you want to discard this message?</string>-->
<string name="confirm_discard_draft_message_title">Üzenet elvetése?</string>
<string name="confirm_discard_draft_message">Valóban elveti az üzenetet?</string>
<!-- NEW: <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuse to save draft message.</string>-->
<!-- NEW: <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuse to save draft message marked encrypted.</string>-->
@ -1018,38 +1018,38 @@
<string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Nem lehet kapcsolódni.</string>
<!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>-->
<!-- NEW: <string name="settings_export_account">Export account settings</string>-->
<!-- NEW: <string name="settings_export_all">Export settings and accounts</string>-->
<!-- NEW: <string name="settings_import_dialog_title">Import</string>-->
<!-- NEW: <string name="settings_export_dialog_title">Export</string>-->
<!-- NEW: <string name="settings_import">Import settings</string>-->
<string name="import_export_action">Beállítások importálása és exportálása</string>
<string name="settings_export_account">Fiókbeállítások exportálása</string>
<string name="settings_export_all">Fiókok és beállítások exportálása</string>
<string name="settings_import_dialog_title">Importálás</string>
<string name="settings_export_dialog_title">Exportálás</string>
<string name="settings_import">Beállítások importálása</string>
<!-- NEW: <string name="settings_import_selection">Import selection</string>-->
<!-- NEW: <string name="settings_import_global_settings">Global settings</string>-->
<!-- NEW: <string name="settings_exporting">Exporting settings…</string>-->
<!-- NEW: <string name="settings_importing">Importing settings…</string>-->
<!-- NEW: <string name="settings_import_scanning_file">Scanning file…</string>-->
<!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <plurals name="settings_import_success">
<item quantity="one">1 account</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
</plurals>-->
<!-- NEW: <string name="settings_export_failure">Failed to export settings</string>-->
<!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_export_success_header">Export succeeded</string>-->
<!-- NEW: <string name="settings_export_failed_header">Export failed</string>-->
<!-- NEW: <string name="settings_import_success_header">Import succeeded</string>-->
<!-- NEW: <string name="settings_import_failed_header">Import failed</string>-->
<!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>-->
<string name="settings_import_global_settings">Általános beállítások</string>
<string name="settings_exporting">Beállítások exportálása…</string>
<string name="settings_importing">Beállítások importálása…</string>
<string name="settings_import_scanning_file">Fájl beolvasása…</string>
<string name="settings_export_success">Exportált beállítások mentve ide: <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_global_settings_success">Az általános beállítások importálva innen: <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_success">A(z) <xliff:g id="accounts">%s</xliff:g> importálva innen: <xliff:g id="filename">%s</xliff:g></string>
<plurals name="settings_import_success">
<item quantity="one">1 fiók</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> fiók</item>
</plurals>
<string name="settings_export_failure">Beállítások exportálása sikertelen</string>
<string name="settings_import_failure">Beállítások importálása sikertelen innen: <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_export_success_header">Exportálás sikeresen befejezve</string>
<string name="settings_export_failed_header">Exportálás sikertelen</string>
<string name="settings_import_success_header">Importálás sikeresen befejezve</string>
<string name="settings_import_failed_header">Importálás sikertelen</string>
<string name="settings_import_activate_account_header">Fiók aktiválása</string>
<!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s</xliff:g>.</string>-->
<!-- NEW: <plurals name="settings_import_server_passwords">
<item quantity="one">server password</item>
<item quantity="other">server passwords</item>
</plurals>-->
<!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<plurals name="settings_import_server_passwords">
<item quantity="one">szerver jelszava</item>
<item quantity="other">szerver jelszavai</item>
</plurals>
<string name="settings_import_incoming_server">Bwjövő szerver (<xliff:g id="hostname">%s</xliff:g>):</string>
<string name="settings_import_outgoing_server">Kimenü szerver (<xliff:g id="hostname">%s</xliff:g>):</string>
<!-- NEW: <plurals name="settings_import_setting_passwords">
<item quantity="one">Setting password…</item>
<item quantity="other">Setting passwords…</item>
@ -1065,39 +1065,39 @@
<string name="attachment_save_title">Csatolményok mentése</string>
<string name="attachment_save_desc">Nincs fájlkezelő. Hova szeretné mentni a csatolmányt?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
<!-- NEW: <string name="manage_accounts_moving_message">Moving account…</string>-->
<string name="manage_accounts_move_up_action">Mozgatás fel</string>
<string name="manage_accounts_move_down_action">Mozgatás le</string>
<string name="manage_accounts_moving_message">Fiók mozgatása…</string>
<!-- NEW: <string name="unread_widget_select_account">Show unread count for…</string>-->
<!-- NEW: <string name="import_dialog_error_title">Missing File Manager Application</string>-->
<!-- NEW: <string name="close">Close</string>-->
<string name="import_dialog_error_title">Nincs fájlkezleő alkalmazás</string>
<string name="close">Bezárás</string>
<!-- NEW: <string name="webview_empty_message">No text</string>-->
<string name="webview_empty_message">Nincs szöveg</string>
<!-- NEW: <string name="webview_contextmenu_link_view_action">Open for viewing</string>-->
<!-- NEW: <string name="webview_contextmenu_link_share_action">Share link</string>-->
<!-- NEW: <string name="webview_contextmenu_link_copy_action">Copy link to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_link_clipboard_label">Link</string>-->
<string name="webview_contextmenu_link_view_action">Megnyit és megtekint</string>
<string name="webview_contextmenu_link_share_action">Link megosztása</string>
<string name="webview_contextmenu_link_copy_action">Link másolása a vágólapra</string>
<string name="webview_contextmenu_link_clipboard_label">Link</string>
<!-- NEW: <string name="webview_contextmenu_image_title">Image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_view_action">View image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_save_action">Save image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_download_action">Download image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_copy_action">Copy image URL to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_image_clipboard_label">Image URL</string>-->
<string name="webview_contextmenu_image_title">Kép</string>
<string name="webview_contextmenu_image_view_action">Kép megtekintése</string>
<string name="webview_contextmenu_image_save_action">Kép mentése</string>
<string name="webview_contextmenu_image_download_action">Kép letöltése</string>
<string name="webview_contextmenu_image_copy_action">Kép URL-jének másolás a vágólapra</string>
<string name="webview_contextmenu_image_clipboard_label">Kép URL</string>
<!-- NEW: <string name="webview_contextmenu_phone_call_action">Call number</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_save_action">Save to Contacts</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_copy_action">Copy phone number to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_clipboard_label">Phone number</string>-->
<string name="webview_contextmenu_phone_call_action">Szám hívása</string>
<string name="webview_contextmenu_phone_save_action">Menés a névjegyekhez</string>
<string name="webview_contextmenu_phone_copy_action">Szám másolása a vágólapra</string>
<string name="webview_contextmenu_phone_clipboard_label">Telefonszám</string>
<!-- NEW: <string name="webview_contextmenu_email_send_action">Send mail</string>-->
<!-- NEW: <string name="webview_contextmenu_email_save_action">Save to Contacts</string>-->
<!-- NEW: <string name="webview_contextmenu_email_copy_action">Copy email address to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_email_clipboard_label">Email address</string>-->
<string name="webview_contextmenu_email_send_action">Levél küldése</string>
<string name="webview_contextmenu_email_save_action">Mentés a névjegyekzeh</string>
<string name="webview_contextmenu_email_copy_action">E-mail cím másolása a vágólapra</string>
<string name="webview_contextmenu_email_clipboard_label">E-mail cím</string>
<!-- NEW: <string name="image_saved_as">Saved image as \"<xliff:g id="filename">%s</xliff:g>\"</string>-->
<!-- NEW: <string name="image_saving_failed">Saving the image failed.</string>-->
<string name="image_saved_as">Kép mentése: \"<xliff:g id="filename">%s</xliff:g>\"</string>
<string name="image_saving_failed">A kép mentése sikertelen.</string>
</resources>

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

@ -274,7 +274,7 @@ http://k9mail.googlecode.com/
<string name="message_view_status_attachment_not_saved">Impossibile salvare l\'allegato sulla scheda SD.</string>
<string name="message_view_show_pictures_action">Mostra immagini</string>
<string name="message_view_show_message_action">Mostra messaggio</string>
<string name="message_view_show_attachments_action">Mostra allegato</string>
<string name="message_view_show_attachments_action">Mostra allegati</string>
<string name="message_view_show_more_attachments_action">Altro&#8230;</string>
<string name="message_view_fetching_attachment_toast">Recupero allegato in corso.</string>
<string name="message_view_no_viewer">Impossibile trovare un visualizzatore per <xliff:g id="mimetype">%s</xliff:g>.</string>

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

@ -9,7 +9,7 @@
<string name="beta_app_name">K-9 Mail BETA</string>
<string name="shortcuts_title">Contas K-9</string>
<!-- NEW: <string name="unread_widget_label">K-9 Unread</string>-->
<string name="unread_widget_label">K-9 Não lidos</string>
<string name="remote_control_label">Controle remoto para K-9 Mail</string>
<string name="remote_control_desc">Permitir esta aplicação controlar atividades e configurações do K-9 Mail.</string>
@ -18,7 +18,7 @@
<!-- Used in the about dialog -->
<string name="app_authors">Google, The K-9 Dog Walkers.</string>
<!-- NEW: <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>-->
<!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
<string name="app_license">Licenciado sob a Apache License, Versão 2.0.</string>
<!-- Welcome message -->
@ -55,8 +55,8 @@ http://k9mail.googlecode.com/
<!-- === App Store-specific strings ======================================================= -->
<!-- NEW: <string name="import_dialog_error_message">There is no suitable application to handle the import operation. Please install a file manager application from Google Play Store.</string>-->
<!-- NEW: <string name="open_market">Open Play Store</string>-->
<string name="import_dialog_error_message">Não existe um aplicativo adequado para a operação de importação. Instale um gerenciador de arquivos pela Google Play Store.</string>
<string name="open_market">Abrir a Play Store</string>
@ -65,7 +65,7 @@ http://k9mail.googlecode.com/
<string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Revisões e informações: <xliff:g id="app_revision_url">%s</xliff:g></string>
<!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
<!-- 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">Emoticons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
<string name="read_attachment_label">Ler anexos do E-mail</string>
<string name="read_attachment_desc">Permitir que o K-9 leia os anexos de seus e-mails.</string>
@ -114,7 +114,7 @@ http://k9mail.googlecode.com/
<string name="forward_action">Encaminhar</string>
<string name="move_action">Mover</string>
<string name="continue_action">Continuar</string>
<!-- NEW: <string name="back_action">Back</string>-->
<string name="back_action">Voltar</string>
<string name="done_action">Pronto</string> <!-- Used to complete a multi-step process -->
<string name="discard_action">Descartar</string>
<string name="save_draft_action">Salvar como rascunho</string>
@ -124,7 +124,7 @@ http://k9mail.googlecode.com/
<string name="send_messages_action">Enviar mensagens</string>
<string name="list_folders_action">Lista de pastas</string>
<string name="refresh_folders_action">Atualizar pastas</string>
<!-- NEW: <string name="filter_folders_action">Find folder</string>-->
<string name="filter_folders_action">Encontrar pasta</string>
<string name="mark_all_as_read_action">Marcar todas as como lidas</string>
<string name="add_account_action">Incluir conta</string>
<string name="compose_action">Escrever</string>
@ -155,7 +155,7 @@ http://k9mail.googlecode.com/
<string name="select_text_action">Selecionar texto</string>
<string name="mark_as_unread_action">Marcar como não lida</string>
<string name="add_cc_bcc_action">Incluir Cc/Bcc</string>
<string name="add_cc_bcc_action">Incluir CC/BCC</string>
<string name="read_receipt">Confirmação de leitura</string>
<string name="read_receipt_enabled">Confirmação de leitura será requisitada</string>
<string name="read_receipt_disabled">Confirmação de leitura não será requisitada</string>
@ -216,7 +216,7 @@ http://k9mail.googlecode.com/
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Rascunhos)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Lixo)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviado)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviados)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Arquivo)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
@ -238,7 +238,7 @@ http://k9mail.googlecode.com/
<string name="message_compose_bcc_hint">Bcc</string>
<string name="message_compose_subject_hint">Assunto</string>
<string name="message_compose_content_hint">Texto da mensagem</string>
<!-- NEW: <string name="message_compose_signature_hint">Signature</string>-->
<string name="message_compose_signature_hint">Assinatura</string>
<string name="message_compose_quote_header_separator">........ Mensagem Original ........</string>
<string name="message_compose_quote_header_subject">Assunto:</string>
<string name="message_compose_quote_header_send_date">Enviado:</string>
@ -250,11 +250,11 @@ http://k9mail.googlecode.com/
<string name="error_contact_address_not_found">Não foi possível encontrar o endereço de e-mail.</string>
<string name="message_compose_attachments_skipped_toast">Alguns anexos não podem ser encaminhados porque não foram inclusos na mensagem.</string>
<string name="message_compose_show_quoted_text_action">Mensagem citada</string>
<!-- NEW: <string name="message_compose_description_add_to">Add recipient (To)</string>-->
<!-- NEW: <string name="message_compose_description_add_cc">Add recipient (CC)</string>-->
<!-- NEW: <string name="message_compose_description_add_bcc">Add recipient (BCC)</string>-->
<!-- NEW: <string name="message_compose_description_delete_quoted_text">Remove quoted text</string>-->
<!-- NEW: <string name="message_compose_description_edit_quoted_text">Edit quoted text</string>-->
<string name="message_compose_description_add_to">Adicionar destinatário (Para)</string>
<string name="message_compose_description_add_cc">Adicionar destinatário (CC)</string>
<string name="message_compose_description_add_bcc">Adicionar destinatário (BCC)</string>
<string name="message_compose_description_delete_quoted_text">Remover texto citado</string>
<string name="message_compose_description_edit_quoted_text">Editar texto citado</string>
<string name="message_view_from_format">De: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Para:</string>
@ -269,10 +269,10 @@ http://k9mail.googlecode.com/
<string name="message_view_status_attachment_saved">Anexo salvo no cartão de memória como <xliff:g id="filename">%s</xliff:g>.</string>
<string name="message_view_status_attachment_not_saved">Impossível salvar anexo no cartão de memória.</string>
<string name="message_view_show_pictures_action">Mostrar imagens</string>
<!-- NEW: <string name="message_view_show_message_action">Show message</string>-->
<!-- NEW: <string name="message_view_show_attachments_action">Show attachments</string>-->
<!-- NEW: <string name="message_view_show_more_attachments_action">More&#8230;</string>-->
<string name="message_view_fetching_attachment_toast">Buscando anexo.</string>
<string name="message_view_show_message_action">Exibir mensagem</string>
<string name="message_view_show_attachments_action">Exibir anexos</string>
<string name="message_view_show_more_attachments_action">Mais&#8230;</string>
<string name="message_view_fetching_attachment_toast">Buscando anexo</string>
<string name="message_view_no_viewer">Não foi possível encontrar um visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Transferir mensagem completa</string>
<!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
@ -315,25 +315,25 @@ http://k9mail.googlecode.com/
<string name="global_settings_confirm_actions_summary">Mostrar diálogo sempre quando for disparada uma ação</string>
<string name="global_settings_confirm_action_archive">Arquivo</string>
<string name="global_settings_confirm_action_delete">Excluir (apenas visualização)</string>
<!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
<string name="global_settings_confirm_action_delete_starred">Excluir marcados com estrela (visualização apenas)</string>
<string name="global_settings_confirm_action_spam">Spam</string>
<string name="global_settings_confirm_action_mark_all_as_read">Marcar todas como lidas</string>
<string name="global_settings_confirm_action_send">Enviar</string>
<!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
<!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
<string name="global_settings_notification_hide_subject_title">Ocultar assunto nas notificações</string>
<string name="global_settings_notification_hide_subject_never">Nunca</string>
<string name="global_settings_notification_hide_subject_when_locked">Com o telefone bloqueado</string>
<string name="global_settings_notification_hide_subject_always">Sempre</string>
<!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
<!-- NEW: <string name="global_settings_delete">Delete</string>-->
<!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
<!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
<!-- NEW: <string name="global_settings_move">Move</string>-->
<!-- NEW: <string name="global_settings_flag">Flag</string>-->
<!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
<string name="global_settings_batch_buttons">Botões de lote</string>
<string name="global_settings_batch_buttons_summary">Configurar botões de lote na tela de mensagens</string>
<string name="global_settings_mark_read">Marcar como lida/não lida</string>
<string name="global_settings_delete">Excluir</string>
<string name="global_settings_archive">Arquivar</string>
<string name="global_settings_archive_disabled_reason">Nenhuma pasta de arquivo.</string>
<string name="global_settings_move">Mover</string>
<string name="global_settings_flag">Bandeira</string>
<string name="global_settings_unselect">Deselecionar</string>
<string name="quiet_time">Período de silêncio</string>
<string name="quiet_time_description">Desabilitar sons, vibração e luz indicadora à noite</string>
@ -519,8 +519,8 @@ http://k9mail.googlecode.com/
<string name="account_settings_notification_opens_unread_summary">Procurar por mensagens não lidas quando o aviso for aberto</string>
<string name="account_settings_notification_unread_count_label">Mostrar contagem de não lidas</string>
<string name="account_settings_notification_unread_count_summary">Mostrar o número de mensagens não lidas na barra de notificação.</string>
<!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
<!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
<string name="account_settings_mark_message_as_read_on_view_label">Marcar mensagem como lida ao abrir</string>
<string name="account_settings_mark_message_as_read_on_view_summary">Marcar a mensagem como lida ao abrir e visualizar</string>
<string name="account_settings_enable_move_buttons_label">Habilitar botão de ações</string>
<string name="account_settings_enable_move_buttons_summary">Mostrar botões de Arquivar, Mover e Span.</string>
@ -546,8 +546,8 @@ http://k9mail.googlecode.com/
<string name="account_settings_message_format_html">HTML (imagens e formatação serão preservadas)</string>
<!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
<!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
<!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
<string name="account_settings_always_show_cc_bcc_label">Sempre exibir CC/BCC</string>
<string name="account_settings_always_show_cc_bcc_summary">Sempre exibir os campos CC/BCC</string>
<string name="account_settings_message_read_receipt_label">Confirmação de leitura</string>
<string name="account_settings_message_read_receipt_summary">Sempre solicitar confirmação de leitura</string>
@ -569,7 +569,7 @@ http://k9mail.googlecode.com/
<string name="account_settings_crypto_app_not_available">não disponível</string>
<string name="account_settings_crypto_auto_signature">Auto-login</string>
<string name="account_settings_crypto_auto_signature_summary">Use o endereço de e-mail da conta para escolher assinatura.</string>
<!-- NEW: <string name="account_settings_crypto_auto_encrypt">Auto-encrypt</string>-->
<string name="account_settings_crypto_auto_encrypt">Auto-encriptar</string>
<!-- NEW: <string name="account_settings_crypto_auto_encrypt_summary">Automatically set encrypt if a public key matches a recipient.</string>-->
<string name="account_settings_mail_check_frequency_label">Frequência de verificação de e-mail</string>
@ -746,7 +746,7 @@ http://k9mail.googlecode.com/
<string name="sort_by">Ordenar por…</string>
<string name="sort_by_date">Data</string>
<!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
<string name="sort_by_arrival">Recebimento</string>
<string name="sort_by_sender">Remetente</string>
<string name="sort_by_subject">Assunto</string>
<string name="sort_by_flag">Favorito</string>
@ -787,7 +787,7 @@ http://k9mail.googlecode.com/
- Retornar à pastas\u000AS - Selecionar/desselecionar</string>
<string name="folder_list_help_key">
1 - Mostrar apenas pastar de Primeira Classe\u000A
1 - Mostrar apenas pastas de Primeira Classe\u000A
2 - Mostrar pastas de Primeira e Segunda Classe\u000A
3 - Mostar todas exceto as de Segunda Classe\u000A
4 - Mostar todas as pastas\u000A
@ -827,9 +827,9 @@ http://k9mail.googlecode.com/
<string name="background_ops_label">Sincronização em segundo plano</string>
<string name="background_ops_never">Nunca</string>
<string name="background_ops_always">Sempre</string>
<string name="background_ops_enabled">Quando \'Dados de segundo plado\' estiver checado</string>
<string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' &amp; \'Auto-sinc\' estiverem checados</string>
<!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
<string name="background_ops_enabled">Quando \'Dados de segundo plano\' estiver checado</string>
<string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' e \'Auto-sinc\' estiverem checados</string>
<string name="background_ops_auto_sync_only">Quando a \'Auto-sinc\' estiver ligada</string>
<string name="no_message_seletected_toast">Nenhuma mensagem selecionada</string>
@ -921,7 +921,7 @@ http://k9mail.googlecode.com/
<string name="font_size_message_list_subject">Assunto</string>
<string name="font_size_message_list_sender">Remetente</string>
<string name="font_size_message_list_date">Data</string>
<!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
<string name="font_size_message_list_preview">Previsualizar</string>
<string name="font_size_message_view">Mensagens</string>
<string name="font_size_message_view_sender">Remetente</string>
@ -933,8 +933,8 @@ http://k9mail.googlecode.com/
<string name="font_size_message_view_date">Data</string>
<string name="font_size_message_view_content">Corpo da mensagem</string>
<!-- NEW: <string name="font_size_message_compose">Message composition</string>-->
<!-- NEW: <string name="font_size_message_compose_input">Text input fields</string>-->
<string name="font_size_message_compose">Composição de mensagem</string>
<string name="font_size_message_compose_input">Campos de entrada de texto</string>
<string name="font_size_tiniest">Minúsculo</string>
<string name="font_size_tiny">Pequenino</string>
@ -951,13 +951,13 @@ http://k9mail.googlecode.com/
<string name="font_size_webview_larger">Grande</string>
<!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
<string name="message_compose_buggy_gallery">Checar \"Configurações\" -&gt; \"Utilize Gallery bug \" para tornar poder anexar imagens ou vídes utilizando Galeria 3D.</string>
<string name="message_compose_buggy_gallery">Checar \"Configurações\" -&gt; \"Utilize o Gallery bug \" para poder anexar imagens ou vídeos utilizando a Galeria 3D.</string>
<!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
<string name="message_compose_use_workaround">Usar \"Incluir anexo (Imagem)\" ou \"Incluir anexo (Video)\" para anexar images ou videos da Galeria 3D.</string>
<string name="message_compose_use_workaround">Usar \"Incluir anexo (Imagem)\" ou \"Incluir anexo (Video)\" para anexar imagens ou videos da Galeria 3D.</string>
<string name="miscellaneous_preferences">Diversos</string>
<string name="misc_preferences_attachment_title">Utilizar Gallery bug</string>
<string name="misc_preferences_attachment_title">Solução do bug da Galeria</string>
<string name="misc_preferences_attachment_description">Mostrar botões para incluir anexos de imagem/video (para contornar problemas utilizando Gallery 3D)</string>
<!-- APG related -->
@ -977,27 +977,27 @@ http://k9mail.googlecode.com/
<string name="save_or_discard_draft_message_dlg_title">Salvar mensagem de rascunho?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Salvar ou descartar esta mensagem?</string>
<!-- NEW: <string name="confirm_discard_draft_message_title">Discard message?</string>-->
<!-- NEW: <string name="confirm_discard_draft_message">Are you sure you want to discard this message?</string>-->
<string name="confirm_discard_draft_message_title">Descartar mensagens?</string>
<string name="confirm_discard_draft_message">Tem certeza que deseja descartar esta mensagem?</string>
<!-- NEW: <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuse to save draft message.</string>-->
<!-- NEW: <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuse to save draft message marked encrypted.</string>-->
<string name="refuse_to_save_draft_marked_encrypted_dlg_title">Recusar salvamento de rascunho.</string>
<string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Recusar salvamento de rascunho de mensagem encriptada.</string>
<!-- NEW: <string name="continue_without_public_key_dlg_title">Continue without public key?</string>-->
<!-- NEW: <string name="continue_without_public_key_instructions_fmt">One or more recipients do not have a saved public key. Continue?</string>-->
<string name="continue_without_public_key_dlg_title">Continuar sem chave pública?</string>
<string name="continue_without_public_key_instructions_fmt">Um ou mais destinatários não tem chave pública. Continuar?</string>
<string name="select_text_now">Selecione o testo para copiar.</string>
<string name="select_text_now">Selecione o texto para copiar.</string>
<string name="dialog_confirm_delete_title">Confirmar exclusão</string>
<string name="dialog_confirm_delete_message">Deseja mesmo excluir esta mensagem?</string>
<string name="dialog_confirm_delete_confirm_button">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: <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>
<string name="dialog_confirm_spam_title">Confirma mover para a pasta de spam</string>
<plurals name="dialog_confirm_spam_message">
<item quantity="one">Deseja mesmo mover esta mensagem para a pasta de spam?</item>
<item quantity="other">Deseja mesmo mover <xliff:g id="message_count">%1$d</xliff:g> mensagens para a pasta de spam?</item>
<!--
Translators:
Please review how to handle pluralization for your language at (1) and ajust
@ -1006,49 +1006,49 @@ http://k9mail.googlecode.com/
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">Sim</string>
<string name="dialog_confirm_spam_cancel_button">Não</string>
</plurals>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->
<!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
<string name="dialog_attachment_progress_title">Baixando anexo</string>
<string name="debug_logging_enabled">O log de depuração para o sistema Android foi habilitado</string>
<!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
<!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
<string name="messagelist_sent_to_me_sigil">»</string>
<string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Não é possível conectar.</string>
<!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>-->
<!-- NEW: <string name="settings_export_account">Export account settings</string>-->
<!-- NEW: <string name="settings_export_all">Export settings and accounts</string>-->
<!-- NEW: <string name="settings_import_dialog_title">Import</string>-->
<!-- NEW: <string name="settings_export_dialog_title">Export</string>-->
<!-- NEW: <string name="settings_import">Import settings</string>-->
<!-- NEW: <string name="settings_import_selection">Import selection</string>-->
<!-- NEW: <string name="settings_import_global_settings">Global settings</string>-->
<!-- NEW: <string name="settings_exporting">Exporting settings…</string>-->
<!-- NEW: <string name="settings_importing">Importing settings…</string>-->
<!-- NEW: <string name="settings_import_scanning_file">Scanning file…</string>-->
<!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <plurals name="settings_import_success">
<item quantity="one">1 account</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
</plurals>-->
<!-- NEW: <string name="settings_export_failure">Failed to export settings</string>-->
<!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>-->
<!-- NEW: <string name="settings_export_success_header">Export succeeded</string>-->
<!-- NEW: <string name="settings_export_failed_header">Export failed</string>-->
<!-- NEW: <string name="settings_import_success_header">Import succeeded</string>-->
<!-- NEW: <string name="settings_import_failed_header">Import failed</string>-->
<!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>-->
<!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s</xliff:g>.</string>-->
<!-- NEW: <plurals name="settings_import_server_passwords">
<item quantity="one">server password</item>
<item quantity="other">server passwords</item>
</plurals>-->
<string name="import_export_action">Importar ou exportar configurações</string>
<string name="settings_export_account">Exportar configurações de conta</string>
<string name="settings_export_all">Exportar configurações e contas</string>
<string name="settings_import_dialog_title">Importar</string>
<string name="settings_export_dialog_title">Exportar</string>
<string name="settings_import">Importar configurações</string>
<string name="settings_import_selection">Importar seleção</string>
<string name="settings_import_global_settings">Configurações globais</string>
<string name="settings_exporting">Exportando…</string>
<string name="settings_importing">Importando…</string>
<string name="settings_import_scanning_file">Buscando arquivo…</string>
<string name="settings_export_success">Configurações salvas para <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_global_settings_success">Configurações importadas de <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_success">Importada <xliff:g id="accounts">%s</xliff:g> de <xliff:g id="filename">%s</xliff:g></string>
<plurals name="settings_import_success">
<item quantity="one">1 conta</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> contas</item>
</plurals>
<string name="settings_export_failure">Falha na exportação</string>
<string name="settings_import_failure">Falha na importação via <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_export_success_header">Exportação concluída</string>
<string name="settings_export_failed_header">Falha na exportação</string>
<string name="settings_import_success_header">Importação realizada</string>
<string name="settings_import_failed_header">Falha na importação</string>
<string name="settings_import_activate_account_header">Ativar conta</string>
<string name="settings_import_activate_account_intro">Para poder usar a conta \"<xliff:g id="account">%s</xliff:g>\" você deve fornecer <xliff:g id="server_passwords">%s</xliff:g>.</string>
<plurals name="settings_import_server_passwords">
<item quantity="one">senha do servidor</item>
<item quantity="other">senhas do servidor</item>
</plurals>
<!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<!-- NEW: <plurals name="settings_import_setting_passwords">
@ -1062,43 +1062,43 @@ http://k9mail.googlecode.com/
<!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>-->
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to…</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<string name="settings_attachment_default_path">Salvar anexos para…</string>
<string name="attachment_save_title">Salvar anexo</string>
<string name="attachment_save_desc">Nenhum explorador de arquivos encontrado. Deseja salvar este anexo?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
<!-- NEW: <string name="manage_accounts_moving_message">Moving account…</string>-->
<string name="manage_accounts_move_up_action">Mover para cima</string>
<string name="manage_accounts_move_down_action">Mover para baixo</string>
<string name="manage_accounts_moving_message">Movendo conta…</string>
<!-- NEW: <string name="unread_widget_select_account">Show unread count for…</string>-->
<string name="unread_widget_select_account">Exibir contagem de não lidos para…</string>
<!-- NEW: <string name="import_dialog_error_title">Missing File Manager Application</string>-->
<!-- NEW: <string name="close">Close</string>-->
<string name="import_dialog_error_title">Explorador de Arquivos Ausente</string>
<string name="close">Fechar</string>
<!-- NEW: <string name="webview_empty_message">No text</string>-->
<string name="webview_empty_message">Nenhum texto</string>
<!-- NEW: <string name="webview_contextmenu_link_view_action">Open for viewing</string>-->
<!-- NEW: <string name="webview_contextmenu_link_share_action">Share link</string>-->
<!-- NEW: <string name="webview_contextmenu_link_copy_action">Copy link to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_link_clipboard_label">Link</string>-->
<string name="webview_contextmenu_link_view_action">Abrir para visualizar</string>
<string name="webview_contextmenu_link_share_action">Compartilhar link</string>
<string name="webview_contextmenu_link_copy_action">Copiar link</string>
<string name="webview_contextmenu_link_clipboard_label">Link</string>
<!-- NEW: <string name="webview_contextmenu_image_title">Image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_view_action">View image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_save_action">Save image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_download_action">Download image</string>-->
<!-- NEW: <string name="webview_contextmenu_image_copy_action">Copy image URL to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_image_clipboard_label">Image URL</string>-->
<string name="webview_contextmenu_image_title">Imagem</string>
<string name="webview_contextmenu_image_view_action">Ver imagem</string>
<string name="webview_contextmenu_image_save_action">Salvar imagem</string>
<string name="webview_contextmenu_image_download_action">Baixar imagem</string>
<string name="webview_contextmenu_image_copy_action">Copiar URL da imagem</string>
<string name="webview_contextmenu_image_clipboard_label">URL da imagem</string>
<!-- NEW: <string name="webview_contextmenu_phone_call_action">Call number</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_save_action">Save to Contacts</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_copy_action">Copy phone number to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_phone_clipboard_label">Phone number</string>-->
<string name="webview_contextmenu_phone_call_action">Chamar número</string>
<string name="webview_contextmenu_phone_save_action">Salvar como contato</string>
<string name="webview_contextmenu_phone_copy_action">Copiar número telefônico</string>
<string name="webview_contextmenu_phone_clipboard_label">Número</string>
<!-- NEW: <string name="webview_contextmenu_email_send_action">Send mail</string>-->
<!-- NEW: <string name="webview_contextmenu_email_save_action">Save to Contacts</string>-->
<!-- NEW: <string name="webview_contextmenu_email_copy_action">Copy email address to clipboard</string>-->
<!-- NEW: <string name="webview_contextmenu_email_clipboard_label">Email address</string>-->
<string name="webview_contextmenu_email_send_action">Enviar email</string>
<string name="webview_contextmenu_email_save_action">Salvar nos contatos</string>
<string name="webview_contextmenu_email_copy_action">Copiar endereço de email</string>
<string name="webview_contextmenu_email_clipboard_label">Endereço email</string>
<!-- NEW: <string name="image_saved_as">Saved image as \"<xliff:g id="filename">%s</xliff:g>\"</string>-->
<!-- NEW: <string name="image_saving_failed">Saving the image failed.</string>-->
<string name="image_saved_as">Imagem salva como \"<xliff:g id="filename">%s</xliff:g>\"</string>
<string name="image_saving_failed">Falha ao salvar imagem.</string>
</resources>

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

@ -31,7 +31,7 @@
\n * систематизация сообщений;
\n * электронные подписи в почте;
\n * СК Себе;
\n * подписки к папкам
\n * подписки к папкам;
\n * синхронизация всех папок;
\n * конфигурация возвратного адреса;
\n * сочетания клавиш на аппаратной клавиатуре;
@ -324,7 +324,7 @@ http://k9mail.googlecode.com/
<string name="global_settings_notification_hide_subject_always">Всегда</string>
<string name="global_settings_batch_buttons">Кнопки групповой обработки</string>
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<string name="global_settings_batch_buttons_summary">Настройка списка кнопок групповой обработки</string>
<string name="global_settings_mark_read">Пометить как прочитанное/непрочитанное</string>
<string name="global_settings_delete">Удалить</string>
<string name="global_settings_archive">Переместить в архив</string>
@ -463,18 +463,18 @@ http://k9mail.googlecode.com/
<string name="account_setup_options_mail_check_frequency_3hour">Раз в 3 часа</string>
<string name="account_setup_options_mail_check_frequency_6hour">Раз в 6 часов</string>
<string name="account_setup_options_mail_check_frequency_12hour">Раз в 12 часов</string>
<string name="account_setup_options_mail_check_frequency_24hour">Раз в 24 часа</string>
<string name="account_setup_options_mail_check_frequency_24hour">Раз в сутки</string>
<string name="push_poll_on_connect_label">Запрашивать при соединении с Push Mail</string>
<string name="account_setup_options_enable_push_label">Использовать Push Mail</string>
<string name="account_setup_options_enable_push_summary">Если ваш сервер поддерживает такую возможность, новые сообщения появляются мгновенно. Эта опция может существенно улучшить или ухудшить скорость и эффективность всей системы.</string>
<string name="idle_refresh_period_label">Обновлять неактивное соединение</string>
<string name="idle_refresh_period_1min">Раз в минуту</string>
<string name="idle_refresh_period_2min">Раз в 2 минут</string>
<string name="idle_refresh_period_3min">Раз в 3 минут</string>
<string name="idle_refresh_period_2min">Раз в 2 минуты</string>
<string name="idle_refresh_period_3min">Раз в 3 минуты</string>
<string name="idle_refresh_period_6min">Раз в 6 минут</string>
<string name="idle_refresh_period_12min">Раз в 12 минут</string>
<string name="idle_refresh_period_24min">Раз в 24 минут</string>
<string name="idle_refresh_period_24min">Раз в 24 минуты</string>
<string name="idle_refresh_period_36min">Раз в 36 минут</string>
<string name="idle_refresh_period_48min">Раз в 48 минут</string>
<string name="idle_refresh_period_60min">Раз в час</string>
@ -605,8 +605,8 @@ http://k9mail.googlecode.com/
<string name="account_settings_message_age_1">за 2 последних дня</string>
<string name="account_settings_message_age_2">за 3 последних дня</string>
<string name="account_settings_message_age_7">за последнюю неделю</string>
<string name="account_settings_message_age_14">за 2 последних недели</string>
<string name="account_settings_message_age_21">за 3 последних недели</string>
<string name="account_settings_message_age_14">за 2 последние недели</string>
<string name="account_settings_message_age_21">за 3 последние недели</string>
<string name="account_settings_message_age_1_month">за последний месяц</string>
<string name="account_settings_message_age_2_months">за 2 последних месяца</string>
<string name="account_settings_message_age_3_months">за 3 последних месяца</string>

6
res/xml/account_settings_preferences.xml
View File

@ -174,12 +174,6 @@
android:entryValues="@array/account_setup_expunge_policy_values"
android:dialogTitle="@string/account_setup_expunge_policy_label" />
<CheckBoxPreference
android:persistent="false"
android:title="@string/account_setup_incoming_save_all_headers_title"
android:key="account_save_all_headers"
android:summary="@string/account_setup_incoming_save_all_headers_label" />
<PreferenceScreen
android:key="incoming"
android:title="@string/account_settings_incoming_label"

6
res/xml/global_preferences.xml
View File

@ -109,6 +109,12 @@
android:entryValues="@array/settings_preview_lines_values"
android:dialogTitle="@string/global_settings_preview_lines_label"
/>
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_checkboxes"
android:title="@string/global_settings_checkbox_label"
android:summary="@string/global_settings_checkbox_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messagelist_show_correspondent_names"

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

@ -167,6 +167,7 @@ public class K9 extends Application {
NEVER
}
private static boolean mMessageListCheckboxes = false;
private static int mMessageListPreviewLines = 2;
private static boolean mShowCorrespondentNames = true;
@ -442,7 +443,7 @@ public class K9 extends Application {
editor.putBoolean("messageListSenderAboveSubject", mMessageListSenderAboveSubject);
editor.putBoolean("hideSpecialAccounts", mHideSpecialAccounts);
editor.putInt("messageListPreviewLines", mMessageListPreviewLines);
editor.putBoolean("messageListCheckboxes", mMessageListCheckboxes);
editor.putBoolean("showCorrespondentNames", mShowCorrespondentNames);
editor.putBoolean("showContactName", mShowContactName);
editor.putBoolean("changeRegisteredNameColor", mChangeContactNameColor);
@ -593,6 +594,7 @@ public class K9 extends Application {
mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
mHideSpecialAccounts = sprefs.getBoolean("hideSpecialAccounts", false);
mMessageListSenderAboveSubject = sprefs.getBoolean("messageListSenderAboveSubject", false);
mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", false);
mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
@ -888,6 +890,15 @@ public class K9 extends Application {
mMessageListPreviewLines = lines;
}
public static boolean messageListCheckboxes() {
return mMessageListCheckboxes;
}
public static void setMessageListCheckboxes(boolean checkboxes) {
mMessageListCheckboxes = checkboxes;
}
public static boolean showCorrespondentNames() {
return mShowCorrespondentNames;
}

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

@ -734,13 +734,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
if (mAction != Action.EDIT_DRAFT) {
String bccAddress = mAccount.getAlwaysBcc();
if ((bccAddress != null) && !("".equals(bccAddress))) {
String[] bccAddresses = bccAddress.split(",");
for (String oneBccAddress : bccAddresses) {
addAddress(mBccView, new Address(oneBccAddress, ""));
}
}
addAddresses(mBccView, mAccount.getAlwaysBcc());
}
updateTitle();
@ -1132,6 +1126,15 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
}
private void addAddresses(MultiAutoCompleteTextView view, String addresses) {
if (StringUtils.isNullOrEmpty(addresses)) {
return;
}
for (String address : addresses.split(",")) {
addAddress(view, new Address(address, ""));
}
}
private void addAddresses(MultiAutoCompleteTextView view, Address[] addresses) {
if (addresses == null) {
return;
@ -2067,6 +2070,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mIdentityChanged = true;
mDraftNeedsSaving = true;
updateFrom();
updateBcc();
updateSignature();
updateMessageFormat();
}
@ -2075,6 +2079,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mChooseIdentityButton.setText(mIdentity.getEmail());
}
private void updateBcc() {
if (mIdentityChanged) {
mBccWrapper.setVisibility(View.VISIBLE);
}
mBccView.setText("");
addAddresses(mBccView, mAccount.getAlwaysBcc());
}
private void updateSignature() {
if (mIdentity.getSignatureUse()) {
mSignatureView.setText(mIdentity.getSignature());

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

@ -398,6 +398,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
onEditPrefs();
return true;
}
case R.id.search: {
mMessageListFragment.onSearchRequested();
return true;
}
case R.id.search_remote: {
mMessageListFragment.onRemoteSearch();
return true;
@ -453,6 +457,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
return;
}
menu.findItem(R.id.search).setVisible(false);
menu.findItem(R.id.search_remote).setVisible(false);
if (mMessageListFragment == null) {
@ -482,6 +487,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
}
} else {
menu.findItem(R.id.search).setVisible(true);
menu.findItem(R.id.folder_settings).setVisible(true);
menu.findItem(R.id.account_settings).setVisible(true);
@ -606,7 +612,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
MessageListFragment fragment = MessageListFragment.newInstance(tmpSearch, false, false);
addMessageListFragment(fragment);
addMessageListFragment(fragment, true);
}
@Override
@ -655,14 +661,16 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
public void remoteSearch(String searchAccount, String searchFolder, String queryString) {
MessageListFragment fragment = MessageListFragment.newInstance(mSearch, false, true);
addMessageListFragment(fragment);
mMenu.findItem(R.id.search_remote).setVisible(false);
addMessageListFragment(fragment, false);
}
private void addMessageListFragment(MessageListFragment fragment) {
private void addMessageListFragment(MessageListFragment fragment, boolean addToBackStack) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.message_list_container, fragment);
ft.addToBackStack(null);
if (addToBackStack)
ft.addToBackStack(null);
mMessageListFragment = fragment;
ft.commit();
@ -693,6 +701,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
tmpSearch.or(new SearchCondition(Searchfield.ID, Attribute.EQUALS, String.valueOf(threadRootId)));
MessageListFragment fragment = MessageListFragment.newInstance(tmpSearch, false, false);
addMessageListFragment(fragment);
addMessageListFragment(fragment, true);
}
}

1
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -101,7 +101,6 @@ public class AccountSettings extends K9PreferenceActivity {
private static final String PREFERENCE_NOTIFICATION_UNREAD_COUNT = "notification_unread_count";
private static final String PREFERENCE_MESSAGE_AGE = "account_message_age";
private static final String PREFERENCE_MESSAGE_SIZE = "account_autodownload_size";
private static final String PREFERENCE_SAVE_ALL_HEADERS = "account_save_all_headers";
private static final String PREFERENCE_MESSAGE_FORMAT = "message_format";
private static final String PREFERENCE_MESSAGE_READ_RECEIPT = "message_read_receipt";
private static final String PREFERENCE_QUOTE_PREFIX = "account_quote_prefix";

33
src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View File

@ -160,18 +160,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
authTypesAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mAuthTypeView.setAdapter(authTypesAdapter);
/*
* Updates the port when the user changes the security type. This allows
* us to show a reasonable default which the user can change.
*/
mSecurityTypeView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
updatePortFromSecurityType();
}
public void onNothingSelected(AdapterView<?> parent) { /* unused */ }
});
/*
* Calls validateFields() which enables or disables the Next button
* based on the fields' validity.
@ -294,12 +282,33 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
throw new Exception("Unknown account type: " + mAccount.getStoreUri());
}
// Select currently configured security type
for (int i = 0; i < CONNECTION_SECURITY_TYPES.length; i++) {
if (CONNECTION_SECURITY_TYPES[i] == settings.connectionSecurity) {
SpinnerOption.setSpinnerOptionValue(mSecurityTypeView, i);
}
}
/*
* Updates the port when the user changes the security type. This allows
* us to show a reasonable default which the user can change.
*
* Note: It's important that we set the listener *after* an initial option has been
* selected by the code above. Otherwise the listener might be called after
* onCreate() has been processed and the current port value set later in this
* method is overridden with the default port for the selected security type.
*/
mSecurityTypeView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position,
long id) {
updatePortFromSecurityType();
}
@Override
public void onNothingSelected(AdapterView<?> parent) { /* unused */ }
});
mCompressionMobile.setChecked(mAccount.useCompression(Account.TYPE_MOBILE));
mCompressionWifi.setChecked(mAccount.useCompression(Account.TYPE_WIFI));
mCompressionOther.setChecked(mAccount.useCompression(Account.TYPE_OTHER));

35
src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
View File

@ -137,19 +137,6 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
authTypesAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mAuthTypeView.setAdapter(authTypesAdapter);
/*
* Updates the port when the user changes the security type. This allows
* us to show a reasonable default which the user can change.
*/
mSecurityTypeView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
updatePortFromSecurityType();
}
public void onNothingSelected(AdapterView<?> parent) {
}
});
/*
* Calls validateFields() which enables or disables the Next button
* based on the fields' validity.
@ -223,13 +210,33 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
}
}
// Select currently configured security type
for (int i = 0; i < smtpSchemes.length; i++) {
if (smtpSchemes[i].equals(uri.getScheme())) {
SpinnerOption.setSpinnerOptionValue(mSecurityTypeView, i);
}
}
/*
* Updates the port when the user changes the security type. This allows
* us to show a reasonable default which the user can change.
*
* Note: It's important that we set the listener *after* an initial option has been
* selected by the code above. Otherwise the listener might be called after
* onCreate() has been processed and the current port value set later in this
* method is overridden with the default port for the selected security type.
*/
mSecurityTypeView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position,
long id) {
updatePortFromSecurityType();
}
@Override
public void onNothingSelected(AdapterView<?> parent) { /* unused */ }
});
if (uri.getHost() != null) {
mServerView.setText(uri.getHost());
}

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

@ -59,6 +59,7 @@ public class Prefs extends K9PreferenceActivity {
private static final String PREFERENCE_MEASURE_ACCOUNTS = "measure_accounts";
private static final String PREFERENCE_COUNT_SEARCH = "count_search";
private static final String PREFERENCE_HIDE_SPECIAL_ACCOUNTS = "hide_special_accounts";
private static final String PREFERENCE_MESSAGELIST_CHECKBOXES = "messagelist_checkboxes";
private static final String PREFERENCE_MESSAGELIST_PREVIEW_LINES = "messagelist_preview_lines";
private static final String PREFERENCE_MESSAGELIST_SENDER_ABOVE_SUBJECT = "messagelist_sender_above_subject";
private static final String PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES = "messagelist_show_correspondent_names";
@ -105,6 +106,7 @@ public class Prefs extends K9PreferenceActivity {
private CheckBoxPreference mHideSpecialAccounts;
private ListPreference mPreviewLines;
private CheckBoxPreference mSenderAboveSubject;
private CheckBoxPreference mCheckboxes;
private CheckBoxPreference mShowCorrespondentNames;
private CheckBoxPreference mShowContactName;
private CheckBoxPreference mChangeContactNameColor;
@ -223,6 +225,9 @@ public class Prefs extends K9PreferenceActivity {
mSenderAboveSubject = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SENDER_ABOVE_SUBJECT);
mSenderAboveSubject.setChecked(K9.messageListSenderAboveSubject());
mCheckboxes = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_CHECKBOXES);
mCheckboxes.setChecked(K9.messageListCheckboxes());
mShowCorrespondentNames = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES);
mShowCorrespondentNames.setChecked(K9.showCorrespondentNames());
@ -417,6 +422,7 @@ public class Prefs extends K9PreferenceActivity {
K9.setCountSearchMessages(mCountSearch.isChecked());
K9.setHideSpecialAccounts(mHideSpecialAccounts.isChecked());
K9.setMessageListPreviewLines(Integer.parseInt(mPreviewLines.getValue()));
K9.setMessageListCheckboxes(mCheckboxes.isChecked());
K9.setShowCorrespondentNames(mShowCorrespondentNames.isChecked());
K9.setMessageListSenderAboveSubject(mSenderAboveSubject.isChecked());
K9.setShowContactName(mShowContactName.isChecked());

43
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -48,6 +48,9 @@ import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
@ -364,6 +367,7 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
private boolean mSortAscending = true;
private boolean mSortDateAscending = false;
private boolean mSenderAboveSubject = false;
private boolean mCheckboxes = true;
private int mSelectedCount = 0;
private Set<Long> mSelected = new HashSet<Long>();
@ -667,6 +671,7 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
mController = MessagingController.getInstance(getActivity().getApplication());
mPreviewLines = K9.messageListPreviewLines();
mCheckboxes = K9.messageListCheckboxes();
decodeArguments();
}
@ -1556,6 +1561,14 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
holder.preview.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListPreview());
holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
if (mCheckboxes) {
holder.selected.setOnCheckedChangeListener(holder);
holder.selected.setVisibility(View.VISIBLE);
} else {
holder.selected.setVisibility(View.GONE);
}
view.setTag(holder);
return view;
@ -1634,13 +1647,26 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
long uniqueId = cursor.getLong(mUniqueIdColumn);
boolean selected = mSelected.contains(uniqueId);
if (selected) {
if (!mCheckboxes && selected) {
holder.chip.setBackgroundDrawable(account.getCheckmarkChip().drawable());
} else {
holder.chip.setBackgroundDrawable(account.generateColorChip(read, toMe, ccMe,
fromMe, flagged).drawable());
}
if (mCheckboxes) {
// Set holder.position to -1 to avoid MessageViewHolder.onCheckedChanged() toggling
// the selection state when setChecked() is called below.
holder.position = -1;
// Only set the UI state, don't actually toggle the message selection.
holder.selected.setChecked(selected);
// Now save the position so MessageViewHolder.onCheckedChanged() will know what
// message to (de)select.
holder.position = cursor.getPosition();
}
// Background indicator
if (K9.useBackgroundAsUnreadIndicator()) {
int res = (read) ? R.attr.messageListReadItemBackgroundColor :
@ -1730,7 +1756,7 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
}
class MessageViewHolder {
class MessageViewHolder implements OnCheckedChangeListener {
public TextView subject;
public TextView preview;
public TextView from;
@ -1738,6 +1764,15 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
public TextView date;
public View chip;
public TextView threadCount;
public CheckBox selected;
public int position = -1;
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (position != -1) {
toggleMessageSelectWithAdapterPosition(position);
}
}
}
@ -1855,6 +1890,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
return;
}
toggleMessageSelectWithAdapterPosition(adapterPosition);
}
private void toggleMessageSelectWithAdapterPosition(int adapterPosition) {
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
long uniqueId = cursor.getLong(mUniqueIdColumn);

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

@ -137,6 +137,9 @@ public class GlobalSettings {
s.put("measureAccounts", Settings.versions(
new V(1, new BooleanSetting(true))
));
s.put("messageListCheckboxes", Settings.versions(
new V(1, new BooleanSetting(false))
));
s.put("messageListPreviewLines", Settings.versions(
new V(1, new IntegerRangeSetting(1, 100, 2))
));