1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-07 11:48:07 -05:00

Merge commit '4.118' into issue-162-new

Conflicts:
	src/com/fsck/k9/K9.java

trivial conflict.

removed duplicate javadoc entry in build.xml
This commit is contained in:
ashley willis 2012-09-11 01:24:11 -05:00
commit fe0088bed3
24 changed files with 1818 additions and 855 deletions

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="15016"
android:versionName="4.117" package="com.fsck.k9"
android:versionCode="15017"
android:versionName="4.118" package="com.fsck.k9"
>
<uses-sdk
android:minSdkVersion="7"

View File

@ -202,18 +202,30 @@
<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> eclipse: Apply template Eclipse settings</echo>
<echo> javadoc: Create javadoc. Requires ANDROID_HOME environment</echo>
<echo> variable to be set (i.e. /opt/android-sdk-update-manager/)</echo>
</target>
<target name="javadoc" description="Build Javadoc from Java source files">
<javadoc destdir="javadoc/" access="private">
<fileset includes="**/*.java" dir="src"/>
</javadoc>
</target>
<target name="eclipse" description="Apply template Eclipse settings">
<copy todir=".settings">
<fileset dir="tools/eclipse-settings"/>
</copy>
</target>
<property environment="env" />
<target name="javadoc" description="build javadoc">
<javadoc
destdir="javadoc"
doctitle="K-9 Mail"
verbose="on"
use="true"
classpath="${env.ANDROID_HOME}/platforms/android-15/android.jar"
sourcepath="gen;src"
linkoffline="http://d.android.com/reference ${env.ANDROID_HOME}/docs/reference/"
stylesheetfile="${env.ANDROID_HOME}/docs/assets/android-developer-docs.css"
/>
<copy file="${env.ANDROID_HOME}/docs/assets/android-developer-core.css" todir="javadoc" />
</target>
<!-- END K-9 STUFF-->
<import file="${sdk.dir}/tools/ant/build.xml" />

19
res/values-iw/plurals.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<plurals name="dialog_confirm_spam_message">
<item quantity="other">אתה בטוח שאתה רוצה להעביר %1$d הודעות לתיקיית דואר הזבל?</item>
<item quantity="one">אתה בטוח שאתה רוצה להעביר את ההודעות האלו לתיקיית דואר הזבל?</item>
</plurals>
<plurals name="settings_import_success">
<item quantity="other">%s חשבונות</item>
<item quantity="one">חשבון 1</item>
</plurals>
<plurals name="settings_import_server_passwords">
<item quantity="other">סיסמת שרת</item>
<item quantity="one">סיסמת שרת</item>
</plurals>
<plurals name="settings_import_setting_passwords">
<item quantity="other">מגדיר סיסמא....</item>
<item quantity="one">מגדיר סיסמא....</item>
</plurals>
</resources>

890
res/values-iw/strings.xml Normal file
View File

@ -0,0 +1,890 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_authors_fmt">מפתחים: %s</string>
<string name="app_libraries">"אנחנו משתמשים בספריות הבאות של ספקים חיצוניים: %s"</string>
<string name="app_emoji_icons">Emoji icons: %s</string>
<string name="read_attachment_label">קרא הקבצים המצורפים לדוא"ל</string>
<string name="read_attachment_desc">אפשר ליישום זה לקרוא את קבצים המצורפים לדוא"ל שלך.</string>
<string name="read_messages_label">קרא אימיילים</string>
<string name="read_messages_desc">אפשר ליישום זה לקרוא את האימיילים שלכם.</string>
<string name="delete_messages_label">מחק אימיילים</string>
<string name="delete_messages_desc">אפשר ליישום זה למחוק את האימיילים שלכם.</string>
<string name="about_title_fmt">אודות %s</string>
<string name="accounts_title">חשבונות</string>
<string name="advanced">מתקדם</string>
<string name="folder_list_title">%s</string>
<string name="shortcuts_title">חשבונות K-9</string>
<string name="message_list_title" formatted="false">%s:%s</string>
<string name="compose_title">חבר</string>
<string name="debug_title">איתור באגים</string>
<string name="choose_folder_title">בחר תיקייה</string>
<string name="choose_color_title">בחר צבע</string>
<string name="activity_header_format" formatted="false">%s%s%s</string>
<string name="activity_unread_count">" [%d]"</string>
<string name="status_loading_account_folder" formatted="false">" (Poll %s:%s%s)"</string>
<string name="status_loading_account_folder_headers" formatted="false">" (Fetching headers %s:%s%s)"</string>
<string name="status_sending_account" formatted="false">" (שולח... %s%s)"</string>
<string name="status_processing_account" formatted="false">" (Proc %s:%s%s)"</string>
<string name="folder_progress" formatted="false">" %s/%s"</string>
<string name="status_next_poll">" (Next poll @ %s)"</string>
<string name="status_syncing_off">" (הסנכרון מושבת)"</string>
<string name="next_action">הבא</string>
<string name="previous_action">הקודם</string>
<string name="okay_action">אישור</string>
<string name="cancel_action">ביטול</string>
<string name="send_action">שלח</string>
<string name="send_again_action">שלח שוב</string>
<string name="select_action">בחר</string>
<string name="deselect_action">בטל בחירה</string>
<string name="reply_action">השב</string>
<string name="reply_all_action">השב על הכל</string>
<string name="delete_action">מחק</string>
<string name="archive_action">ארכיון</string>
<string name="spam_action">דואר זבל</string>
<string name="delete_all_action">נקה תיקייה</string>
<string name="forward_action">קדימה</string>
<string name="move_action">העבר</string>
<string name="continue_action">המשך</string>
<string name="done_action">סיום</string>
<string name="remove_action">מחק</string>
<string name="discard_action">השלך</string>
<string name="save_draft_action">שמור כטיוטה</string>
<string name="retry_action">נסה שוב</string>
<string name="refresh_action">רענן</string>
<string name="check_mail_action">בדוק דואר</string>
<string name="send_messages_action">שלח הודעות</string>
<string name="list_folders_action">רשימת תיקיות</string>
<string name="refresh_folders_action">רענן תיקיות</string>
<string name="mark_all_as_read_action">סמן כל ההודעות כנקראו</string>
<string name="add_account_action">הוסף חשבון</string>
<string name="compose_action">חבר</string>
<string name="search_action">חפש</string>
<string name="search_results">תוצאות חיפוש</string>
<string name="preferences_action">הגדרות</string>
<string name="open_action">פתח</string>
<string name="account_settings_action">הגדרות חשבון</string>
<string name="folder_settings_action">הגדרות תיקייה</string>
<string name="global_settings_action">הגדרות כלליות</string>
<string name="remove_account_action">מחק חשבון</string>
<string name="clear_pending_action">נקה פעולות ממתינות(סכנה!)</string>
<string name="accounts_action">חשבונות</string>
<string name="back_to_accounts_action"></string>
<string name="back_to_folder_list_action"></string>
<string name="read_action">קרא</string>
<string name="mark_as_read_action">סמן כנקרא</string>
<string name="send_alternate_action">שתף</string>
<string name="send_alternate_chooser_title">בחר את השולח</string>
<string name="mark_all_as_read_dlg_title">סימון כל ההודעות כנקראו</string>
<string name="mark_all_as_read_dlg_instructions_fmt">"סמן את כל ההודעות שב '%s' כנקראו?? (כולל את ההודעות בתיקיות שאינן מוצגות ב K-9)"</string>
<string name="flag_action">הוסף כוכב</string>
<string name="unflag_action">מחק כוכב</string>
<string name="copy_action">העתק</string>
<string name="show_full_header_action">הצג כותרת מלאה</string>
<string name="hide_full_header_action">הסתר כותרת מלאה</string>
<string name="select_text_action">בחר טקסט</string>
<string name="mark_as_unread_action">סמן כלא נקרא</string>
<string name="move_to_action">העבר ל</string>
<string name="folders_action">תיקיות</string>
<string name="view_hide_details_action">הצג/הסתר פרטים</string>
<string name="add_cc_bcc_action">הוסף עותק / עותק מוסתר</string>
<string name="edit_subject_action">ערוך נושא</string>
<string name="read_receipt">אישור קריאה</string>
<string name="read_receipt_enabled">נדרש אישור לקריאה</string>
<string name="read_receipt_disabled">לא נדרש אישור קריאה</string>
<string name="add_attachment_action">צרף קובץ</string>
<string name="add_attachment_action_image">הוסף קובץ (תמונה)</string>
<string name="add_attachment_action_video">הוסף קובת (וידאו)</string>
<string name="dump_settings_action">הגדרות מחיקה</string>
<string name="empty_trash_action">רוקן אשפה</string>
<string name="expunge_action">רוקן</string>
<string name="clear_local_folder_action">נקה הודעות מקומיות</string>
<string name="set_sort_action">בחר מיון</string>
<string name="reverse_sort_action">מיון הפוך</string>
<string name="about_action">אודות</string>
<string name="prefs_title">הגדרות</string>
<string name="accounts_context_menu_title">אפשרויות חשבון</string>
<string name="folder_context_menu_title">אפשרויות תיקייה</string>
<string name="general_no_subject">(ללא כותרת)</string>
<string name="general_no_date">ללא תאריך</string>
<string name="general_no_sender">ללא שולח</string>
<string name="status_loading">Polling</string>
<string name="status_loading_folder" formatted="false">(Poll %s%s)</string>
<string name="status_loading_more">טוען הודעות</string>
<string name="status_network_error">שגיאת חיבור</string>
<string name="status_invalid_id_error">לא נמצאו הודעות</string>
<string name="status_error">שגיאה</string>
<string name="status_sending">שולח....</string>
<string name="status_loading_more_failed">נסה שוב לטעון הודעות נוספות</string>
<string name="load_more_messages_fmt">Load up to %d more</string>
<string name="abbrev_gigabytes">GB</string>
<string name="abbrev_megabytes">MB</string>
<string name="abbrev_kilobytes">KB</string>
<string name="abbrev_bytes">B</string>
<string name="account_size_changed" formatted="false">חשבון \"%s\" נדחס ל %s to %s</string>
<string name="compacting_account">דחיסת חשבון</string>
<string name="clearing_account">מנקה חשבון \"%s\"</string>
<string name="recreating_account">יוצר מחדש חשבון \"%s\"</string>
<string name="notification_new_title">מייל חדש</string>
<string name="notification_new_scrolling">מייל חדש מ %s</string>
<string name="notification_new_one_account_fmt" formatted="false">%d לא נקראו (%s)</string>
<string name="notification_new_one_account_unknown_unread_count_fmt" formatted="false">%d הודעות חדשות (%s)</string>
<string name="notification_new_multi_account_fmt">ב %d חשבונות</string>
<string name="notification_unsent_title">ההודעה לא נשלחה</string>
<string name="notification_bg_sync_ticker" formatted="false">בודק דוא\"ל: %s:%s</string>
<string name="notification_bg_sync_title">בודק דוא\"ל</string>
<string name="notification_bg_send_ticker">שולח דוא\"ל: %s</string>
<string name="notification_bg_send_title">שולח דוא\"ל</string>
<string name="notification_bg_title_separator">:</string>
<string name="special_mailbox_name_inbox">דואר נכנס</string>
<string name="special_mailbox_name_outbox">דואר יוצא</string>
<string name="special_mailbox_name_drafts">טיוטות</string>
<string name="special_mailbox_name_trash">אשפה</string>
<string name="special_mailbox_name_sent">נשלחו</string>
<string name="special_mailbox_name_archive">ארכיון</string>
<string name="special_mailbox_name_spam">דואר זבל</string>
<string name="special_mailbox_name_drafts_fmt">%s (טיוטות)</string>
<string name="special_mailbox_name_trash_fmt">%s (אשפה)</string>
<string name="special_mailbox_name_sent_fmt">%s (נשלחו)</string>
<string name="special_mailbox_name_archive_fmt">%s (ארכיון)</string>
<string name="special_mailbox_name_spam_fmt">%s (דואר זבל)</string>
<string name="send_failure_subject">נכשל בשליחת כמה הודעות</string>
<string name="send_failure_body_abbrev">ראה את התיקיות שלך %s לפרטים.</string>
<string name="send_failure_body_fmt">"K-9 נתקל בבעיה לשלוח כמה הודעות שלך. עם זאת, בשל אופייה של הבעיה, K-9 לא יכול להיות בטוח אם ההודעות נשלחו או לא. ייתכן שהנמענים כבר קיבלו עותקים של ההודעה.
המסרים שעבורם זה סוג של בעיה שחלו עכשיו מסומנים בכוכב בתיבת הדואר היוצא. אם תסיר את הכוכבים, K-9 ינסה לשלוח את ההודעות שוב. לחיצה ארוכה על תיבת הדואר היוצא כדי לאתר את פעולת \ "ההודעות שנשלחו\" על מנת ליצור ניסיון נוסף לשלוח.
התיקייה% s עשויה להכיל הודעות שגיאה לגבי הכישלונות ".</string>
<string name="alert_header">K-9 התראה</string>
<string name="no_connection_alert">סינכרון ושליחה הופסק עקב כך שאין רשת.</string>
<string name="end_of_folder">אין עוד הודעות</string>
<string name="accounts_welcome">"ברוכים הבאים ל-K-9 הגדרת דואר. K-9 הוא קוד פתוח של תוכנת מייל לאנדרואיד המבוססת במקור על תוכנת המייל הסטנדרטית של האנדרואיד
תכונות משופרות של K-9 כוללת:
* דחוף דואר באמצעות IMAP IDLE
* ביצועים טובים יותר
* הודעה refiling
* חתימות דוא"ל
* עותק מוסתר אל עצמי
* תיקיות מנויים
* כל התיקיות מסונכרנות
* חזור- כתובת תצורה
* מקלדת קיצורי דרך
* תמיכה טובה יותר ב-IMAP
* שמירת קבצים מצורפים אל SD
* רוקן אשפה
* מיון הודעת
* ועוד ...
לידיעתך, K-9 אינו תומך ברוב חשבונות Hotmail החינמיים, כמו תוכנות דואר רבות, יש כמה מוזרויות כאשר מדברים על Microsoft Exchange.
נא לשלוח דיווחי באגים, לתרום תכונות חדשות ולשאול שאלות על http://k9mail.googlecode.com/ "</string>
<string name="debug_version_fmt">גרסא: %s</string>
<string name="debug_enable_debug_logging_title">אפשר רישום איתור באגים</string>
<string name="debug_enable_debug_logging_summary">יומן ניתוח מידע נוסף</string>
<string name="debug_enable_sensitive_logging_title">יומן מידע רגיש</string>
<string name="debug_enable_sensitive_logging_summary">עשוי להציג סיסמאות ביומן.</string>
<string name="message_header_mua">K-9 mail עבור אנדרואיד</string>
<string name="combined_inbox_title">כל הדואר</string>
<string name="combined_inbox_label">הודעות אחרונות מכל החשבונות</string>
<string name="combined_inbox_list_title">כל הדואר הנכנס</string>
<string name="message_list_title_fmt" formatted="false">%s:%s %s %s %s %s</string>
<string name="message_list_load_more_messages_action">טען עוד הודעות</string>
<string name="message_to_fmt">ל:%s</string>
<string name="message_list_delete_action">מחק</string>
<string name="message_list_mark_read_action">סמן שנקרא</string>
<string name="message_list_mark_unread_action">סמן כלא נקרא</string>
<string name="message_list_flag_action">הוסף כוכב</string>
<string name="message_list_unflag_action">מחק כוכב</string>
<string name="message_compose_to_hint">ל</string>
<string name="message_compose_cc_hint">עותק</string>
<string name="message_compose_bcc_hint">עותק מוסתר</string>
<string name="message_compose_subject_hint">נושא</string>
<string name="message_compose_content_hint">הודעת טקסט</string>
<string name="message_compose_quote_header_separator">-------- ההודעה המורית --------</string>
<string name="message_compose_quote_header_subject">נושא:</string>
<string name="message_compose_quote_header_send_date">נשלח:</string>
<string name="message_compose_quote_header_from">מ:</string>
<string name="message_compose_quote_header_to">ל:</string>
<string name="message_compose_quote_header_cc">Cc:</string>
<string name="message_compose_reply_header_fmt">"%s כותב:
"</string>
<string name="message_compose_quoted_text_label">טקסט מצוטט</string>
<string name="message_compose_error_no_recipients">עליך להוסיף לפחות נמען אחד.</string>
<string name="error_contact_address_not_found">לא ניתן למצוא כתובת דוא\"ל.</string>
<string name="message_compose_downloading_attachments_toast">קבצים מסוימים לא הורדו. הם יורדו אוטומטית לפני שליחת ההודעה.</string>
<string name="message_compose_attachments_skipped_toast">קבצים מסוימים אינם ניתנים להעברה בגלל שהם לא הורדו.</string>
<string name="message_compose_show_quoted_text_action">צטט הודעה</string>
<string name="message_view_from_format" formatted="false">מ: %s &lt;%s&gt;</string>
<string name="message_to_label">ל:</string>
<string name="message_view_cc_label">עותק:</string>
<string name="message_view_attachment_view_action">פתח</string>
<string name="message_view_attachment_download_action">שמור</string>
<string name="message_view_prev_action"></string>
<string name="message_view_next_action"></string>
<string name="message_view_archive_action">ארכיון</string>
<string name="message_view_move_action">העבר</string>
<string name="message_view_spam_action">דואר זבל</string>
<string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
<string name="message_view_status_attachment_saved">הקובץ המצורף נשמר בכרטיס ה SD בתור %s.</string>
<string name="message_view_status_attachment_not_saved">אין אפשרות לשמור את הקובץ המצורף לכרטיס ה SD.</string>
<string name="message_view_show_pictures_instructions">בחר \ "הצג תמונות \" כדי להציג תמונות מוטבעות.</string>
<string name="message_view_show_pictures_action">הצג תמונות</string>
<string name="message_view_fetching_attachment_toast">מוריד קובץ מצורף.</string>
<string name="message_view_no_viewer">לא ניתן למצוא את מציג בשביל %s.</string>
<string name="message_view_download_remainder">הורד את ההודעה המלאה</string>
<string name="message_additional_headers_not_downloaded">"לא כל הכותרות הורדו או נשמרו. בחר \" שמור את כל הכותרות המקומיות \ "בהגדרות של שרת חשבון הודעות נכנסות כדי לאפשר את זה בעתיד".</string>
<string name="message_no_additional_headers_available">כל הכותרות הורדו, אבל אין כותרות נוספות להצגה.</string>
<string name="message_additional_headers_retrieval_failed">שליפה של כותרות נוספות מהשרת של מסד הנתונים או מהדואר נכשל.</string>
<string name="mailbox_select_dlg_title">תיקיות</string>
<string name="mailbox_select_dlg_new_mailbox_action">תיקייה חדשה</string>
<string name="new_mailbox_dlg_title">שם תיקייה חדשה</string>
<string name="folder_push_active_symbol">(דחיפה)</string>
<string name="from_same_sender">עוד מהשולח הזה</string>
<string name="message_copied_toast">ההודעה הועתקה</string>
<string name="message_moved_toast">ההודעה הועברה</string>
<string name="message_deleted_toast">ההודעה נמחקה</string>
<string name="message_discarded_toast">ההודעה נמחקה</string>
<string name="message_saved_toast">ההודעה נשמרה כטיוטה</string>
<string name="message_delete_failed">ההודעה לא יכולה להימחק</string>
<string name="about_header">אודות %s</string>
<string name="about_version">גרסא: %s</string>
<string name="global_settings_flag_label">הצג כוכבים</string>
<string name="global_settings_flag_summary">הכוכבים מצביעים על ההודעות המסומנות</string>
<string name="global_settings_checkbox_label">תיבות סימון בחירה-מרובה</string>
<string name="global_settings_checkbox_summary">תמיד הצג תיבות סימון בחירה-מרובה</string>
<string name="global_settings_touchable_label">תצוגה מקדימה של הודעות</string>
<string name="global_settings_touchable_summary">רשימת פריטים רבה יותר באמצעות תצוגה מקדימה של ההודעה</string>
<string name="global_settings_preview_lines_label">קווי תצוגה מקדימה</string>
<string name="global_settings_show_correspondent_names_label">הצג שמות תואמים</string>
<string name="global_settings_show_correspondent_names_summary">הצג שמות תואמים במקום כתובות הדוא\"ל שלהם</string>
<string name="global_settings_show_contact_name_label">הצג שמות אנשי קשר</string>
<string name="global_settings_show_contact_name_summary">השתמש בשמות נמענים מתוך אנשי הקשר שלך כאשר זמין</string>
<string name="global_settings_registered_name_color_label">לצבוע את אנשי הקשר</string>
<string name="global_settings_registered_name_color_default">"אל תצבע שמות ברשימת אנשי הקשר שלך"</string>
<string name="global_settings_registered_name_color_changed">צבע שמות ברשימת אנשי הקשר שלך</string>
<string name="global_settings_messageview_fixedwidth_label">גופנים ברוחב קבוע</string>
<string name="global_settings_messageview_fixedwidth_summary">השתמש בגופן ברוחב קבוע בעת הצגת הודעות טקסט רגילות</string>
<string name="global_settings_messageview_return_to_list_label">חזור לרשימה לאחר המחיקה</string>
<string name="global_settings_messageview_return_to_list_summary">חזור אל רשימת ההודעות לאחר מחיקת הודעה</string>
<string name="global_settings_messageview_show_next_label">הצג את ההודעה הבאה אחרי מחיקה</string>
<string name="global_settings_messageview_show_next_summary">הצג את הודעה הבאה כברירת מחדל לאחר מחיקת הודעה</string>
<string name="global_settings_confirm_actions_title">אישור פעולות</string>
<string name="global_settings_confirm_actions_summary">הצג דו שיח בכל פעם שאתה מבצע את פעולות הנבחרות</string>
<string name="global_settings_confirm_action_archive">ארכיון</string>
<string name="global_settings_confirm_action_delete">מחק (צפה בהודעה בלבד)</string>
<string name="global_settings_confirm_action_spam">דואר זבל</string>
<string name="global_settings_confirm_action_mark_all_as_read">סמן הכל כנקרא</string>
<string name="global_settings_confirm_action_send">שלח</string>
<string name="global_settings_privacy_mode_title">התראות במסך נעול</string>
<string name="global_settings_privacy_mode_summary">"אל תציג את נושא ההודעה בשורת ההתראות כאשר המערכת נעולה"</string>
<string name="quiet_time">שעות שקט</string>
<string name="quiet_time_description">השבת צלצול, זמזום והבהוב בלילה</string>
<string name="quiet_time_starts">התחלת שעות שקט</string>
<string name="quiet_time_ends">סוף זמן שקט</string>
<string name="account_setup_basics_title">הגדר חשבון חדש</string>
<string name="account_setup_basics_instructions">"הזן את כתובת הדוא\"ל של החשבון הזה:"</string>
<string name="account_setup_basics_instructions2_fmt">(ניתן להוסיף עוד %d חשבונות.)</string>
<string name="account_setup_basics_email_hint">כתובת דוא\"ל</string>
<string name="account_setup_basics_email_error_invalid_fmt">אינה כתובת דוא\"ל חוקית.</string>
<string name="account_setup_basics_email_error_duplicate_fmt">%s כבר נוסף.</string>
<string name="account_setup_basics_password_hint">סיסמא</string>
<string name="account_setup_basics_default_label">הוראות הגדרה</string>
<string name="account_setup_basics_manual_setup_action">הוראות הגדרה</string>
<string name="account_setup_check_settings_title" />
<string name="account_setup_check_settings_retr_info_msg">מאחזר מידע חשבון ...</string>
<string name="account_setup_check_settings_check_incoming_msg">בדיקת הגדרות שרת הדואר הנכנס ...</string>
<string name="account_setup_check_settings_check_outgoing_msg">בדיקת הגדרות שרת הדואר היוצא ...</string>
<string name="account_setup_check_settings_authenticate">מאמת ...</string>
<string name="account_setup_check_settings_fetch">מייבא הגדרות החשבון ...</string>
<string name="account_setup_check_settings_finishing_msg">מסיים.....</string>
<string name="account_setup_check_settings_canceling_msg">מבטל....</string>
<string name="account_setup_names_title">כמעט מוכן!</string>
<string name="account_setup_names_instructions">החשבון שלך מוגדר, והדואר נמצא בדרך!</string>
<string name="account_setup_names_account_name_label">תן שם לחשבון זה (לא חובה):</string>
<string name="account_setup_names_user_name_label">הקלד את שמך (מוצג בהודעות יוצאות):</string>
<string name="account_setup_finished_toast">"החשבון שלך מוגדר!
שולף דואר ... "</string>
<string name="account_setup_account_type_title">סוג חשבון</string>
<string name="account_setup_account_type_instructions">איזה סוג חשבון זה?</string>
<string name="account_setup_account_type_pop_action">POP3</string>
<string name="account_setup_account_type_imap_action">IMAP</string>
<string name="account_setup_account_type_webdav_action">חילופי (WebDAV)</string>
<string name="account_setup_incoming_title">הגדרות שרת דואר נכנס</string>
<string name="account_setup_incoming_username_label">שם משתמש</string>
<string name="account_setup_incoming_password_label">סיסמא</string>
<string name="account_setup_incoming_pop_server_label">שרת POP3</string>
<string name="account_setup_incoming_imap_server_label">שרת IMAP</string>
<string name="account_setup_incoming_webdav_server_label">שרת חילופי</string>
<string name="account_setup_incoming_port_label">Port</string>
<string name="account_setup_incoming_security_label">סוג אבטחה</string>
<string name="account_setup_incoming_auth_type_label">סוג אימות</string>
<string name="account_setup_incoming_security_none_label">כלום</string>
<string name="account_setup_incoming_security_ssl_optional_label">SSL (אם זמין)</string>
<string name="account_setup_incoming_security_ssl_label">SSL (תמיד)</string>
<string name="account_setup_incoming_security_tls_optional_label">TLS (אם זמין)</string>
<string name="account_setup_incoming_security_tls_label">TLS (תמיד)</string>
<string name="account_setup_incoming_delete_policy_label">כאשר אני מוחק הודעה</string>
<string name="account_setup_incoming_delete_policy_never_label">אל תמחוק בשרת</string>
<string name="account_setup_incoming_delete_policy_7days_label">אחרי 7 ימים</string>
<string name="account_setup_incoming_delete_policy_delete_label">מחק מהשרת</string>
<string name="account_setup_incoming_delete_policy_markread_label">סמן כנקרא בשרת</string>
<string name="account_setup_incoming_compression_label">השתמש בדחיסה ברשת:</string>
<string name="account_setup_incoming_mobile_label">סלולרי</string>
<string name="account_setup_incoming_wifi_label">Wi-Fi</string>
<string name="account_setup_incoming_other_label">אחר</string>
<string name="account_setup_incoming_save_all_headers_title">הורד כותרות</string>
<string name="account_setup_incoming_save_all_headers_label">שמור את כל כותרות ההודעות באופן מקומי</string>
<string name="local_storage_provider_external_label">אחסון חיצוני (כרטיס SD)</string>
<string name="local_storage_provider_internal_label">אחסון פנימי רגיל</string>
<string name="local_storage_provider_samsunggalaxy_label">%1$s אחסון פנימי נוסף</string>
<string name="local_storage_provider_label">מיקום האחסון</string>
<string name="account_setup_expunge_policy_label">למחוק הודעות שנמחקו</string>
<string name="account_setup_expunge_policy_immediately">מיד</string>
<string name="account_setup_expunge_policy_on_poll">When polling</string>
<string name="account_setup_expunge_policy_manual">רק באופן ידני</string>
<string name="account_setup_incoming_imap_path_prefix_label">IMAP path prefix</string>
<string name="account_setup_incoming_imap_path_prefix_hint">(שימוש אוטומטי בNAMESPACE אם קיים)</string>
<string name="drafts_folder_label">תיקיית טיוטות</string>
<string name="sent_folder_label">תיקיית הודעות שנשלחו</string>
<string name="trash_folder_label">תיקיית אשפה</string>
<string name="archive_folder_label">תיקיית ארכיון</string>
<string name="spam_folder_label">תיקיית דואר זבל</string>
<string name="account_setup_incoming_subscribed_folders_only_label">הצג רק תיקיות רשומות</string>
<string name="account_setup_auto_expand_folder">הרחב את התיקייה אוטומטית</string>
<string name="account_setup_incoming_webdav_path_prefix_label">OWA path</string>
<string name="account_setup_incoming_webdav_path_prefix_hint">לא חובה</string>
<string name="account_setup_incoming_webdav_auth_path_label">נתיב אימות</string>
<string name="account_setup_incoming_webdav_auth_path_hint">לא חובה</string>
<string name="account_setup_incoming_webdav_mailbox_path_label">כינוי תיבת דואר</string>
<string name="account_setup_incoming_webdav_mailbox_path_hint">לא חובה</string>
<string name="account_setup_outgoing_title">הגדרות שרת דואר יוצא</string>
<string name="account_setup_outgoing_smtp_server_label">שרת SMTP</string>
<string name="account_setup_outgoing_port_label">Port</string>
<string name="account_setup_outgoing_security_label">סוג אבטחה</string>
<string name="account_setup_outgoing_security_none_label">כלום</string>
<string name="account_setup_outgoing_security_ssl_label">SSL</string>
<string name="account_setup_outgoing_security_tls_optional_label">TLS (אם זמין)</string>
<string name="account_setup_outgoing_security_tls_label">TLS (תמיד)</string>
<string name="account_setup_outgoing_require_login_label">דרוש הרשמה.</string>
<string name="account_setup_outgoing_username_label">שם משתמש</string>
<string name="account_setup_outgoing_password_label">סיסמא</string>
<string name="account_setup_outgoing_authentication_label">סו אימות</string>
<string name="account_setup_outgoing_authentication_basic_label">שם משתמש &amp; סיסמא</string>
<string name="account_setup_outgoing_authentication_basic_username_label">שם משתמש</string>
<string name="account_setup_outgoing_authentication_basic_password_label">סיסמא</string>
<string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
<string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
<string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
<string name="account_setup_bad_uri">הגדרה לא חוקית: %s</string>
<string name="account_setup_options_title">אפשרויות חשבון</string>
<string name="compact_action">קומפקטי</string>
<string name="clear_action">נקה ההודעות (סכנה!)</string>
<string name="recreate_action">לשחזר נתונים (המפלט האחרון!)</string>
<string name="account_setup_options_mail_check_frequency_label">Folder poll frequency</string>
<string name="account_setup_options_mail_check_frequency_never">אפ פעם</string>
<string name="account_setup_options_mail_check_frequency_1min">כל דקה</string>
<string name="account_setup_options_mail_check_frequency_5min">כל 5 דקות</string>
<string name="account_setup_options_mail_check_frequency_10min">כל 10 דקות</string>
<string name="account_setup_options_mail_check_frequency_15min">כל 15 דקות</string>
<string name="account_setup_options_mail_check_frequency_30min">כל 30 דקות</string>
<string name="account_setup_options_mail_check_frequency_1hour">כל שעה</string>
<string name="account_setup_options_mail_check_frequency_2hour">כל שעתיים</string>
<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="push_poll_on_connect_label">Poll when connecting for push</string>
<string name="account_setup_options_enable_push_label">אפשר דחיפת דואר עבור חשבון זה</string>
<string name="account_setup_options_enable_push_summary">אם השרת שלך תומך בכך, ההודעות החדשות יופיעו באופן מיידי. אפשרות זו יכולה לשפר באופן דרמטי או לפגוע בביצועים.</string>
<string name="idle_refresh_period_label">רענן חיבור IDLE</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_6min">כל 6 דקות</string>
<string name="idle_refresh_period_12min">כל 12 דקות</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">כל 60 דקות</string>
<string name="account_setup_options_default_label">לשלוח דואר מחשבון זה כברירת מחדל</string>
<string name="account_setup_options_notify_label">הודע לי כאשר מגיע דואר</string>
<string name="account_setup_options_notify_sync_label">הודע לי בזמן שהדואר נבדק</string>
<string name="account_setup_options_mail_display_count_label">מספר הודעות להצגה</string>
<string name="account_setup_options_mail_display_count_10">10 הודעות</string>
<string name="account_setup_options_mail_display_count_25">25 הודעות</string>
<string name="account_setup_options_mail_display_count_50">50 הודעות</string>
<string name="account_setup_options_mail_display_count_100">100 הודעות</string>
<string name="account_setup_options_mail_display_count_250">250 הודעות</string>
<string name="account_setup_options_mail_display_count_500">500 הודעות</string>
<string name="account_setup_options_mail_display_count_1000">1000 הדועות</string>
<string name="account_setup_options_mail_display_count_all">כל ההודעות</string>
<string name="move_copy_cannot_copy_unsynced_message">לא ניתן להעתיק או להעביר הודעה שלא מסונכרנת עם השרת</string>
<string name="account_setup_failed_dlg_title">ההגדרה לא הסתיימה</string>
<string name="account_setup_failed_dlg_auth_message_fmt">"שם משתמש או סיסמה שגויה.
(%s)"</string>
<string name="account_setup_failed_dlg_certificate_message_fmt">"לא ניתן להתחבר לשרת באופן בטוח.
(%s)"</string>
<string name="account_setup_failed_dlg_server_message_fmt">"לא יכול להתחבר לשרת.
(%s)"</string>
<string name="account_setup_failed_dlg_edit_details_action">ערוך פרטים</string>
<string name="account_setup_failed_dlg_continue_action">המשך</string>
<string name="account_settings_push_advanced_title">מתקדם</string>
<string name="account_settings_title_fmt">הגדרות חשבון</string>
<string name="account_settings_default">חשבון ברירת מחדל</string>
<string name="account_settings_default_label">חשבון ברירת מחדל</string>
<string name="account_settings_default_summary">לשלוח דואר מחשבון זה כברירת מחדל</string>
<string name="account_settings_notify_label">התראות על הודעה חדשה</string>
<string name="account_settings_notify_sync_label">סינכרון התראות</string>
<string name="account_settings_email_label">כתובת הדוא\"ל שלך</string>
<string name="account_settings_notify_summary">נא הודע לי בשורת מצב כאשר מגיע דואר</string>
<string name="account_settings_notify_sync_summary">נא הודע לי בשורת המצב בזמן שהדואר נבדק</string>
<string name="account_settings_show_combined_label">הצג תיבת דואר נכנס משולבת</string>
<string name="account_settings_notify_self_label">כלול את הדואר היוצא</string>
<string name="account_settings_notify_self_summary">הצג התראה להודעות ששלחתי</string>
<string name="account_settings_notification_opens_unread_label">ההתראה פותחת הודעות שלא נקראו</string>
<string name="account_settings_notification_opens_unread_summary">חיפוש אחר הודעות שלא נקראו כאשר ההתראה נפתחת</string>
<string name="account_settings_notification_unread_count_label">הצג מספר שלא נקראו</string>
<string name="account_settings_notification_unread_count_summary">הצג את מספר ההודעות שלא נקראו בשורת ההתראות.</string>
<string name="account_settings_hide_buttons_label">גלול לחצני ניווט</string>
<string name="account_settings_hide_buttons_never">אף פעם</string>
<string name="account_settings_hide_buttons_keyboard_avail">כאשר המקלדת זמינה</string>
<string name="account_settings_hide_buttons_always">תמיד</string>
<string name="account_settings_enable_move_buttons_label">אפשר כפתורי תיוק מחדש</string>
<string name="account_settings_enable_move_buttons_summary">הצג כפתורי ארכיון, העבר ודואר זבל.</string>
<string name="account_settings_hide_move_buttons_label">תייק מחדש לחצני גלילה</string>
<string name="account_settings_show_pictures_label">תמיד הצג תמונות</string>
<string name="account_settings_show_pictures_never">לא</string>
<string name="account_settings_show_pictures_only_from_contacts">מאנשי הקשר</string>
<string name="account_settings_show_pictures_always">מכל אחד</string>
<string name="account_settings_composition">שולח דואר</string>
<string name="account_settings_default_quoted_text_shown_label">צטט את ההודעה המקורית במענה</string>
<string name="account_settings_default_quoted_text_shown_summary">במענה להודעות, ההודעה המקורית תוצג בתגובה שלך.</string>
<string name="account_settings_reply_after_quote_label">השב לאחר הטקסט המצוטט</string>
<string name="account_settings_reply_after_quote_summary">במענה להודעות, ההודעה המקורית תופיע מעל התגובה שלך.</string>
<string name="account_settings_message_format_label">עיצוב הודעה</string>
<string name="account_settings_message_format_text">טקסט רגיל (תמונות ועיצובים יוסרו)</string>
<string name="account_settings_message_format_html">HTML (תמונות ועיצוב נשמרים)</string>
<string name="account_settings_message_read_receipt_label">אישור קריאה</string>
<string name="account_settings_message_read_receipt_summary">תמיד בקש אישור קריאה</string>
<string name="account_settings_quote_style_label">השב סגנון ציטוט</string>
<string name="account_settings_quote_style_prefix">קידומת (כגון Gmail, Pine)</string>
<string name="account_settings_quote_style_header">כותרת (כמו Yahoo! Outlook, Hotmail)</string>
<string name="account_settings_general_title">הגדרות כלליות</string>
<string name="account_settings_display_prefs_title">תצוגה</string>
<string name="account_settings_sync">שולף דואר</string>
<string name="account_settings_folders">תיקיות</string>
<string name="account_settings_message_lists">רשימת הודעות</string>
<string name="account_settings_message_view">הצגת הודעות</string>
<string name="account_settings_quote_prefix_label">קידומת טקסט מצוטט</string>
<string name="account_settings_crypto">הצפנה</string>
<string name="account_settings_crypto_app">OpenPGP Provider</string>
<string name="account_settings_crypto_app_none">כלום</string>
<string name="account_settings_crypto_app_not_available">לא זמין</string>
<string name="account_settings_crypto_auto_signature">Auto-sign</string>
<string name="account_settings_crypto_auto_signature_summary">"Use the account's email address to guess the signature key."</string>
<string name="account_settings_mail_check_frequency_label">Folder poll frequency</string>
<string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>
<string name="account_settings_storage_title">אחסון</string>
<string name="account_settings_color_label">צבע חשבון</string>
<string name="account_settings_color_summary">בחר את הצבע של החשבון המשומש בתיקייה וברשימת החשבונות</string>
<string name="account_settings_led_color_label">צבע התראות LED</string>
<string name="account_settings_led_color_summary">בחר את צבע ה LED שיהבהב לחשבון זה</string>
<string name="account_settings_mail_display_count_label">גודל תיקיה מקומית</string>
<string name="account_settings_autodownload_message_size_label">להביא הודעות בנפח של עד</string>
<string name="account_settings_autodownload_message_size_1">1Kb</string>
<string name="account_settings_autodownload_message_size_2">2Kb</string>
<string name="account_settings_autodownload_message_size_4">4Kb</string>
<string name="account_settings_autodownload_message_size_8">8Kb</string>
<string name="account_settings_autodownload_message_size_16">16Kb</string>
<string name="account_settings_autodownload_message_size_32">32Kb</string>
<string name="account_settings_autodownload_message_size_64">64Kb</string>
<string name="account_settings_autodownload_message_size_128">128Kb</string>
<string name="account_settings_autodownload_message_size_256">256Kb</string>
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">כל גודל(ללא הגבלה)</string>
<string name="account_settings_message_age_label">סנכרון הודעות מ</string>
<string name="account_settings_message_age_any">כל זמן (ללא הגבלה)</string>
<string name="account_settings_message_age_0">היום</string>
<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">מהשבועיים האחרונים</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">מהחודשיים האחרונים</string>
<string name="account_settings_message_age_3_months">מה 3 חודשים האחרונים</string>
<string name="account_settings_message_age_6_months">מהחצי שנה האחרונה</string>
<string name="account_settings_message_age_1_year">מהשנה האחרונה</string>
<string name="account_settings_folder_display_mode_label">תיקיות להצגה</string>
<string name="account_settings_folder_display_mode_all">הכל</string>
<string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_display_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_display_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_label">Poll folders</string>
<string name="account_settings_folder_sync_mode_all">הכל</string>
<string name="account_settings_folder_sync_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_sync_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_none">כלום</string>
<string name="account_settings_folder_push_mode_label">דחף תיקיות</string>
<string name="account_settings_folder_push_mode_all">הכל</string>
<string name="account_settings_folder_push_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_push_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_push_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_push_mode_none">כלום</string>
<string name="account_settings_folder_target_mode_label">להעביר / להעתיק תיקיית יעד</string>
<string name="account_settings_folder_target_mode_all">הכל</string>
<string name="account_settings_folder_target_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_target_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_target_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_sync_remote_deletetions_label">לסנכרן מחיקות שרת</string>
<string name="account_settings_sync_remote_deletetions_summary">הסר הודעות כאשר נמחק בשרת</string>
<string name="folder_settings_title">הגדרות תיקייה</string>
<string name="folder_settings_in_top_group_label">הצג בקבוצה העליונה</string>
<string name="folder_settings_in_top_group_summary">הצג בחלק העליון של רשימת התיקיות</string>
<string name="folder_settings_folder_display_mode_label">Folder display class</string>
<string name="folder_settings_folder_display_mode_normal">None</string>
<string name="folder_settings_folder_display_mode_first_class">1st Class</string>
<string name="folder_settings_folder_display_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_sync_mode_label">Folder sync class</string>
<string name="folder_settings_folder_sync_mode_normal">כלום</string>
<string name="folder_settings_folder_sync_mode_first_class">1st Class</string>
<string name="folder_settings_folder_sync_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_sync_mode_inherited">Same as display class</string>
<string name="folder_settings_folder_push_mode_label">Folder push class</string>
<string name="folder_settings_folder_push_mode_normal">כלום</string>
<string name="folder_settings_folder_push_mode_first_class">1st Class</string>
<string name="folder_settings_folder_push_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_push_mode_inherited">Same as sync class</string>
<string name="account_settings_incoming_label">שרת הודעות נכנסות</string>
<string name="account_settings_incoming_summary">הגדר את שרת הדואר הנכנס</string>
<string name="account_settings_outgoing_label">שרת דואר יוצא</string>
<string name="account_settings_outgoing_summary">הגדר את שרת הדואר היוצא (SMTP) </string>
<string name="account_settings_add_account_label">הוסף חשבון אחר</string>
<string name="account_settings_description_label">שם חשבון</string>
<string name="account_settings_name_label">השם שלך</string>
<string name="notifications_title">התראות</string>
<string name="account_settings_ring_summary">צלצל שמגיע מייל</string>
<string name="account_settings_vibrate_enable">רטט</string>
<string name="account_settings_vibrate_summary">תרטוט שמגיע מייל</string>
<string name="account_settings_vibrate_pattern_label">דפוסי רטט</string>
<string name="account_settings_vibrate_pattern_default">ברירת מחדל</string>
<string name="account_settings_vibrate_pattern_1">דפוס 1</string>
<string name="account_settings_vibrate_pattern_2">דפוס 2</string>
<string name="account_settings_vibrate_pattern_3">דפוס 3</string>
<string name="account_settings_vibrate_pattern_4">דפוס 4</string>
<string name="account_settings_vibrate_pattern_5">דפוס 5</string>
<string name="account_settings_vibrate_times">חזור על הרט</string>
<string name="account_settings_ringtone">רינגטון מייל חדש</string>
<string name="account_settings_led_label">הבהוב LED</string>
<string name="account_settings_led_summary">תהבהב ב LED כשמגיע מייל חדש</string>
<string name="account_settings_servers">הגדרות שרת</string>
<string name="account_settings_composition_title">אפשרויות הרכב הודעה</string>
<string name="account_settings_composition_label">הרכב ברירת המחדל</string>
<string name="account_settings_composition_summary">הגדר את ברירת המחדל שלך מ, עותק מוסתר וחתימה</string>
<string name="account_settings_identities_label">ניהול זהויות</string>
<string name="account_settings_identities_summary">"הגדרה חלופית \' מ \ 'כתובות וחתימות "</string>
<string name="manage_identities_title">נהל זהויות</string>
<string name="manage_identities_context_menu_title">נהל זהות</string>
<string name="edit_identity_title">ערוך זהות</string>
<string name="new_identity_action">זהות חדשה</string>
<string name="account_settings_always_bcc_label">עותק מוסתר לכל ההודעות אל</string>
<string name="account_settings_always_bcc_summary">שלח לכתובת הזו עותק של כל הודעה יוצאת</string>
<string name="manage_identities_edit_action">ערוך</string>
<string name="manage_identities_move_up_action">העבר למעלה</string>
<string name="manage_identities_move_down_action">העבר למטה</string>
<string name="manage_identities_move_top_action">העבר למעלה / להפוך לברירת המחדל</string>
<string name="manage_identities_remove_action">מחק</string>
<string name="edit_identity_description_label">תיאור זהות</string>
<string name="edit_identity_description_hint">(לא חובה)</string>
<string name="edit_identity_name_label">השם שלך</string>
<string name="edit_identity_name_hint">(לא חובה)</string>
<string name="edit_identity_email_label">כתובת דוא\"ל</string>
<string name="edit_identity_email_hint">(חובה)</string>
<string name="edit_identity_reply_to_label">כתובת דוא\"ל למענה</string>
<string name="edit_identity_reply_to_hint">(לא חובה)</string>
<string name="edit_identity_signature_label">חתימה</string>
<string name="edit_identity_signature_hint">(לא חובה)</string>
<string name="account_settings_signature_use_label">השתמש בחתימה</string>
<string name="account_settings_signature_label">חתימה</string>
<string name="account_settings_signature_summary">צרף חתימה לכל הודעה שתשלח</string>
<string name="default_signature">"--
Sent from my Android phone with K-9 Mail. Please excuse my brevity."</string>
<string name="default_identity_description">הזהות הראשונית</string>
<string name="choose_identity">בחר זהות</string>
<string name="choose_identity_title">בחר זהות</string>
<string name="choose_account_title">בחר חשבון/זהות</string>
<string name="send_as">שלח כ</string>
<string name="no_identities">לך להגדרות חשבון -&gt; ניהול זהויות, כדי ליצור זהויות</string>
<string name="no_removable_identity">"לא ניתן להסיר את הזהות היחידה שלך"</string>
<string name="identity_has_no_email">"אתה לא יכול להשתמש בזהות ללא כתובת דואר אלקטרוני"</string>
<string name="identity_will_not_be_saved">השינויים בבחירת זהותך וחתימתך לא ישמרו עם הטיוטה</string>
<string name="sort_earliest_first">הודעות קודמות ראשונות</string>
<string name="sort_latest_first">הודעות אחרונות ראשונות</string>
<string name="sort_sender_alpha">סדר אלפביתי של השולח</string>
<string name="sort_sender_re_alpha">סדר אלפביתי הפןך של השולח</string>
<string name="sort_subject_alpha">נושא אלפביתי</string>
<string name="sort_subject_re_alpha">נושא אלפביתי הפוך</string>
<string name="sort_flagged_first">הודעות שמסומנות בכוכב ראשונות</string>
<string name="sort_flagged_last">הודעות שלא מסומנות בכוכב ראשונות</string>
<string name="sort_unread_first">הודעות שלא נקראו ראשונות</string>
<string name="sort_unread_last">הודעות שנקראו ראשונות</string>
<string name="sort_attach_first">הודעות עם קבצים מצורפים ראשונות</string>
<string name="sort_unattached_first">הודעות בלי קבצים מצורפים ראשונות</string>
<string name="sort_by">מיון לפי ...</string>
<string name="sort_by_date">תאריך</string>
<string name="sort_by_sender">שולח</string>
<string name="sort_by_subject">נושא</string>
<string name="sort_by_flag">כוכב</string>
<string name="sort_by_unread">נקרא/לא נקרא</string>
<string name="sort_by_attach">קבצים מצורפים</string>
<string name="message_web_view_error">%s</string>
<string name="account_delete_dlg_title">מחק חשבון</string>
<string name="account_delete_dlg_instructions_fmt">החשבון \"%s\" ימחק מ K-9 Mail .</string>
<string name="account_recreate_dlg_title">יוצר חשבון מחדש</string>
<string name="account_recreate_dlg_instructions_fmt">על הנתונים עבור \"%s\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
<string name="account_clear_dlg_title">נקה חשבון</string>
<string name="account_clear_dlg_instructions_fmt">כל ההודעות ב \"%s\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
<string name="provider_note_live">רק כמה חשבונות \ "פלוס \" כוללים גישת POP המאפשרת לתוכנית זו להתחבר. אם אינך יכול להיכנס עם כתובת הדוא"ל והסיסמה הנכונות שלך, ייתכן שאין לך חשבון \ "פלוס \" בתשלום. נא להפעיל את דפדפן האינטרנט כדי לקבל גישה אל חשבונות דואר האלו.</string>
<string name="provider_note_yahoojp">אם אתה רוצה להשתמש ב POP3 עבור ספק זה, אתה צריך לאפשר להשתמש ב POP3 בדף הגדרות דואר Yahoo.</string>
<string name="provider_note_naver">אם אתה רוצה להשתמש ב ב-IMAP או POP3 עבור ספק זה, אתה צריך לאפשר להשתמש ב ב-IMAP או POP3 בדף הגדרות הדואר Naver.</string>
<string name="provider_note_hanmail">אם אתה רוצה להשתמש ב ב-IMAP או POP3 עבור ספק זה, אתה צריך לאפשר להשתמש ב ב-IMAP או POP3 בדף Hanmail (Daum) הגדרות דואר.</string>
<string name="provider_note_paran">אם אתה רוצה להשתמש ב ב-IMAP או POP3 עבור ספק זה, אתה צריך לאפשר להשתמש ב ב-IMAP או POP3 בדף הגדרות הדואר Paran.</string>
<string name="provider_note_nate">אם אתה רוצה להשתמש ב ב-IMAP או POP3 עבור ספק זה, אתה צריך לאפשר להשתמש ב ב-IMAP או POP3 בדף הגדרות הדואר Nate.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">תעודה לא מזוהה</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">קבל מפתח</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">דחה מפתח</string>
<string name="message_help_key">"Del (or D) - מחק
R - השב
A - השב לכולם
F - קדימה
J or P - הודעה קודמת
K, N - הודעה הבאה
M - העבר
Y - העתק
Z - זום החוצה
Shift-Z - זום פנימה
G - כוכב"</string>
<string name="message_list_help_key">"Del (or D) - מחק
R - השב
A - השב לכולם
C - לחבר
F - קדימה
M - העבר
Y - העתק
G - כוכב
O - סוג מיון
I - סדר מיון
Q - חזור לתיקיות
S - בחר / בטל בחירה"</string>
<string name="folder_list_help_key">"1 - Display only 1st Class folders
2 - Display 1st and 2nd Class folders
3 - Display all except 2nd Class folders
4 - הצג את כל התיקיות
Q - חזור לחשבונות
S - ערוך הגדרות חשבון"</string>
<string name="folder_list_display_mode_label">תיקיות</string>
<string name="folder_list_display_mode_all">הצג את כל התיקיות</string>
<string name="folder_list_display_mode_first_class">Display only 1st Class folders</string>
<string name="folder_list_display_mode_first_and_second_class">Display 1st and 2nd Class folders</string>
<string name="folder_list_display_mode_not_second_class">Display all except 2nd Class folders</string>
<string name="account_settings_signature__location_label">מיקום חתימה</string>
<string name="account_settings_signature__location_before_quoted_text">לפני טקסט מצוטט</string>
<string name="account_settings_signature__location_after_quoted_text">אחרי טקסט מצוטט</string>
<string name="setting_theme_dark">חשוך</string>
<string name="setting_theme_light">בהיר</string>
<string name="display_preferences">תצוגה</string>
<string name="global_preferences">כללי</string>
<string name="debug_preferences">איתור באגים</string>
<string name="privacy_preferences">פרטיות</string>
<string name="network_preferences">רשת</string>
<string name="interaction_preferences">Interaction</string>
<string name="accountlist_preferences">רשימת חשבונות</string>
<string name="messagelist_preferences">רשימת הודעות</string>
<string name="messageview_preferences">הודעות</string>
<string name="settings_theme_label">ערכת נושא</string>
<string name="settings_language_label">שפה</string>
<string name="settings_messageview_mobile_layout_label">פריסת עמודה יחידה</string>
<string name="settings_messageview_mobile_layout_summary">אתחל הודעות HTML ותתאים אותם למסכים קטנים.</string>
<string name="settings_messageview_zoom_controls_label">בקרת זום מערכת</string>
<string name="settings_messageview_zoom_controls_summary">אפשר ווידג\'טי זום או זום על ידי צביטה אם המכשיר שלך תומך בזה</string>
<string name="setting_language_system">ברירות מחדל מערכת</string>
<string name="background_ops_label">סנכרון ברקע</string>
<string name="background_ops_never">אף פעם</string>
<string name="background_ops_always">תמיד</string>
<string name="background_ops_enabled">"מתי ש\'נתונים ברקע\' מסומן "</string>
<string name="background_ops_auto_sync">"מתי ש\'נתונים ברקע\' ו\'סינכרון אוטומטי\' מסומנים "</string>
<string name="no_message_seletected_toast">לא נבחרו הודעות</string>
<string name="date_format_label">פורמט תאריך</string>
<string name="date_format_short">קצר</string>
<string name="date_format_medium">בינוני</string>
<string name="date_format_common">dd-MMM-yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string>
<string name="batch_ops">פעולות קבוצה</string>
<string name="batch_delete_op">מחק נבחרים</string>
<string name="batch_mark_read_op">סמן נבחרים כנקרא</string>
<string name="batch_mark_unread_op">סמן נבחרים כלא נקרא</string>
<string name="batch_flag_op">הוסף כוכב לנבחרים</string>
<string name="batch_unflag_op">הסר כוכב מהנבחרים</string>
<string name="batch_archive_op">העבר נבחרים לארכיון</string>
<string name="batch_spam_op">העבר נבחרים לדואר זבל</string>
<string name="batch_move_op">העבר נבחרים</string>
<string name="batch_copy_op">העתק נבחרים</string>
<string name="batch_flag_mode">מצב \'כוכב\'</string>
<string name="batch_select_mode">בחר מצב</string>
<string name="batch_plain_mode">מצב רגיל</string>
<string name="batch_select_all">בחר הכל</string>
<string name="batch_deselect_all">הקב את כל הבחירות</string>
<string name="account_setup_push_limit_label">מקסימום תיקיות כדי לבדוק עם דחיפה</string>
<string name="account_setup_push_limit_10">10 תיקיות</string>
<string name="account_setup_push_limit_25">25 תיקיות</string>
<string name="account_setup_push_limit_50">50 תיקיות</string>
<string name="account_setup_push_limit_100">100 תיקיות</string>
<string name="account_setup_push_limit_250">250 תיקיות</string>
<string name="account_setup_push_limit_500">500 תיקיות</string>
<string name="account_setup_push_limit_1000">1000 תיקיות</string>
<string name="animations_title">אנימציה</string>
<string name="animations_summary">השתמש באפקטים חזותיים ססגונים</string>
<string name="gestures_title">מחוות</string>
<string name="gestures_summary">קבל כפתור מחווה</string>
<string name="compact_layouts_title">פריסות קומפקטיות</string>
<string name="compact_layouts_summary">התאם את הפריסה כדי שיהיה ניתן להציג יותר פרטים בכל דף</string>
<string name="volume_navigation_title">נייוט באמצעות מקשי הווליום</string>
<string name="volume_navigation_summary">לדפדף בין הפריטים באמצעות מקשי הווליום</string>
<string name="volume_navigation_message">הצגת הודעה</string>
<string name="volume_navigation_list">רשימת תצוגות שונות</string>
<string name="manage_back_title">נהל כפתור \'חזור\'</string>
<string name="manage_back_summary">הגדר שכפתור \"חזור\" תמיד יחזור דף אחד</string>
<string name="start_integrated_inbox_title">התחל בתיבת דואר נכנס אחידה</string>
<string name="start_integrated_inbox_summary">הצג את תיבת הדואר הנכנס האחידה בהפעלה</string>
<string name="measure_accounts_title">הראה גודל חשבון</string>
<string name="measure_accounts_summary">כבה בשביל תצוגה מהירה יותר</string>
<string name="count_search_title">מספר תוצאות חיפוש</string>
<string name="count_search_summary">כבה בשביל תצוגה מהירה יותר</string>
<string name="hide_special_accounts_title">הסתר חשבונות מיוחדים</string>
<string name="hide_special_accounts_summary">הסתר את תיבת הדואר הנכנס האחידה ואת כל הודעות החשבונות</string>
<string name="search_title" formatted="false">%s %s</string>
<string name="flagged_modifier">- מסומן בכוכב</string>
<string name="unread_modifier">- לא נקרא</string>
<string name="search_all_messages_title">כל ההודעות</string>
<string name="search_all_messages_detail">כל הודעות שבתיקיות שניתנות לחיפוש</string>
<string name="integrated_inbox_title">תיבת דואר נכנס אחידה</string>
<string name="integrated_inbox_detail">כל ההודעות בתיקיות המאוחדות</string>
<string name="tap_hint">הקש על המעטפה או על הכוכב בשביל הודעות שלא נקראו או שמסומנות בכוכב</string>
<string name="folder_settings_include_in_integrated_inbox_label">לאחד</string>
<string name="folder_settings_include_in_integrated_inbox_summary">כל ההדועות מוצגות בתיבת דואר נכנס אחידה</string>
<string name="account_settings_searchable_label">תיקיות לחיפוש</string>
<string name="account_settings_searchable_all">הכל</string>
<string name="account_settings_searchable_displayable">ניתנות להצגה</string>
<string name="account_settings_searchable_none">כלום</string>
<string name="remote_control_label">K-9 Mail שליטה מרחוק</string>
<string name="remote_control_desc">אפשר לK-9 לשלוט בהגדרות פעילות הדואר.</string>
<string name="font_size_settings_title">גודל גופן</string>
<string name="font_size_settings_description">הגדר גודל גופן</string>
<string name="font_size_account_list">רשימת חשבונות</string>
<string name="font_size_account_name">שם חשבון</string>
<string name="font_size_account_description">תיאור חשבון</string>
<string name="font_size_folder_list">רשימת תיקיות</string>
<string name="font_size_folder_name">שם תיקיה</string>
<string name="font_size_folder_status">מצב תיקייה</string>
<string name="font_size_message_list">רשימת הודעות</string>
<string name="font_size_message_list_subject">נושא</string>
<string name="font_size_message_list_sender">שולח</string>
<string name="font_size_message_list_date">תאריך</string>
<string name="font_size_message_list_preview">תצוגה מקדימה</string>
<string name="font_size_message_view">הודעות</string>
<string name="font_size_message_view_sender">שולח</string>
<string name="font_size_message_view_to">ל</string>
<string name="font_size_message_view_cc">עותק</string>
<string name="font_size_message_view_additional_headers">כותרות נוספות</string>
<string name="font_size_message_view_subject">כותרת</string>
<string name="font_size_message_view_time">זמן</string>
<string name="font_size_message_view_date">תאריך</string>
<string name="font_size_message_view_content">גוף ההודעה</string>
<string name="font_size_tiniest">הזעיר ביותר</string>
<string name="font_size_tiny">זעיר</string>
<string name="font_size_smaller">קטן יותר</string>
<string name="font_size_small">קטן</string>
<string name="font_size_medium">בינוני</string>
<string name="font_size_large">גדול</string>
<string name="font_size_larger">ענק</string>
<string name="font_size_webview_smaller">הקטן ביותר</string>
<string name="font_size_webview_small">קטן</string>
<string name="font_size_webview_normal">רגיל</string>
<string name="font_size_webview_large">גדול</string>
<string name="font_size_webview_larger">ענק</string>
<string name="message_compose_buggy_gallery">סמן \"הגדרות\" -&gt; \"השתמש בעקיפת באג הגלריה\" כדי שתוכל לצרף תמונות או קטעי וידאו לגלריית 3D.</string>
<string name="message_compose_use_workaround">השתמש ב \ "הוסף קובץ מצורף (תמונה) \" או \ "הוסף קובץ מצורף (וידאו) \" כדי לצרף תמונות או קטעי וידאו באמצעות גלריית 3D.</string>
<string name="miscellaneous_preferences">שונות</string>
<string name="misc_preferences_attachment_title">השתמש בעקיפת באג הגלריה</string>
<string name="misc_preferences_attachment_description">הצג כפתורים כדי להוסיף קבצי תמונה / וידאו (כדי לעקוף את באג גלריית 3D)</string>
<string name="error_activity_not_found">לא נמצא ישום שיכול לבצע פעולה זו.</string>
<string name="error_apg_version_not_supported">גרסת APG המותקנת אינה נתמכת.</string>
<string name="btn_crypto_sign">חתום</string>
<string name="btn_encrypt">הצפן</string>
<string name="btn_decrypt">פענח</string>
<string name="btn_verify">אמת</string>
<string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>
<string name="key_id">id: %s</string>
<string name="insufficient_apg_permissions">"ל-K-9 אין הרשאה לגשת ל APG באופן מלא, התקן מחדש את K-9 כדי לתקן את זה."</string>
<string name="pgp_mime_unsupported">הודעות PGP /MIME אינן נתמכות עדיין.</string>
<string name="attachment_encryption_unsupported">אזהרה: הקבצים המצורפים אינם חתומים או מוצפנים עדיין.</string>
<string name="send_aborted">שליחה בוטלה.</string>
<string name="save_or_discard_draft_message_dlg_title">לשמור הודעה כטיוטה?</string>
<string name="save_or_discard_draft_message_instructions_fmt">לשמור או למחוק הודעה זו?</string>
<string name="charset_not_found">"לא ניתן להציג הודעה זו בגלל שהקידוד \"%s\" לא נמצא."</string>
<string name="select_text_now">בחר טקסט כדי להעתיק.</string>
<string name="dialog_confirm_delete_title">אשר מחיקה</string>
<string name="dialog_confirm_delete_message">אתה בטוח שאתה רוצה למחוק את ההודעה הזאת?</string>
<string name="dialog_confirm_delete_confirm_button">מחק</string>
<string name="dialog_confirm_delete_cancel_button">אל תמחק!</string>
<string name="dialog_confirm_spam_title">אשר העברה לתיקיית דואר זבל</string>
<string name="dialog_confirm_spam_confirm_button">כן</string>
<string name="dialog_confirm_spam_cancel_button">לא</string>
<string name="dialog_attachment_progress_title">מוריד קבצים</string>
<string name="debug_logging_enabled">רישום איתור באגים למערכת רישום של האנדרואיד מאופשרת</string>
<string name="messagelist_sent_to_me_sigil">»</string>
<string name="messagelist_sent_cc_me_sigil"></string>
<string name="error_unable_to_connect">לא ניתן להתחבר</string>
<string name="import_export_action">הגדרות ייבוא &amp; ייצוא </string>
<string name="settings_export_account">יצא הגדרות חשבון</string>
<string name="settings_export_all">יצא הגדרות וחשבונות</string>
<string name="settings_import_dialog_title">יבא</string>
<string name="settings_export_dialog_title">יצא</string>
<string name="settings_import">יבא הגדרות</string>
<string name="settings_import_selection">יבא בחירה</string>
<string name="settings_import_global_settings">הגדרות כלליות</string>
<string name="settings_exporting">מייצא הגדרות....</string>
<string name="settings_importing">מייבא הגדרות....</string>
<string name="settings_import_scanning_file">סורק קבצים....</string>
<string name="settings_export_success">יצוא הגדרות נשמרו ל %s</string>
<string name="settings_import_global_settings_success">יבא הגדרות כלליות מ %s</string>
<string name="settings_import_success" formatted="false">יבא %s מ %s</string>
<string name="settings_export_failure">נכשל בייצוא הגדרות</string>
<string name="settings_import_failure">נכשל בלייבא הגדרות מ %s</string>
<string name="settings_export_success_header">ייצוא הצליח</string>
<string name="settings_export_failed_header">ייצוא נכשל</string>
<string name="settings_import_success_header">יבוא הצליח</string>
<string name="settings_import_failed_header">יבוא נכשל</string>
<string name="settings_import_activate_account_header">הפעלת החשבון</string>
<string name="settings_import_activate_account_intro" formatted="false">כדי שתוכל להשתמש בחשבון \"%s\" אתה צריך לספק את %s.</string>
<string name="settings_import_incoming_server">Incoming server (%s):</string>
<string name="settings_import_outgoing_server">Outgoing server (%s):</string>
<string name="settings_import_use_incoming_server_password">Use the incoming server password</string>
<string name="activate_account_action">הפעל</string>
<string name="settings_unknown_version">לא ניתן להתמודד עם הקובץ של גרסה %s</string>
<string name="account_unavailable">החשבון \"%s\" לא זמין; בדוק אחסון</string>
<string name="settings_attachment_default_path">שמור קובץ מצורף ל.....</string>
<string name="attachment_save_title">שמור קובץ מצורף</string>
<string name="attachment_save_desc">לא נמצא סייר קבצים. לאן היית רוצה לשמור את הקובץ המצורף?</string>
<string name="manage_accounts_move_up_action">העבר למעלה</string>
<string name="manage_accounts_move_down_action">העבר למטה</string>
<string name="manage_accounts_moving_message">מעביר חשבון....</string>
</resources>

View File

@ -44,11 +44,11 @@
<!-- Actions will be used as buttons and in menu items -->
<string name="next_action">下一步</string> <!-- Used as part of a multi-step process -->
<!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
<string name="previous_action">上一步</string> <!-- Used as part of a multi-step process -->
<string name="okay_action">确定</string> <!-- User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
<string name="cancel_action">取消</string>
<string name="send_action">发送</string>
<!-- NEW: <string name="send_again_action">Send Again</string>-->
<string name="send_again_action">重新发送</string>
<string name="select_action">选择</string>
<string name="deselect_action">取消选择</string>
<string name="reply_action">回复</string>
@ -60,6 +60,7 @@
<string name="forward_action">转发</string>
<string name="move_action">移动</string>
<string name="continue_action">继续</string>
<!-- NEW: <string name="back_action">Back</string>-->
<string name="done_action">完成</string> <!-- Used to complete a multi-step process -->
<string name="remove_action">删除</string>
<string name="discard_action">忽略</string>
@ -70,6 +71,7 @@
<string name="send_messages_action">发送</string>
<string name="list_folders_action">全部文件夹</string>
<string name="refresh_folders_action">刷新文件夹</string>
<!-- NEW: <string name="filter_folders_action">Find folder</string>-->
<string name="mark_all_as_read_action">标记全部邮件为已读</string>
<string name="add_account_action">添加账户</string>
<string name="compose_action">新邮件</string>
@ -107,16 +109,16 @@
<string name="view_hide_details_action">显示/隐藏详细信息</string>
<string name="add_cc_bcc_action">添加抄送/暗送</string>
<string name="edit_subject_action">编辑主题</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">已读回执</string>
<string name="read_receipt_enabled">要求已读回执</string>
<string name="read_receipt_disabled">不要求已读回执</string>
<string name="add_attachment_action">添加附件</string>
<string name="add_attachment_action_image">添加图片附件</string>
<string name="add_attachment_action_video">添加视频附件</string>
<string name="dump_settings_action">导出设置</string>
<string name="empty_trash_action">清空垃圾箱</string>
<string name="expunge_action">删除</string>
<!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
<string name="clear_local_folder_action">清空本地邮件</string>
<string name="set_sort_action">选择排序方式</string>
<string name="reverse_sort_action">逆序</string>
<string name="about_action">关于</string>
@ -126,7 +128,7 @@
<string name="folder_context_menu_title">文件夹选项</string>
<string name="general_no_subject">(无主题)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
<!-- NEW: <string name="general_no_date">No date</string>-->
<string name="general_no_date">无日期</string>
<string name="general_no_sender">无发件人</string>
<string name="status_loading">正在接收</string>
<string name="status_loading_folder">(正在接收<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
@ -242,19 +244,25 @@
<string name="message_compose_bcc_hint">暗送</string>
<string name="message_compose_subject_hint">主题</string>
<string name="message_compose_content_hint">邮件内容</string>
<!-- NEW: <string name="message_compose_signature_hint">Signature</string>-->
<string name="message_compose_quote_header_separator">--------原始邮件--------</string>
<string name="message_compose_quote_header_subject">主题:</string>
<!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
<string name="message_compose_quote_header_send_date">发送日期:</string>
<string name="message_compose_quote_header_from">发件人:</string>
<string name="message_compose_quote_header_to">收件人:</string>
<string name="message_compose_quote_header_cc">抄送:</string>
<string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g>写到:\n\n</string>
<string name="message_compose_quoted_text_label">引用文本</string>
<string name="message_compose_error_no_recipients">您必须添加至少一个收件人。</string>
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="error_contact_address_not_found">没有找到收件地址。</string>
<string name="message_compose_downloading_attachments_toast">一些附件没有被下载。在这个邮件发送前会自动的下载这些附件。</string>
<string name="message_compose_attachments_skipped_toast">由于一些附件还没有被下载,因此无法转发这些附件。</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_compose_show_quoted_text_action">引用文字</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_view_from_format">发件人:<xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">收件人:</string>
@ -271,10 +279,13 @@
<string name="message_view_status_attachment_not_saved">无法将附件保存到SD卡。</string>
<string name="message_view_show_pictures_instructions">选择“显示图片”来显示签入的图片。</string>
<string name="message_view_show_pictures_action">显示图片</string>
<string name="message_view_fetching_attachment_toast">正在接收附件。</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">正在接收附件</string>
<string name="message_view_no_viewer">无法打开<xliff:g id="mimetype">%s</xliff:g>。找不到可以阅读该文件的程序。</string>
<string name="message_view_download_remainder">下载完整邮件</string>
<!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
<string name="message_additional_headers_not_downloaded">当前只下载了部分邮件的信息。如果需要下载全部邮件的信息,请在账户的收件服务器设置中选择“在手机上保存全部邮件的信息”。</string>
@ -306,9 +317,9 @@
<string name="global_settings_checkbox_summary">总是显示多选框</string>
<string name="global_settings_touchable_label">邮件预览</string>
<string name="global_settings_touchable_summary">在列表中显示邮件预览</string>
<!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
<!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
<!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
<string name="global_settings_preview_lines_label">预览行数</string>
<string name="global_settings_show_correspondent_names_label">显示收件人姓名</string>
<string name="global_settings_show_correspondent_names_summary">如果可能则使用收件人姓名代替收件地址</string>
<string name="global_settings_show_contact_name_label">显示联系人姓名</string>
<string name="global_settings_show_contact_name_summary">如果可能则使用联系人姓名代替收件地址</string>
<string name="global_settings_registered_name_color_label">使用颜色标记联系人</string>
@ -319,24 +330,35 @@
<string name="global_settings_messageview_fixedwidth_summary">使用定宽字体显示纯文本邮件</string>
<string name="global_settings_messageview_return_to_list_label">删除后回到自动返回到列表</string>
<string name="global_settings_messageview_return_to_list_summary">邮件删除后自动返回到邮件列表</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">删除后显示下一封邮件</string>
<string name="global_settings_messageview_show_next_summary">邮件删除后自动显示下一封邮件</string>
<string name="global_settings_confirm_actions_title">确认操作</string>
<string name="global_settings_confirm_actions_summary">进行选择操作时总是显示一个对话框进行确认</string>
<string name="global_settings_confirm_action_archive">归档</string>
<string name="global_settings_confirm_action_delete">删除(仅用于邮件视图)</string>
<!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
<string name="global_settings_confirm_action_spam">标记为垃圾</string>
<!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
<string name="global_settings_confirm_action_mark_all_as_read">全部标记为已读</string>
<string name="global_settings_confirm_action_send">发送</string>
<string name="global_settings_privacy_mode_title">锁屏通知</string>
<string name="global_settings_privacy_mode_summary">屏幕锁定时不要在通知栏中显示邮件主题</string>
<!-- NEW: <string name="quiet_time">Quiet Time</string>-->
<!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
<!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
<!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
<!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
<!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
<!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
<!-- NEW: <string name="global_settings_delete">Delete</string>-->
<!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
<!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
<!-- NEW: <string name="global_settings_move">Move</string>-->
<!-- NEW: <string name="global_settings_flag">Flag</string>-->
<!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
<string name="quiet_time">安静时间</string>
<string name="quiet_time_description">禁止铃声,震动以及闪光</string>
<string name="quiet_time_starts">安静时间开始</string>
<string name="quiet_time_ends">安静时间结束</string>
<string name="account_setup_basics_title">设置新账户</string>
<string name="account_setup_basics_instructions">输入该账户的电子邮件地址:</string>
@ -352,8 +374,8 @@
<string name="account_setup_check_settings_retr_info_msg">正在获取账户信息\u2026</string>
<string name="account_setup_check_settings_check_incoming_msg">正在检查收件服务器设置\u2026</string>
<string name="account_setup_check_settings_check_outgoing_msg">正在检查发件服务器设置\u2026</string>
<!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
<!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
<string name="account_setup_check_settings_authenticate">正在验证用户\u2026</string>
<string name="account_setup_check_settings_fetch">正在获取账户设置\u2026</string>
<string name="account_setup_check_settings_finishing_msg">正在完成最后的操作\u2026</string>
<string name="account_setup_check_settings_canceling_msg">正在取消\u2026</string>
@ -399,17 +421,17 @@
<string name="account_setup_incoming_save_all_headers_title">下载邮件信息</string>
<string name="account_setup_incoming_save_all_headers_label">在本地保存全部邮件的信息</string>
<!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
<!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
<!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
<!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
<string name="local_storage_provider_external_label">外部存储SD卡</string>
<string name="local_storage_provider_internal_label">正常内部存储</string>
<string name="local_storage_provider_samsunggalaxy_label">%1$s 额外的内部存储</string>
<string name="local_storage_provider_label">存储位置</string>
<string name="account_setup_expunge_policy_label">抹掉删除的邮件</string>
<string name="account_setup_expunge_policy_immediately">立刻</string>
<string name="account_setup_expunge_policy_on_poll">接收邮件时</string>
<string name="account_setup_expunge_policy_manual">手动</string>
<!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>-->
<string name="account_setup_incoming_autodetect_namespace_label">自动检测IMAP命名空间</string>
<string name="account_setup_incoming_imap_path_prefix_label">IMAP路径前缀</string>
<string name="drafts_folder_label">草稿箱名称</string>
@ -499,7 +521,7 @@
<string name="account_setup_options_mail_display_count_250">250封</string>
<string name="account_setup_options_mail_display_count_500">500封</string>
<string name="account_setup_options_mail_display_count_1000">1000封</string>
<!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
<string name="account_setup_options_mail_display_count_all">所有邮件</string>
<string name="move_copy_cannot_copy_unsynced_message">没有与服务器同步的邮件无法进行拷贝或移动</string>
@ -525,8 +547,10 @@
<string name="account_settings_notify_self_summary">发送邮件时显示通知</string>
<string name="account_settings_notification_opens_unread_label">点击通知后打开未读邮件</string>
<string name="account_settings_notification_opens_unread_summary">点击通知后搜索未读邮件</string>
<!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
<!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
<string name="account_settings_notification_unread_count_label">显示未读邮件数量</string>
<string name="account_settings_notification_unread_count_summary">在通知栏显示未读邮件数量</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_enable_move_buttons_label">启用整理按钮</string>
<string name="account_settings_enable_move_buttons_summary">显示归档、移动和标记为垃圾按钮</string>
@ -538,24 +562,28 @@
<string name="account_settings_composition">正在发送邮件</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">回复时引用原文</string>
<string name="account_settings_default_quoted_text_shown_summary">回复时,原文将出现在您的回复中</string>
<string name="account_settings_reply_after_quote_label">在引用的文本后进行回复</string>
<string name="account_settings_reply_after_quote_summary">回复邮件时,原始邮件会显示在您的邮件的上方。</string>
<!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
<!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
<!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</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>-->
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_message_format_label">邮件格式</string>
<string name="account_settings_message_format_text">纯文本(图片和排版将被删除)</string>
<string name="account_settings_message_format_html">HTML图片和排版将被保留</string>
<!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
<!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
<!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
<!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
<string name="account_settings_message_read_receipt_label">已读回执</string>
<string name="account_settings_message_read_receipt_summary">总是要求已读回执</string>
<!-- NEW: <string name="account_settings_general_title">General settings</string>-->
<string name="account_settings_quote_style_label">回复时引用格式</string>
<string name="account_settings_quote_style_prefix">引用前缀类似GmailPine</string>
<string name="account_settings_quote_style_header">引用头类似OutlookYahoo!Hotmail</string>
<string name="account_settings_general_title">一般设置</string>
<string name="account_settings_display_prefs_title">显示</string>
<string name="account_settings_sync">正在接受邮件</string>
<string name="account_settings_folders">文件夹</string>
@ -568,11 +596,13 @@
<string name="account_settings_crypto_app_not_available">不可用</string>
<string name="account_settings_crypto_auto_signature">自动签名</string>
<string name="account_settings_crypto_auto_signature_summary">使用账户的电子邮件地址自动猜测签名密钥。</string>
<!-- NEW: <string name="account_settings_crypto_auto_encrypt">Auto-encrypt</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">文件夹检查频率</string>
<string name="account_settings_second_class_check_frequency_label">第二组检查频率</string>
<!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
<string name="account_settings_storage_title">存储</string>
<string name="account_settings_color_label">账户颜色</string>
<string name="account_settings_color_summary">选择账户在文件夹和账户列表中显示时所使用的颜色</string>
@ -732,7 +762,7 @@
<string name="choose_identity">选择身份标识</string>
<string name="choose_identity_title">选择身份标识</string>
<string name="choose_account_title">选择账户/身份标识</string>
<!-- NEW: <string name="send_as">Send as</string>-->
<string name="send_as">发送为</string>
<string name="no_identities">请使用“账户设置”-&gt;“管理身份标识”来创建身份标识</string>
<string name="no_removable_identity">您必须保留一个身份标识</string>
@ -754,6 +784,7 @@
<string name="sort_by">排序方式</string>
<string name="sort_by_date">日期</string>
<!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
<string name="sort_by_sender">发件人</string>
<string name="sort_by_subject">主题</string>
<string name="sort_by_flag">星标</string>
@ -771,11 +802,11 @@
<string name="account_clear_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”中的全部邮件将从K-9 Mail中删除但是账户设置将保留。</string>
<string name="provider_note_live">只有一些“高级账户”允许POP访问并允许该程序连接。如果您使用了正确的用户名和密码却仍旧无法登录则您可能没有购买这些“高级账户”。请使用浏览器来访问这些账户。</string>
<!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="provider_note_yahoojp">如果您想使用POP3请在Yahoo mail的设置页面里设置允许POP3。</string>
<string name="provider_note_naver">如果您想使用IMAP或者POP3请在Naver mail的设置页面设置允许IMAP或者POP3。</string>
<string name="provider_note_hanmail">如果您想使用IMAP或者POP3请在Hanmail(Daum) mail的设置页面设置允许IMAP或者POP3。</string>
<string name="provider_note_paran">如果您想使用IMAP或者POP3请在Paran mail的设置页面设置允许IMAP或者POP3。</string>
<string name="provider_note_nate">如果您想使用IMAP或者POP3请在Nate mail的设置页面设置允许IMAP或者POP3。</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">无法识别的证书信息</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">接收密钥</string>
@ -797,6 +828,8 @@
Q - 返回全部账户\u000A
S - 编辑账户设置</string>
<!-- NEW: <string name="folder_list_filter_hint">folder name contains</string>-->
<string name="folder_list_display_mode_label">文件夹</string>
<string name="folder_list_display_mode_all">显示全部文件夹</string>
<string name="folder_list_display_mode_first_class">只显示初级文件夹</string>
@ -873,8 +906,8 @@
<string name="gestures_title">手势</string>
<string name="gestures_summary">接收手势控制</string>
<!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
<!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
<string name="compact_layouts_title">紧凑布局</string>
<string name="compact_layouts_summary">对每个页面调整布局以显示更多内容</string>
<string name="volume_navigation_title">音量键导航</string>
<string name="volume_navigation_summary">利用音量键选择项目</string>
@ -893,8 +926,8 @@
<string name="count_search_title">计算搜索结果的数量</string>
<string name="count_search_summary">关闭该功能以便加快显示速度</string>
<!-- NEW: <string name="hide_special_accounts_title">Hide special accounts</string>-->
<!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>-->
<string name="hide_special_accounts_title">隐藏特殊帐户</string>
<string name="hide_special_accounts_summary">隐藏统一的收件箱以及所有邮件帐户</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"> - 星标</string>
@ -934,7 +967,7 @@
<string name="font_size_message_list_subject">主题</string>
<string name="font_size_message_list_sender">发件人</string>
<string name="font_size_message_list_date">日期</string>
<!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
<string name="font_size_message_list_preview">预览</string>
<string name="font_size_message_view">邮件</string>
<string name="font_size_message_view_sender">发件人</string>
@ -946,6 +979,9 @@
<string name="font_size_message_view_date">日期</string>
<string name="font_size_message_view_content">邮件内容</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_tiniest">最小</string>
<string name="font_size_tiny">更小</string>
<string name="font_size_smaller"></string>
@ -987,6 +1023,15 @@
<string name="save_or_discard_draft_message_dlg_title">保存邮件草稿?</string>
<string name="save_or_discard_draft_message_instructions_fmt">保存还是忽略这封邮件?</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>-->
<!-- 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>-->
<!-- 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="charset_not_found">由于没有找到字符集“<xliff:g id="charset">%s</xliff:g>”,该邮件无法显示。</string>
<string name="select_text_now">选择需要拷贝的文本。</string>
@ -996,81 +1041,106 @@
<string name="dialog_confirm_delete_confirm_button">删除</string>
<string name="dialog_confirm_delete_cancel_button">不要删除</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">确认移动到垃圾邮件文件夹</string>
<plurals name="dialog_confirm_spam_message">
<item quantity="one">确认移动该邮件到垃圾邮件文件夹?</item>
<item quantity="other">确认移动<xliff:g id="message_count">%1$d</xliff:g>邮件到垃圾邮件文件夹?</item>
</plurals>
<string name="dialog_confirm_spam_confirm_button"></string>
<string name="dialog_confirm_spam_cancel_button"></string>
Translators:
<string name="dialog_attachment_progress_title">正在下载附件</string>
Please review how to handle pluralization for your language at (1) and ajust
the <item> elements accordingly
<string name="debug_logging_enabled">启用调试日志(写入系统日志)</string>
Possible values for 'quantity': zero, one, two, few, many, other
<string name="messagelist_sent_to_me_sigil">»</string>
<string name="messagelist_sent_cc_me_sigil"></string>
<string name="error_unable_to_connect">无法连接</string>
(1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
<string name="import_export_action">设置导入&amp;导出</string>
<string name="settings_export_account">导出账户设置</string>
<string name="settings_export_all">导出账户以及账户设定</string>
<string name="settings_import_dialog_title">导入</string>
<string name="settings_export_dialog_title">导出</string>
<string name="settings_import">导入设定</string>
<string name="settings_import_selection">导入选择</string>
<string name="settings_import_global_settings">全局设置</string>
<string name="settings_exporting">正在导出设置...</string>
<string name="settings_importing">正在导入设置...</string>
<string name="settings_import_scanning_file">正在扫描文件...</string>
<string name="settings_export_success">设置已导出到<xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_global_settings_success">全局设置已自<xliff:g id="filename">%s</xliff:g>导入</string>
<string name="settings_import_success">账户<xliff:g id="accounts">%s</xliff:g>已自<xliff:g id="filename">%s</xliff:g>导入</string>
<plurals name="settings_import_success">
<item quantity="one">单个账户</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> 账户</item>
</plurals>
<string name="settings_export_failure">导出设置失败</string>
<string name="settings_import_failure"><xliff:g id="filename">%s</xliff:g>导入设置失败</string>
<string name="settings_export_success_header">导出成功</string>
<string name="settings_export_failed_header">导出失败</string>
<string name="settings_import_success_header">导入成功</string>
<string name="settings_import_failed_header">导入失败</string>
<string name="settings_import_activate_account_header">激活账户</string>
<string name="settings_import_activate_account_intro">使用账户\"<xliff:g id="account">%s</xliff:g>\",您需要提供<xliff:g id="server_passwords">%s.</xliff:g></string>
<plurals name="settings_import_server_passwords">
<item quantity="one">服务器密码</item>
<item quantity="other">服务器密码</item>
</plurals>
<string name="settings_import_incoming_server">接收邮件服务器 (<xliff:g id="hostname">%s</xliff:g>):</string>
<string name="settings_import_outgoing_server">发送邮件服务器 (<xliff:g id="hostname">%s</xliff:g>):</string>
<plurals name="settings_import_setting_passwords">
<item quantity="one">正在设置密码...</item>
<item quantity="other">正在设置密码...</item>
</plurals>
<string name="settings_import_use_incoming_server_password">使用接受邮件服务器的密码</string>
<string name="activate_account_action">激活</string>
</plurals>-->
<!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
<!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->
<string name="settings_unknown_version">无法处理版本为<xliff:g id="version">%s</xliff:g>的文件</string>
<!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
<string name="account_unavailable">账户\"<xliff:g id="account">%s</xliff:g>\"不可用;请检查存储</string>
<string name="debug_logging_enabled">已经启用将调试日志写入Andorid日志系统</string>
<string name="settings_attachment_default_path">保存附件到...</string>
<string name="attachment_save_title">保存附件</string>
<string name="attachment_save_desc">没有找到文件管理器。该附件应保存到哪里?</string>
<!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
<!-- NEW: <string name="messagelist_sent_cc_me_sigil"></string>-->
<!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
<string name="manage_accounts_move_up_action">向上移动</string>
<string name="manage_accounts_move_down_action">向下移动</string>
<string name="manage_accounts_moving_message">正在移动账户...</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>-->
<!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
<!-- NEW: <plurals name="settings_import_setting_passwords">
<item quantity="one">Setting password...</item>
<item quantity="other">Setting passwords...</item>
</plurals>-->
<!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>-->
<!-- NEW: <string name="activate_account_action">Activate</string>-->
<!-- NEW: <string name="unread_widget_label">Kaiten Mail unread</string>-->
<!-- NEW: <string name="unread_widget_select_account">Show unread count for…</string>-->
<!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>-->
<!-- NEW: <string name="import_dialog_error_title">Missing File Manager Application</string>-->
<!-- NEW: <string name="import_dialog_error_message">There is no suitable application to handle
the import operation. Please install a file manager application from Android Market</string>-->
<!-- NEW: <string name="open_market">Open Market</string>-->
<!-- NEW: <string name="close">Close</string>-->
<!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>-->
<!-- NEW: <string name="webview_empty_message">No text</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>-->
<!-- 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>-->
<!-- 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>-->
<!-- 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>-->
<!-- 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>-->
<!-- 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>-->
<!-- 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>-->
</resources>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<plurals name="dialog_confirm_spam_message">
<item quantity="other">確定要將選取的 %1$d 封郵件移至垃圾桶嗎?</item>
<item quantity="one">確定要將郵件移至垃圾桶嗎?</item>
</plurals>
</resources>

File diff suppressed because it is too large Load Diff

View File

@ -485,6 +485,7 @@
<item>cs</item>
<item>el</item>
<item>uk</item>
<item>he</item>
<item>zh_TW</item>
<item>zh_CN</item>
<item>ja</item>

View File

@ -193,7 +193,7 @@ public class K9 extends Application {
private static boolean mBatchButtonsFlag = true;
private static boolean mBatchButtonsUnselect = true;
private static boolean mShowAdvancedOptions;
private static boolean useGalleryBugWorkaround = false;
private static boolean galleryBuggy;
@ -453,7 +453,7 @@ public class K9 extends Application {
editor.putBoolean("batchButtonsMove", mBatchButtonsMove);
editor.putBoolean("batchButtonsFlag", mBatchButtonsFlag);
editor.putBoolean("batchButtonsUnselect", mBatchButtonsUnselect);
editor.putString("language", language);
editor.putInt("theme", theme);
editor.putBoolean("useGalleryBugWorkaround", useGalleryBugWorkaround);
@ -463,6 +463,9 @@ public class K9 extends Application {
editor.putBoolean("confirmSpam", mConfirmSpam);
editor.putBoolean("confirmMarkAllAsRead", mConfirmMarkAllAsRead);
editor.putString("sortTypeEnum", mSortType.name());
editor.putBoolean("sortAscending", mSortAscending.get(mSortType));
editor.putBoolean("keyguardPrivacy", mKeyguardPrivacy);
editor.putBoolean("compactLayouts", compactLayouts);
@ -477,9 +480,6 @@ public class K9 extends Application {
super.onCreate();
app = this;
mSortType = Account.DEFAULT_SORT_TYPE;
mSortAscending.put(Account.DEFAULT_SORT_TYPE, Account.DEFAULT_SORT_ASCENDING);
galleryBuggy = checkForBuggyGallery();
Preferences prefs = Preferences.getPreferences(this);
@ -613,7 +613,7 @@ public class K9 extends Application {
mBatchButtonsMove = sprefs.getBoolean("batchButtonsMove", true);
mBatchButtonsFlag = sprefs.getBoolean("batchButtonsFlag", true);
mBatchButtonsUnselect = sprefs.getBoolean("batchButtonsUnselect", true);
useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy());
mConfirmDelete = sprefs.getBoolean("confirmDelete", false);
@ -621,6 +621,15 @@ public class K9 extends Application {
mConfirmSpam = sprefs.getBoolean("confirmSpam", false);
mConfirmMarkAllAsRead = sprefs.getBoolean("confirmMarkAllAsRead", true);
try {
String value = sprefs.getString("sortTypeEnum", Account.DEFAULT_SORT_TYPE.name());
mSortType = SortType.valueOf(value);
} catch (Exception e) {
mSortType = Account.DEFAULT_SORT_TYPE;
}
boolean sortAscending = sprefs.getBoolean("sortAscending", Account.DEFAULT_SORT_ASCENDING);
mSortAscending.put(mSortType, sortAscending);
mKeyguardPrivacy = sprefs.getBoolean("keyguardPrivacy", false);
@ -1061,47 +1070,47 @@ public class K9 extends Application {
}
public static boolean batchButtonsMarkRead() {
return mBatchButtonsMarkRead;
return mBatchButtonsMarkRead;
}
public static void setBatchButtonsMarkRead(final boolean state) {
mBatchButtonsMarkRead = state;
mBatchButtonsMarkRead = state;
}
public static boolean batchButtonsDelete() {
return mBatchButtonsDelete;
return mBatchButtonsDelete;
}
public static void setBatchButtonsDelete(final boolean state) {
mBatchButtonsDelete = state;
mBatchButtonsDelete = state;
}
public static boolean batchButtonsArchive() {
return mBatchButtonsArchive;
return mBatchButtonsArchive;
}
public static void setBatchButtonsArchive(final boolean state) {
mBatchButtonsArchive = state;
mBatchButtonsArchive = state;
}
public static boolean batchButtonsMove() {
return mBatchButtonsMove;
return mBatchButtonsMove;
}
public static void setBatchButtonsMove(final boolean state) {
mBatchButtonsMove = state;
mBatchButtonsMove = state;
}
public static boolean batchButtonsFlag() {
return mBatchButtonsFlag;
return mBatchButtonsFlag;
}
public static void setBatchButtonsFlag(final boolean state) {
mBatchButtonsFlag = state;
mBatchButtonsFlag = state;
}
public static boolean batchButtonsUnselect() {
return mBatchButtonsUnselect;
return mBatchButtonsUnselect;
}
public static void setBatchButtonsUnselect(final boolean state) {
mBatchButtonsUnselect = state;
mBatchButtonsUnselect = state;
}
/**
* Check if this system contains a buggy Gallery 3D package.
*

View File

@ -25,8 +25,9 @@ public class Preferences {
private static Preferences preferences;
public static synchronized Preferences getPreferences(Context context) {
Context appContext = context.getApplicationContext();
if (preferences == null) {
preferences = new Preferences(context);
preferences = new Preferences(appContext);
}
return preferences;
}

View File

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

View File

@ -135,10 +135,31 @@ public class K9Activity extends Activity {
private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
protected MotionEvent mLastOnDownEvent = null;
@Override
public boolean onDown(MotionEvent e) {
mLastOnDownEvent = e;
return super.onDown(e);
}
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
// Do fling-detection if gestures are force-enabled or we have system-wide gestures enabled.
if (gesturesEnabled || K9.gesturesEnabled()) {
// Apparently sometimes e1 is null
// Found a workaround here: http://stackoverflow.com/questions/4151385/
if (e1 == null) {
e1 = mLastOnDownEvent;
}
// Make sure we avoid NullPointerExceptions
if (e1 == null || e2 == null) {
return false;
}
// Calculate the minimum distance required for this to count as a swipe.
// Convert the constant dips to pixels.
final float mGestureScale = getResources().getDisplayMetrics().density;

View File

@ -12,6 +12,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences.Editor;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
@ -834,15 +835,18 @@ public class MessageList
mController.addListener(mAdapter.mListener);
Account[] accountsWithNotification;
if (mAccount != null) {
accountsWithNotification = new Account[] { mAccount };
mSortType = mAccount.getSortType();
mSortAscending = mAccount.isSortAscending(mSortType);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
Preferences prefs = Preferences.getPreferences(getApplicationContext());
Account account = getCurrentAccount(prefs);
if (account != null) {
accountsWithNotification = new Account[] { account };
mSortType = account.getSortType();
mSortAscending = account.isSortAscending(mSortType);
mSortDateAscending = account.isSortAscending(SortType.SORT_DATE);
} else {
Preferences preferences = Preferences.getPreferences(this);
accountsWithNotification = preferences.getAccounts();
mSortType = K9.getSortType(); // ASH
accountsWithNotification = prefs.getAccounts();
mSortType = K9.getSortType();
mSortAscending = K9.isSortAscending(mSortType);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
}
@ -1053,7 +1057,7 @@ public class MessageList
return true;
}
case KeyEvent.KEYCODE_I: {
onToggleSortAscending();
changeSort(mSortType);
return true;
}
case KeyEvent.KEYCODE_H: {
@ -1206,22 +1210,55 @@ public class MessageList
}
private void changeSort(SortType sortType) {
if (mSortType == sortType) {
onToggleSortAscending();
} else {
mSortType = sortType;
if (mAccount != null) {
mAccount.setSortType(mSortType);
mSortAscending = mAccount.isSortAscending(mSortType);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
mAccount.save(Preferences.getPreferences(this));
Boolean sortAscending = (mSortType == sortType) ? !mSortAscending : null;
changeSort(sortType, sortAscending);
}
/**
* Change the sort type and sort order used for the message list.
*
* @param sortType
* Specifies which field to use for sorting the message list.
* @param sortAscending
* Specifies the sort order. If this argument is {@code null} the default search order
* for the sort type is used.
*/
// FIXME: Don't save the changes in the UI thread
private void changeSort(SortType sortType, Boolean sortAscending) {
mSortType = sortType;
Preferences prefs = Preferences.getPreferences(getApplicationContext());
Account account = getCurrentAccount(prefs);
if (account != null) {
account.setSortType(mSortType);
if (sortAscending == null) {
mSortAscending = account.isSortAscending(mSortType);
} else {
K9.setSortType(mSortType);
mSortAscending = K9.isSortAscending(mSortType);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
mSortAscending = sortAscending;
}
reSort();
account.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = account.isSortAscending(SortType.SORT_DATE);
account.save(prefs);
} else {
K9.setSortType(mSortType);
if (sortAscending == null) {
mSortAscending = K9.isSortAscending(mSortType);
} else {
mSortAscending = sortAscending;
}
K9.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
Editor editor = prefs.getPreferences().edit();
K9.save(editor);
editor.commit();
}
reSort();
}
private void reSort() {
@ -1253,19 +1290,6 @@ public class MessageList
changeSort(sorts[curIndex]);
}
private void onToggleSortAscending() {
mSortAscending = !mSortAscending;
if (mAccount != null) {
mAccount.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
mAccount.save(Preferences.getPreferences(this));
} else {
K9.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
}
reSort();
}
/**
* @param holders
* Never {@code null}.
@ -2978,4 +3002,25 @@ public class MessageList
Accounts.listAccounts(this);
}
/**
* Return the currently "open" account if available.
*
* @param prefs
* A {@link Preferences} instance that might be used to retrieve the current
* {@link Account}.
*
* @return The {@code Account} all displayed messages belong to.
*/
private Account getCurrentAccount(Preferences prefs) {
Account account = null;
if (mQueryString != null && !mIntegrate && mAccountUuids != null &&
mAccountUuids.length == 1) {
String uuid = mAccountUuids[0];
account = prefs.getAccount(uuid);
} else if (mAccount != null) {
account = mAccount;
}
return account;
}
}

View File

@ -3185,7 +3185,7 @@ public class MessagingController implements Runnable {
NotificationManager notifMgr =
(NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.getInstance(mApplication);
NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
builder.setSmallIcon(R.drawable.ic_menu_refresh);
builder.setWhen(System.currentTimeMillis());
builder.setOngoing(true);
@ -3232,7 +3232,7 @@ public class MessagingController implements Runnable {
NotificationManager notifMgr =
(NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.getInstance(mApplication);
NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
builder.setSmallIcon(R.drawable.stat_notify_email_generic);
builder.setWhen(System.currentTimeMillis());
builder.setAutoCancel(true);
@ -3267,7 +3267,7 @@ public class MessagingController implements Runnable {
final NotificationManager notifMgr =
(NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.getInstance(mApplication);
NotificationBuilder builder = NotificationBuilder.createInstance(mApplication);
builder.setSmallIcon(R.drawable.ic_menu_refresh);
builder.setWhen(System.currentTimeMillis());
builder.setOngoing(true);
@ -4556,7 +4556,7 @@ public class MessagingController implements Runnable {
NotificationManager notifMgr =
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationBuilder builder = NotificationBuilder.getInstance(context);
NotificationBuilder builder = NotificationBuilder.createInstance(context);
builder.setSmallIcon(R.drawable.stat_notify_email_generic);
builder.setWhen(System.currentTimeMillis());
builder.setTicker(messageNotice);

View File

@ -1,15 +1,10 @@
package com.fsck.k9.helper;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
import android.os.Build;
import android.content.Intent;
import android.util.Log;
import com.fsck.k9.K9;
import com.fsck.k9.mail.Address;
/**
@ -36,43 +31,20 @@ public abstract class Contacts {
* @return Appropriate {@link Contacts} instance for this device.
*/
public static Contacts getInstance(Context context) {
Context appContext = context.getApplicationContext();
if (sInstance == null) {
/*
* Check the version of the SDK we are running on. Choose an
* implementation class designed for that version of the SDK.
*/
String className = null;
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ECLAIR_MR1) {
/*
* The new API was introduced with SDK 5. But Android versions < 2.2
* need some additional code to be able to search for phonetic names.
*/
className = "com.fsck.k9.helper.ContactsSdk5p";
sInstance = new ContactsSdk5p(appContext);
} else {
className = "com.fsck.k9.helper.ContactsSdk5";
}
/*
* Find the required class by name and instantiate it.
*/
try {
Class <? extends Contacts > clazz =
Class.forName(className).asSubclass(Contacts.class);
Constructor <? extends Contacts > constructor = clazz.getConstructor(Context.class);
sInstance = constructor.newInstance(context);
} catch (ClassNotFoundException e) {
Log.e(K9.LOG_TAG, "Couldn't find class: " + className, e);
} catch (InstantiationException e) {
Log.e(K9.LOG_TAG, "Couldn't instantiate class: " + className, e);
} catch (IllegalAccessException e) {
Log.e(K9.LOG_TAG, "Couldn't access class: " + className, e);
} catch (NoSuchMethodException e) {
Log.e(K9.LOG_TAG, "Couldn't find constructor of class: " + className, e);
} catch (IllegalArgumentException e) {
Log.e(K9.LOG_TAG, "Wrong arguments for constructor of class: " + className, e);
} catch (InvocationTargetException e) {
Log.e(K9.LOG_TAG, "Couldn't invoke constructor of class: " + className, e);
sInstance = new ContactsSdk5(appContext);
}
}

View File

@ -14,31 +14,26 @@ import android.os.Vibrator;
* @see NotificationBuilderApi11
*/
public abstract class NotificationBuilder {
/**
* Instance of the API-specific class that is used to create system notifications
*/
private static NotificationBuilder sInstance = null;
/**
* Get API-specific instance of the {@code NotificationBuilder} class
* Create instance of an API-specific {@code NotificationBuilder} subclass.
*
* @param context
* A {@link Context} instance.
*
* @return Appropriate {@link NotificationBuilder} instance for this device.
*/
public static NotificationBuilder getInstance(Context context) {
public static NotificationBuilder createInstance(Context context) {
Context appContext = context.getApplicationContext();
if (sInstance == null) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
sInstance = new NotificationBuilderApi1(appContext);
} else {
sInstance = new NotificationBuilderApi11(appContext);
}
NotificationBuilder instance;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
instance = new NotificationBuilderApi1(appContext);
} else {
instance = new NotificationBuilderApi11(appContext);
}
return sInstance;
return instance;
}

View File

@ -18,11 +18,12 @@ public class TracingPowerManager {
private Timer timer = null;
public static synchronized TracingPowerManager getPowerManager(Context context) {
Context appContext = context.getApplicationContext();
if (tracingPowerManager == null) {
if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Creating TracingPowerManager");
}
tracingPowerManager = new TracingPowerManager(context);
tracingPowerManager = new TracingPowerManager(appContext);
}
return tracingPowerManager;
}

View File

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

View File

@ -371,12 +371,24 @@ public class LockableDatabase {
try {
final File databaseFile = prepareStorage(mStorageProviderId);
try {
mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
if (StorageManager.InternalStorageProvider.ID.equals(mStorageProviderId)) {
// internal storage
mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
} else {
// external storage
mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null);
}
} catch (SQLiteException e) {
// try to gracefully handle DB corruption - see issue 2537
Log.w(K9.LOG_TAG, "Unable to open DB " + databaseFile + " - removing file and retrying", e);
databaseFile.delete();
mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
if (StorageManager.InternalStorageProvider.ID.equals(mStorageProviderId)) {
// internal storage
mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE, null);
} else {
// external storage
mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null);
}
}
if (mDb.getVersion() != mSchemaDefinition.getVersion()) {
mSchemaDefinition.doDbUpgrade(mDb);

View File

@ -30,6 +30,9 @@ public class AccountSettings {
* and use that for whatever you add here.
*/
s.put("alwaysBcc", Settings.versions(
new V(11, new StringSetting(""))
));
s.put("archiveFolderName", Settings.versions(
new V(1, new StringSetting("Archive"))
));

View File

@ -12,9 +12,11 @@ import java.util.TreeMap;
import android.content.SharedPreferences;
import android.os.Environment;
import com.fsck.k9.Account;
import com.fsck.k9.FontSizes;
import com.fsck.k9.K9;
import com.fsck.k9.R;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.helper.DateFormatter;
import com.fsck.k9.preferences.Settings.*;
@ -185,6 +187,12 @@ public class GlobalSettings {
s.put("showCorrespondentNames", Settings.versions(
new V(1, new BooleanSetting(true))
));
s.put("sortTypeEnum", Settings.versions(
new V(10, new EnumSetting(SortType.class, Account.DEFAULT_SORT_TYPE))
));
s.put("sortAscending", Settings.versions(
new V(10, new BooleanSetting(Account.DEFAULT_SORT_ASCENDING))
));
s.put("startIntegratedInbox", Settings.versions(
new V(1, new BooleanSetting(false))
));
@ -205,23 +213,23 @@ public class GlobalSettings {
new V(4, new BooleanSetting(true))
));
s.put("batchButtonsMarkRead", Settings.versions(
new V(8, new BooleanSetting(true))
));
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsDelete", Settings.versions(
new V(8, new BooleanSetting(true))
));
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsArchive", Settings.versions(
new V(8, new BooleanSetting(false))
));
new V(8, new BooleanSetting(false))
));
s.put("batchButtonsMove", Settings.versions(
new V(8, new BooleanSetting(false))
));
new V(8, new BooleanSetting(false))
));
s.put("batchButtonsFlag", Settings.versions(
new V(8, new BooleanSetting(true))
));
new V(8, new BooleanSetting(true))
));
s.put("batchButtonsUnselect", Settings.versions(
new V(8, new BooleanSetting(true))
));
new V(8, new BooleanSetting(true))
));
SETTINGS = Collections.unmodifiableMap(s);

View File

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

View File

@ -214,7 +214,7 @@ public class Storage implements SharedPreferences {
}
protected void put(Map<String, String> insertables) {
String sql = "insert into preferences_storage (primkey, value) VALUES (?, ?)";
String sql = "INSERT INTO preferences_storage (primkey, value) VALUES (?, ?)";
SQLiteStatement stmt = workingDB.get().compileStatement(sql);
for (Map.Entry<String, String> entry : insertables.entrySet()) {

View File

@ -28,7 +28,7 @@ public class ViewablesTest extends AndroidTestCase {
String expectedHtml =
"<html><head/><body>" +
"<pre style=\"white-space: pre-wrap; word-wrap:break-word; " +
"font-family: sans-serif\">" +
"font-family: sans-serif; margin-top: 0px\">" +
"K-9 Mail rocks :&gt;" +
"</pre>" +
"</body></html>";
@ -90,13 +90,13 @@ public class ViewablesTest extends AndroidTestCase {
String expectedHtml =
"<html><head/><body>" +
"<pre style=\"white-space: pre-wrap; word-wrap:break-word; " +
"font-family: sans-serif\">" +
"font-family: sans-serif; margin-top: 0px\">" +
bodyText1 +
"</pre>" +
"<p style=\"margin-top: 2.5em; margin-bottom: 1em; " +
"border-bottom: 1px solid #000\"></p>" +
"<pre style=\"white-space: pre-wrap; word-wrap:break-word; " +
"font-family: sans-serif\">" +
"font-family: sans-serif; margin-top: 0px\">" +
bodyText2 +
"</pre>" +
"</body></html>";
@ -108,7 +108,7 @@ public class ViewablesTest extends AndroidTestCase {
public void testTextPlusRfc822Message() throws MessagingException {
Locale.setDefault(Locale.US);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
String bodyText = "Some text here";
String innerBodyText = "Hey there. I'm inside a message/rfc822 (inline) attachment.";
@ -156,7 +156,7 @@ public class ViewablesTest extends AndroidTestCase {
String expectedHtml =
"<html><head/><body>" +
"<pre style=\"white-space: pre-wrap; word-wrap:break-word; " +
"font-family: sans-serif\">" +
"font-family: sans-serif; margin-top: 0px\">" +
bodyText +
"</pre>" +
"<p style=\"margin-top: 2.5em; margin-bottom: 1em; border-bottom: " +
@ -177,7 +177,7 @@ public class ViewablesTest extends AndroidTestCase {
"</tr>" +
"</table>" +
"<pre style=\"white-space: pre-wrap; word-wrap:break-word; " +
"font-family: sans-serif\">" +
"font-family: sans-serif; margin-top: 0px\">" +
innerBodyText +
"</pre>" +
"</body></html>";