Merged in he, ja, ko, ru, th, and zh

api/res/values-he/strings.xml

@@ -17,8 +17,8 @@
     <item quantity="other">%d ימים</item>
   </plurals>
   <plurals name="DUt_weekdays">
-    <item quantity="one">יום חול אחד</item>
-    <item quantity="other">%d ימי חול</item>
+    <item quantity="one">יום עבודה אחד</item>
+    <item quantity="other">%d ימי עבודה</item>
   </plurals>
   <plurals name="DUt_hours">
     <item quantity="one">שעה אחת</item>
@@ -49,8 +49,8 @@
     <item quantity="other">%d משימות</item>
   </plurals>
   <plurals name="Npeople">
-    <item quantity="one">איש אחד</item>
-    <item quantity="other">%d אנשים</item>
+    <item quantity="one">שותף אחד</item>
+    <item quantity="other">%d שותפים</item>
   </plurals>
   <string name="today">היום</string>
   <string name="tomorrow">מחר</string>
@@ -64,41 +64,46 @@
   <string name="DLG_save">שמור</string>
   <string name="DLG_yes">כן</string>
   <string name="DLG_no">לא</string>
-  <string name="DLG_close">סגירה</string>
+  <string name="DLG_close">סגור</string>
   <string name="DLG_done">בוצע</string>
-  <string name="DLG_error">אופס, נראה שארתה שגיאה! הרי מה שהתרחש:\n\n%s</string>
-  <string name="DLG_error_generic">אופס, נראה שארתה שגיאה!</string>
-  <string name="DLG_wait">נא להמתין...</string>
-  <string name="SyP_progress">המשימות שלך מסונכרנות...</string>
+  <string name="DLG_error">אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s</string>
+  <string name="DLG_error_generic">אוּפְּס, נראה שארעה שגיאה!</string>
+  <string name="DLG_wait">אנא המתן...</string>
+  <string name="SyP_progress">מסנכרן את המשימות שלך...</string>
   <string name="SyP_progress_toast">בסנכרון...</string>
   <string name="SyP_label">סינכרון</string>
   <string name="SyP_ioerror">שגיאה בחיבור! בדוק את חיבור האינטרנט שלך</string>
   <string name="sync_SPr_group_status">מצב</string>
-  <string name="sync_status_loggedout">לא מחובר לחשבון!</string>
+  <string name="sync_SPr_status_subtitle">מצב: %s</string>
+  <string name="sync_status_loggedout">לא מחובר</string>
   <string name="sync_status_ongoing">מסנכרן...</string>
   <string name="sync_status_success">סנכרון אחרון:\n%s</string>
-  <string name="sync_status_failed">נכשל ב: s%</string>
-  <string name="sync_status_errors">סנכרון עם שגיאות: s%</string>
+  <string name="sync_status_failed">נכשל ב: %s</string>
+  <string name="sync_status_errors">סנכרון עם שגיאות: %s</string>
   <string name="sync_status_failed_subtitle">סנכרון מוצלח אחרון: %s</string>
   <string name="sync_status_never">לעולם לא סונכרן!</string>
   <string name="sync_SPr_group_options">אפשרויות</string>
   <string name="sync_SPr_interval_title">סנכרון ברקע</string>
   <string name="sync_SPr_interval_desc_disabled">סנכרון ברקע אינו מופעל</string>
-  <string name="sync_SPr_interval_desc">כרגע מוגדר ל: s%</string>
+  <string name="sync_SPr_interval_desc">כרגע מוגדר ל: %s</string>
   <string name="sync_SPr_bgwifi_title">הגדרת WiFi בלבד</string>
   <string name="sync_SPr_bgwifi_desc_enabled">סנכרון רקע מתרחש רק כאשר על WiFi</string>
   <string name="sync_SPr_bgwifi_desc_disabled">סנכרון רקע תמיד יתבצע</string>
   <string name="sync_SPr_group_actions">פעולות</string>
-  <string name="sync_SPr_sync">סנכרן כעת!</string>
+  <string name="sync_SPr_sync">מסנכרן כעת</string>
   <string name="sync_SPr_sync_log_in">היכנס לחשבון וסנכרן!</string>
   <string name="sync_SPr_logged_in_prefix">מחובר לחשבון בתור:</string>
-  <string name="sync_SPr_forget">צא מהחשבון</string>
+  <string name="sync_SPr_last_error">דו\"ח מצב</string>
+  <string name="sync_SPr_last_error_subtitle">הקלק כדי לשלוח דוח לצוות של אסטריד</string>
+  <string name="sync_SPr_send_report">שלח דוח</string>
+  <string name="sync_SPr_forget">התנתק</string>
   <string name="sync_SPr_forget_description">מסיר את כל נתוני הסנכרון</string>
   <string name="sync_forget_confirm">צא מהחשבון \\ הסר נתוני סנכרון?</string>
+  <string name="sync_error_offline">נתקלתי בבעית חיבור לרשת בזמן הסינכרון האחרון עם %s. אנא נסה מאוחר יותר.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>נטרל</item>
-    <item>כל חמש עשרה דקות</item>
-    <item>כל שלושים דקות</item>
+    <item>כל רבע שעה</item>
+    <item>כל חצי שעה</item>
     <item>כל שעה</item>
     <item>כל שלוש שעות</item>
     <item>כל שש שעות</item>

api/res/values-ja/strings.xml

@@ -89,12 +89,16 @@
   <string name="sync_SPr_bgwifi_desc_enabled">Wi-Fi が有効なときだけバックグラウンドで同期する</string>
   <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
   <string name="sync_SPr_group_actions">アクション</string>
-  <string name="sync_SPr_sync">すぐに同期!</string>
+  <string name="sync_SPr_sync">すぐに同期</string>
   <string name="sync_SPr_sync_log_in">ログインと同期</string>
   <string name="sync_SPr_logged_in_prefix">ログインアカウント：</string>
+  <string name="sync_SPr_last_error">Status Report</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_send_report">Send Report</string>
   <string name="sync_SPr_forget">ログアウト</string>
   <string name="sync_SPr_forget_description">すべての同期データを消去します</string>
   <string name="sync_forget_confirm">ログアウトと同期データを消去しますか?</string>
+  <string name="sync_error_offline">There was a problem connecting to the network during the last sync with %s. Please try again later.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>無効</item>
     <item>15分毎</item>

api/res/values-ko/strings.xml

@@ -74,7 +74,7 @@
   <string name="SyP_label">동기화</string>
   <string name="SyP_ioerror">연결 오류! 인터넷 연결을 확인하세요.</string>
   <string name="sync_SPr_group_status">상태</string>
-  <string name="sync_status_loggedout">로그인 되지 않았습니다!</string>
+  <string name="sync_status_loggedout">로그인 되지 않았습니다</string>
   <string name="sync_status_ongoing">동기화 진행중...</string>
   <string name="sync_status_success">마지막 동기화: \n%s</string>
   <string name="sync_status_failed">실패: %s</string>
@@ -89,22 +89,26 @@
   <string name="sync_SPr_bgwifi_desc_enabled">백그라운드 동기화는 WiFi 지역에서만 작동합니다.</string>
   <string name="sync_SPr_bgwifi_desc_disabled">백그라운드 동기화는 항상 작동합니다.</string>
   <string name="sync_SPr_group_actions">작업</string>
-  <string name="sync_SPr_sync">동기화 시작!</string>
+  <string name="sync_SPr_sync">동기화 시작</string>
   <string name="sync_SPr_sync_log_in">로그인 &amp; 동기화!</string>
   <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
+  <string name="sync_SPr_last_error">Status Report</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_send_report">Send Report</string>
   <string name="sync_SPr_forget">로그아웃</string>
   <string name="sync_SPr_forget_description">모든 동기화 데이터 삭제</string>
   <string name="sync_forget_confirm">로그아웃 / 모든 동기화 데이터 삭제?</string>
+  <string name="sync_error_offline">There was a problem connecting to the network during the last sync with %s. Please try again later.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>사용안함</item>
-    <item>매 15분 마다</item>
-    <item>매 30분마다</item>
+    <item>15분 마다</item>
+    <item>30분마다</item>
     <item>매 시간</item>
-    <item>매 3시간마다</item>
-    <item>매 6시간마다</item>
-    <item>매 12시간마다</item>
+    <item>3시간마다</item>
+    <item>6시간마다</item>
+    <item>12시간마다</item>
     <item>매일</item>
-    <item>매 3일마다</item>
-    <item>매주</item>
+    <item>3일마다</item>
+    <item>일주일 마다</item>
   </string-array>
 </resources>

api/res/values-ru/strings.xml

@@ -55,8 +55,8 @@
   <string name="today">Сегодня</string>
   <string name="tomorrow">Завтра</string>
   <string name="yesterday">Вчера</string>
-  <string name="tmrw">Tmrw</string>
-  <string name="yest">Yest</string>
+  <string name="tmrw">Завт</string>
+  <string name="yest">Сег</string>
   <string name="DLG_confirm_title">Подтвердить?</string>
   <string name="DLG_question_title">Вопрос:</string>
   <string name="DLG_information_title">Информация</string>
@@ -74,9 +74,10 @@
   <string name="SyP_label">Синхронизация</string>
   <string name="SyP_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
   <string name="sync_SPr_group_status">Состояние</string>
-  <string name="sync_status_loggedout">Вы не вошли в систему!</string>
+  <string name="sync_SPr_status_subtitle">Состояние: %s</string>
+  <string name="sync_status_loggedout">Вход не выполнен</string>
   <string name="sync_status_ongoing">Процесс синхронизации…</string>
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Последняя синхронизация\n%s</string>
   <string name="sync_status_failed">Ошибка: %s</string>
   <string name="sync_status_errors">Синхронизировано с ошибками: %s</string>
   <string name="sync_status_failed_subtitle">Последняя успешная синхронизация: %s</string>
@@ -89,12 +90,16 @@
   <string name="sync_SPr_bgwifi_desc_enabled">Фоновая синхронизация происходит только через Wifi</string>
   <string name="sync_SPr_bgwifi_desc_disabled">Фоновая синхронизация происходит всегда</string>
   <string name="sync_SPr_group_actions">Действия</string>
-  <string name="sync_SPr_sync">Синхронизировать!</string>
+  <string name="sync_SPr_sync">Синхронизировать</string>
   <string name="sync_SPr_sync_log_in">Войти и синхронизировать!</string>
   <string name="sync_SPr_logged_in_prefix">Вы вошли в систему как:</string>
+  <string name="sync_SPr_last_error">Отчёт о состоянии</string>
+  <string name="sync_SPr_last_error_subtitle">Нажмите, чтобы отправить отчет команде Astrid</string>
+  <string name="sync_SPr_send_report">Послать отчёт</string>
   <string name="sync_SPr_forget">Выход</string>
   <string name="sync_SPr_forget_description">Очищает все данные синхронизации</string>
   <string name="sync_forget_confirm">Выйти / очистить данные синхронизации?</string>
+  <string name="sync_error_offline">В процессе последней синхронизации с %s возникли проблемы подключения к сети. Пожалуйста, повторите попытку позже.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>отключить</item>
     <item>каждые 15 минут</item>

api/res/values-th/strings.xml

@@ -74,7 +74,8 @@
   <string name="SyP_label">การปรับปรุงข้อมูลให้ตรงกัน</string>
   <string name="SyP_ioerror">ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท</string>
   <string name="sync_SPr_group_status">สถานะ</string>
-  <string name="sync_status_loggedout">Not Logged In!</string>
+  <string name="sync_SPr_status_subtitle">Status: %s</string>
+  <string name="sync_status_loggedout">Not Logged In</string>
   <string name="sync_status_ongoing">Sync Ongoing...</string>
   <string name="sync_status_success">Last Sync:\n%s</string>
   <string name="sync_status_failed">Failed On: %s</string>
@@ -89,12 +90,16 @@
   <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>
   <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
   <string name="sync_SPr_group_actions">การดำเนินการ</string>
-  <string name="sync_SPr_sync">ปรับข้อมูลเดี๋ยวนี้!</string>
+  <string name="sync_SPr_sync">ปรับข้อมูลเดี๋ยวนี้</string>
   <string name="sync_SPr_sync_log_in">Log In &amp; Synchronize!</string>
   <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
+  <string name="sync_SPr_last_error">Status Report</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_send_report">Send Report</string>
   <string name="sync_SPr_forget">Log Out</string>
   <string name="sync_SPr_forget_description">Clears all synchronization data</string>
   <string name="sync_forget_confirm">Log out / clear synchronization data?</string>
+  <string name="sync_error_offline">There was a problem connecting to the network during the last sync with %s. Please try again later.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>disable</item>
     <item>every fifteen minutes</item>

api/res/values-zh-rCN/strings.xml

@@ -74,6 +74,8 @@
   <string name="SyP_label">同步</string>
   <string name="SyP_ioerror">连接错误！请检查您的因特网连接。</string>
   <string name="sync_SPr_group_status">状态</string>
+  <string name="sync_SPr_status_subtitle">状态：%s</string>
+  <string name="sync_status_loggedout">未登陆</string>
   <string name="sync_status_ongoing">同步中...</string>
   <string name="sync_status_success">上次同步：\n%s</string>
   <string name="sync_status_failed">失败：%s</string>
@@ -88,15 +90,16 @@
   <string name="sync_SPr_bgwifi_desc_enabled">使用 Wifi 才启动后台同步</string>
   <string name="sync_SPr_bgwifi_desc_disabled">总是使用后台同步</string>
   <string name="sync_SPr_group_actions">动作</string>
+  <string name="sync_SPr_sync">现在同步</string>
   <string name="sync_SPr_sync_log_in">登陆并同步！</string>
   <string name="sync_SPr_logged_in_prefix">已经登录为：</string>
-  <string name="sync_SPr_last_error">Status Report</string>
-  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
-  <string name="sync_SPr_send_report">Send Report</string>
+  <string name="sync_SPr_last_error">状态报告</string>
+  <string name="sync_SPr_last_error_subtitle">点击给 Astrid 团队发送报告</string>
+  <string name="sync_SPr_send_report">发送报告</string>
   <string name="sync_SPr_forget">登出</string>
   <string name="sync_SPr_forget_description">清除所有同步资料</string>
   <string name="sync_forget_confirm">登出/清除同步资料?</string>
-  <string name="sync_error_offline">There was a problem connecting to the network during the last sync with %s. Please try again later.</string>
+  <string name="sync_error_offline">在最近与 %s 同步时网络连接发生问题。请重试。</string>
   <string-array name="sync_SPr_interval_entries">
     <item>停用</item>
     <item>每15分钟</item>

api/res/values-zh-rTW/strings.xml

@@ -45,17 +45,17 @@
     <item quantity="other">%d 秒</item>
   </plurals>
   <plurals name="Ntasks">
-    <item quantity="one">1 個工作</item>
+    <item quantity="one">1 task</item>
     <item quantity="other">%d 個工作</item>
   </plurals>
   <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
+    <item quantity="one">1 位用戶</item>
+    <item quantity="other">%d 位用戶</item>
   </plurals>
   <string name="today">今天</string>
   <string name="tomorrow">明天</string>
   <string name="yesterday">昨天</string>
-  <string name="tmrw">Tmrw</string>
+  <string name="tmrw">明天</string>
   <string name="yest">Yest</string>
   <string name="DLG_confirm_title">確認?</string>
   <string name="DLG_question_title">問題：</string>
@@ -74,7 +74,7 @@
   <string name="SyP_label">同步</string>
   <string name="SyP_ioerror">連結錯誤! 檢查您的網際網路連線.</string>
   <string name="sync_SPr_group_status">狀態</string>
-  <string name="sync_status_loggedout">未登入!</string>
+  <string name="sync_status_loggedout">未登入</string>
   <string name="sync_status_ongoing">同步中...</string>
   <string name="sync_status_success">上次同步:\n%s</string>
   <string name="sync_status_failed">失敗: %s</string>
@@ -89,12 +89,16 @@
   <string name="sync_SPr_bgwifi_desc_enabled">使用Wifi才啟動背景同步</string>
   <string name="sync_SPr_bgwifi_desc_disabled">總是使用背景同步</string>
   <string name="sync_SPr_group_actions">動作</string>
-  <string name="sync_SPr_sync">現在同步!</string>
+  <string name="sync_SPr_sync">現在同步</string>
   <string name="sync_SPr_sync_log_in">登入並同步!</string>
   <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
+  <string name="sync_SPr_last_error">Status Report</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_send_report">Send Report</string>
   <string name="sync_SPr_forget">登出</string>
   <string name="sync_SPr_forget_description">清除所有同步資料</string>
   <string name="sync_forget_confirm">登出 / 清除同步資料?</string>
+  <string name="sync_error_offline">There was a problem connecting to the network during the last sync with %s. Please try again later.</string>
   <string-array name="sync_SPr_interval_entries">
     <item>停用</item>
     <item>每15分鐘</item>

astrid/res/values-ja/strings.xml

@@ -4,7 +4,6 @@
   <string name="actfm_person_hint">連絡先またはEメール</string>
   <string name="actfm_person_or_tag_hint">連絡先または共有リスト</string>
   <string name="actfm_toast_success">サーバに保存</string>
-
   <string name="actfm_tag_operation_disabled">すみません、この操作は共有タグではまだサポートされていません。</string>
   <string name="actfm_tag_operation_owner_delete">あなたはこの共有リストの所有者です！もしリストを削除すると、リストのすべてのメンバーからも削除されます。本当によろしいですか？</string>
   <string name="actfm_picture_camera">写真を撮る</string>
@@ -15,6 +14,8 @@
   <string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own tasks. Do you want to view this and other tasks you\'ve assigned?</string>
   <string name="actfm_view_task_ok">View Assigned</string>
   <string name="actfm_view_task_cancel">Stay Here</string>
+  <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
+  <string name="actfm_my_shared_tasks_empty">No shared tasks</string>
   <string name="TVA_add_comment">コメントを追加する...</string>
   <string name="UAd_title_comment">%1$s re: %2$s</string>
   <string-array name="TVA_tabs">
@@ -30,6 +31,7 @@
   <string name="actfm_TVA_tag_owner_label">リスト作成者:</string>
   <string name="actfm_TVA_tag_owner_none">なし</string>
   <string name="actfm_TVA_members_label">だれと共有しますか</string>
+  <string name="actfm_TVA_members_hint">Share with anyone who has an email address</string>
   <string name="actfm_TVA_tag_picture">List Picture</string>
   <string name="actfm_TVA_silence_label">Silence Notifications</string>
   <string name="actfm_TVA_list_icon_label">List Icon:</string>
@@ -45,14 +47,18 @@
   <string name="actfm_EPA_assign_label_long">これは誰がすべきですか？</string>
   <string name="actfm_EPA_assign_me">自分</string>
   <string name="actfm_EPA_unassigned">アサインなし</string>
+  <string name="actfm_EPA_choose_contact">Choose a contact</string>
   <string name="actfm_EPA_task_rabbit">Outsource it!</string>
   <string name="actfm_EPA_assign_custom">Custom...</string>
   <string name="actfm_EPA_share_with">共有者:</string>
+  <string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
   <string name="actfm_EPA_collaborators_header">ともだちと共有する</string>
   <string name="actfm_EPA_list">リスト: %s</string>
   <string name="actfm_EPA_assigned_hint">連絡先名</string>
   <string name="actfm_EPA_message_text">招待メッセージ:</string>
   <string name="actfm_EPA_message_body">Help me get this done!</string>
+  <string name="actfm_EPA_assign_header_members">List Members</string>
+  <string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
   <string name="actfm_EPA_tag_label">Create a shared tag?</string>
   <string name="actfm_EPA_tag_hint">(i.e. Silly Hats Club)</string>
   <string name="actfm_EPA_facebook">Facebook</string>
@@ -61,9 +67,9 @@
   <string name="actfm_EPA_saved_toast">People Settings Saved</string>
   <string name="actfm_EPA_invalid_email">無効なEメール: %s</string>
   <string name="actfm_EPA_invalid_tag">リストが見つかりません: %s</string>
-  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks! Please log in or make this a private task.</string>
+  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
   <string name="actfm_EPA_login_button">ログイン</string>
-  <string name="actfm_EPA_dont_share_button">Make private</string>
+  <string name="actfm_EPA_dont_share_button">Don\'t share</string>
   <string name="actfm_ALA_title">Asteroid.comにようこそ！</string>
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Facebookと接続する</string>
@@ -82,12 +88,14 @@
   <string name="actfm_ALA_login_title">Astrid.comにログイン</string>
   <string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
   <string name="actfm_OLA_prompt">ログインしてください:</string>
+  <string name="actfm_status_title_logged_in">Status - Logged in as %s</string>
   <string name="actfm_APr_header">Astrid.com</string>
   <string name="actfm_https_title">HTTPS を使う</string>
   <string name="actfm_https_enabled">HTTPS有効(遅い)</string>
   <string name="actfm_https_disabled">HTTPS無効(早い)</string>
   <string name="actfm_notification_title">Astrid.com Sync</string>
   <string name="actfm_notification_comments">New comments received / click for more details</string>
+  <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">アラーム</string>
   <string name="alarm_ACS_button">アラームを追加する</string>
   <string-array name="reminders_alarm">
@@ -142,20 +150,22 @@
   <string name="DLG_cancel">キャンセル</string>
   <string name="DLG_more">もっと</string>
   <string name="DLG_undo">元に戻す</string>
+  <string name="DLG_warning">Warning</string>
   <string name="WID_dateButtonUnset">入力する</string>
   <string name="WID_dateButtonLabel">$D 日 $T 時間</string>
   <string name="WID_disableButton">無効にする</string>
   <string name="ENE_label">メモ</string>
   <string name="ENE_label_comments">コメント</string>
   <string name="ENA_no_comments">No activity yet</string>
-  <string name="ENA_no_user">あなた</string>
+  <string name="ENA_no_user">Someone</string>
   <string name="ENA_refresh_comments">コメントを更新</string>
   <string name="TLA_no_items">タスクなし</string>
+  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
   <string name="TLA_menu_addons">アドオン</string>
   <string name="TLA_menu_sort">表示設定</string>
-  <string name="TLA_menu_sync">すぐに同期！</string>
+  <string name="TLA_menu_sync">すぐに同期</string>
   <string name="TLA_menu_lists">リスト</string>
-  <string name="TLA_menu_friends">ともだち</string>
+  <string name="TLA_menu_friends">People</string>
   <string name="TLA_menu_suggestions">提案</string>
   <string name="TLA_menu_tutorial">チュートリアル</string>
   <string name="TLA_menu_settings">設定</string>
@@ -163,7 +173,7 @@
   <string name="TLA_search_label">このリストの検索</string>
   <string name="TLA_custom">カスタムフィルタ</string>
   <string name="TLA_quick_add_hint">タスクを追加</string>
-  <string name="TLA_quick_add_hint_assign">Tap to assign %s a task</string>
+  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
   <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
   <string name="TLA_notification_disabled">Astrid reminders are disabled! You will not receive any reminders</string>
   <string-array name="TLA_filters">
@@ -279,6 +289,7 @@
   <string name="TEA_control_importance">重要性</string>
   <string name="TEA_control_lists">リスト</string>
   <string name="TEA_control_notes">メモ</string>
+  <string name="TEA_control_files">Files</string>
   <string name="TEA_control_reminders">リマインダー</string>
   <string name="TEA_control_timer">Timer Controls</string>
   <string name="TEA_control_share">ともだちと共有</string>
@@ -290,11 +301,35 @@
   <string name="TEA_load_more">Load more...</string>
   <string name="TEA_when_dialog_title">When is this due?</string>
   <string name="TEA_date_and_time">日付/時刻</string>
+  <string name="TEA_new_task">New Task</string>
   <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
   <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
+  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
   <string name="InA_title">Welcome to Astrid!</string>
   <string name="InA_agree">同意する</string>
   <string name="InA_disagree">同意しない</string>
+  <string name="MCA_title">%1$s\ncalled at %2$s</string>
+  <string name="MCA_return_call">Call now</string>
+  <string name="MCA_add_task">Call later</string>
+  <string name="MCA_ignore">Ignore</string>
+  <string name="MCA_ignore_title">Ignore all missed calls?</string>
+  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
+  <string name="MCA_ignore_all">Ignore all calls</string>
+  <string name="MCA_ignore_this">Ignore this call only</string>
+  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
+  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
+  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+  <string name="MCA_task_title_no_name">Call %s back</string>
+  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+  <string-array name="MCA_dialog_speech_options">
+    <item>It must be nice to be so popular!</item>
+    <item>Yay! People like you!</item>
+    <item>Make their day, give \'em a call!</item>
+    <item>Wouldn\'t you be happy if people called you back?</item>
+    <item>You can do it!</item>
+    <item>You can always send a text...</item>
+  </string-array>
   <string name="HlA_get_support">サポートサイト</string>
   <string name="UpS_changelog_title">Astrid の変更点</string>
   <string name="UpS_updates_title">最新のAstridニュース</string>
@@ -324,7 +359,37 @@
   <string name="EPr_theme_title">Color Theme</string>
   <string name="EPr_theme_desc">現在の設定: %s</string>
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
+  <string name="EPr_theme_widget_title">Widget Theme</string>
   <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
+  <string name="EPr_labs_header">Astrid Labs</string>
+  <string name="EPr_labs_desc">Try and configure experimental features</string>
+  <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
+  <string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
+  <string name="EPr_use_contact_picker">Use contact picker</string>
+  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
+  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
+  <string name="EPr_third_party_addons">Enable Third Party Add-ons</string>
+  <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
+  <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
+  <string name="EPr_ideas_tab_enabled">Task Ideas</string>
+  <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
+  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <string name="EPr_swipe_lists_restart_alert">You will need to restart Astrid for this change to take effect</string>
+  <string-array name="EPr_swipe_lists_performance_mode">
+    <item>No swipe</item>
+    <item>Conserve Memory</item>
+    <item>Normal Performance</item>
+    <item>High Performance</item>
+  </string-array>
+  <string-array name="EPr_swipe_lists_performance_desc">
+    <item>Swipe between lists is disabled</item>
+    <item>Slower performance</item>
+    <item>Default setting</item>
+    <item>Uses more system resources</item>
+  </string-array>
+  <string name="EPr_swipe_lists_display">%1$s - %2$s</string>
   <string-array name="EPr_themes">
     <item>Day - Blue</item>
     <item>Day - Red</item>
@@ -332,6 +397,15 @@
     <item>Transparent (White Text)</item>
     <item>Transparent (Black Text)</item>
   </string-array>
+  <string-array name="EPr_themes_widget">
+    <item>Same as app</item>
+    <item>Day - Blue</item>
+    <item>Day - Red</item>
+    <item>Night</item>
+    <item>Transparent (White Text)</item>
+    <item>Transparent (Black Text)</item>
+    <item>Old Style</item>
+  </string-array>
   <string name="EPr_manage_header">Manage Old Tasks</string>
   <string name="EPr_manage_delete_completed">Delete Completed Tasks</string>
   <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
@@ -361,11 +435,14 @@
   <string name="WCA_title">ウィジェットに表示する項目</string>
   <string name="p_about">About Astrid</string>
   <string name="p_about_text">Current version: %s\n\n Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-  <string name="p_help">ヘルプ</string>
+  <string name="p_help">Support</string>
+  <string name="p_forums">Forums</string>
   <string name="task_killer_help">タスクキラー (%s) を使用中です。Astrid が終了しないように、除外リストに登録してください。そうしないと、期限が来たタスクを通知できなくなります。\n</string>
   <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
   <string name="marketplace_title">Astrid Task/Todo List</string>
   <string name="marketplace_description">Astrid is the much loved open-source todo list / task manager designed to help you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more.</string>
+  <string name="DB_corrupted_title">Corrupted Database</string>
+  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Manage All Tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Backup-&gt;Import Tasks) in Astrid.</string>
   <string name="EPr_defaults_header">タスクのデフォルト設定</string>
   <string name="EPr_default_urgency_title">期限</string>
   <string name="EPr_default_urgency_desc">現在の設定: %s</string>
@@ -485,6 +562,8 @@
   <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
   <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
   <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+  <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
+  <string name="gtasks_dual_sync_warning">You are currently synchronizing with Astrid.com. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Google Tasks?</string>
   <string name="help_popover_add_task">Start by adding a task or two</string>
   <string name="help_popover_tap_task">Tap task to edit and share</string>
   <string name="help_popover_list_settings">Tap to edit or share this list</string>
@@ -567,6 +646,41 @@
   <string name="EPr_statistics_title">匿名の使用統計データ</string>
   <string name="EPr_statistics_desc_disabled">使用統計情報は送信されません</string>
   <string name="EPr_statistics_desc_enabled">送られた使用統計情報は Astrid の改善に使用されます</string>
+  <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
+  <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
+  <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
+  <string name="premium_attach_file">Attach a file</string>
+  <string name="premium_record_audio">Record a note</string>
+  <string name="premium_no_files">No files attached</string>
+  <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
+  <string name="audio_recording_title">Recording Audio</string>
+  <string name="audio_stop_recording">Stop Recording</string>
+  <string name="audio_speak_now">Speak Now!</string>
+  <string name="audio_encoding">Encoding...</string>
+  <string name="audio_err_encoding">Error encoding audio</string>
+  <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
+  <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+  <string name="search_market_audio_title">No audio player found</string>
+  <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+  <string name="search_market_pdf_title">No PDF reader found</string>
+  <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+  <string name="search_market_ms_title">No MS Office reader found</string>
+  <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+  <string name="file_type_unhandled_title">No application found</string>
+  <string name="file_prefix_image">Image</string>
+  <string name="file_prefix_voice">Voice</string>
+  <string name="file_browser_up">Up</string>
+  <string name="file_browser_title">Choose a file</string>
+  <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+  <string name="file_add_picture">Attach a picture</string>
+  <string name="file_add_sdcard">Attach a file from your SD card</string>
+  <string name="file_download_title">Download file?</string>
+  <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+  <string name="file_download_progress">Downloading...</string>
+  <string name="file_err_memory">Image is too large to fit in memory</string>
+  <string name="file_err_copy">Error copying file for attachment</string>
+  <string name="file_err_download">Error downloading file</string>
+  <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">Workspaces</string>
   <string name="producteev_FEx_responsible_byme">Assigned by me to</string>
@@ -631,6 +745,33 @@
   <string name="rmd_NoA_done">既に完了しています!</string>
   <string name="rmd_NoA_snooze">後で通知</string>
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+  <string name="rmd_NoA_dlg_title">Reminder:</string>
+  <string-array name="rmd_reengage_notif_titles">
+    <item>A note from Astrid</item>
+    <item>Memo for %s.</item>
+    <item>Your Astrid digest</item>
+    <item>Reminders from Astrid</item>
+  </string-array>
+  <string name="rmd_reengage_name_default">you</string>
+  <string name="rmd_reengage_snooze">Snooze all</string>
+  <string name="rmd_reengage_add_tasks">Add a task</string>
+  <string-array name="rmd_reengage_dialog_options">
+    <item>Time to shorten your to-do list!</item>
+    <item>Dear sir or madam, some tasks await your inspection!</item>
+    <item>Hi there, could you take a look at these?</item>
+    <item>I\'ve got some tasks with your name on them!</item>
+    <item>A fresh batch of tasks for you today!</item>
+    <item>You look fabulous! Ready to get started?</item>
+    <item>A lovely day for getting some work done, I think!</item>
+  </string-array>
+  <string-array name="rmd_reengage_dialog_empty_options">
+    <item>Don\'t you want to get organized?</item>
+    <item>I\'m Astrid! I\'m here to help you do more!</item>
+    <item>You look busy! Let me take some of those tasks off of your plate.</item>
+    <item>I can help you keep track of all of the details in your life.</item>
+    <item>You\'re serious about getting more done? So am I!</item>
+    <item>Pleasure to make your acquaintance!</item>
+  </string-array>
   <string name="rmd_EPr_alerts_header">通知の設定</string>
   <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
   <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
@@ -855,21 +996,44 @@
     <item>Minute(s)</item>
     <item>Year(s)</item>
   </string-array>
+  <string-array name="repeat_until_shortcuts">
+    <item>Forever</item>
+    <item>Specific Day</item>
+    <item>Today</item>
+    <item>Tomorrow</item>
+    <item>(day after)</item>
+    <item>Next Week</item>
+    <item>In Two Weeks</item>
+    <item>Next Month</item>
+  </string-array>
+  <string name="repeat_until_title">Repeat until...</string>
+  <string name="repeat_keep_going">Keep going</string>
   <string-array name="repeat_type">
     <item>期限から</item>
     <item>完了日から</item>
   </string-array>
   <string name="repeat_detail_byday">$I ($D 曜日)</string>
   <string name="repeat_detail_duedate">%s</string>
+  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
   <string name="repeat_detail_completion">完了日から %s</string>
+  <string name="repeat_forever">Repeat forever</string>
+  <string name="repeat_until">Repeat until %s</string>
   <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
   <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
   <string-array name="repeat_encouragement">
     <item>Good job!</item>
     <item>Wow… I\'m so proud of you!</item>
-    <item>I love it when you\'re productive!</item>
+    <item>I love when you\'re productive!</item>
     <item>Doesn\'t it feel good to check something off?</item>
   </string-array>
+  <string-array name="repeat_encouragement_last_time">
+    <item>Good job!</item>
+    <item>I\'m so proud of you!</item>
+    <item>I love when you\'re productive!</item>
+  </string-array>
   <string name="rmilk_EOE_button">Remember the Milk の設定</string>
   <string name="rmilk_TLA_repeat">RTM Repeating Task</string>
   <string name="rmilk_TLA_sync">Needs synchronization with RTM</string>
@@ -934,16 +1098,19 @@
   <string name="update_string_friends">%1$s is now friends with %2$s</string>
   <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
   <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
-
-
-
-
-
-
-
+  <string name="update_string_task_created">%1$s created this task</string>
+  <string name="update_string_task_created_global">%1$s created $link_task</string>
+  <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
+  <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
+  <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
+  <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
   <string name="update_string_default_comment">%1$s commented: %3$s</string>
-
+  <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
   <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
+  <string name="update_string_tag_created">%1$s created this list</string>
+  <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
   <string name="voice_create_prompt">Speak to create a task</string>
   <string name="voice_edit_title_prompt">Speak to set task title</string>
   <string name="voice_edit_note_prompt">Speak to set task notes</string>
@@ -983,6 +1150,9 @@
   <string name="PPW_widget_42_label">Astrid Premium 4x2</string>
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Premium 4x4</string>
+  <string name="PPW_widget_v11_label">Astrid Scrollable Premium</string>
+  <string name="PPW_widget_custom_label">Astrid Scrollable Premium for Custom Launchers</string>
+  <string name="PPW_widget_custom_launcherpro_label">Astrid Scrollable Premium 4x4 for Launcher Pro</string>
   <string name="PPW_configure_title">Configure Widget</string>
   <string name="PPW_color">Widget color</string>
   <string name="PPW_enable_calendar">Show calendar events</string>

astrid/res/values-ko/strings.xml

@@ -2,92 +2,100 @@
 <resources>
   <string name="EPE_action">공유</string>
   <string name="actfm_person_hint">연락처 혹은 전자우편</string>
-  <string name="actfm_person_or_tag_hint">Contact or Shared List</string>
-  <string name="actfm_toast_success">Saved on Server</string>
-
-  <string name="actfm_tag_operation_disabled">Sorry, this operation is not yet supported for shared tags.</string>
+  <string name="actfm_person_or_tag_hint">연락처 혹은 공유리스트</string>
+  <string name="actfm_toast_success">저장하기</string>
+  <string name="actfm_tag_operation_disabled">죄송합니다.공유는 아직 지원되지않습니다.</string>
   <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?</string>
-  <string name="actfm_picture_camera">Take a Picture</string>
-  <string name="actfm_picture_gallery">Pick from Gallery</string>
+  <string name="actfm_picture_camera">카메라</string>
+  <string name="actfm_picture_gallery">갤러리</string>
   <string name="actfm_picture_clear">Clear Picture</string>
-  <string name="actfm_FLA_menu_refresh">Refresh Lists</string>
-  <string name="actfm_view_task_title">View Task?</string>
+  <string name="actfm_FLA_menu_refresh">목록을 새로고침</string>
+  <string name="actfm_view_task_title">일정을 보시겠습니까?</string>
   <string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own tasks. Do you want to view this and other tasks you\'ve assigned?</string>
-  <string name="actfm_view_task_ok">View Assigned</string>
-  <string name="actfm_view_task_cancel">Stay Here</string>
-  <string name="TVA_add_comment">Add a comment...</string>
+  <string name="actfm_view_task_ok">완료된 일정 보기</string>
+  <string name="actfm_view_task_cancel">머무르기</string>
+  <string name="actfm_my_shared_tasks_title">공유된 일정들</string>
+  <string name="actfm_my_shared_tasks_empty">일정 공유 하지않기</string>
+  <string name="TVA_add_comment">댓글</string>
   <string name="UAd_title_comment">%1$s re: %2$s</string>
   <string-array name="TVA_tabs">
     <item>Tasks</item>
     <item>Activity</item>
-    <item>List Settings</item>
+    <item>설정</item>
   </string-array>
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
   <string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
   <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
-  <string name="actfm_TVA_menu_refresh">Refresh</string>
-  <string name="actfm_TVA_tag_label">List</string>
+  <string name="actfm_TVA_menu_refresh">새로 고침</string>
+  <string name="actfm_TVA_tag_label">리스트</string>
   <string name="actfm_TVA_tag_owner_label">List Creator:</string>
-  <string name="actfm_TVA_tag_owner_none">none</string>
-  <string name="actfm_TVA_members_label">Shared With</string>
-  <string name="actfm_TVA_tag_picture">List Picture</string>
-  <string name="actfm_TVA_silence_label">Silence Notifications</string>
-  <string name="actfm_TVA_list_icon_label">List Icon:</string>
-  <string name="actfm_TVA_tag_description_label">Description</string>
-  <string name="actfm_TVA_tag_settings_label">Settings</string>
-  <string name="actfm_TVA_tag_description_hint">Type a description here</string>
-  <string name="actfm_TVA_tag_name_hint">Enter list name</string>
-  <string name="actfm_TVA_login_to_share">You need to be logged in to Astrid.com to share lists! Please log in or make this a private list.</string>
+  <string name="actfm_TVA_tag_owner_none">없음</string>
+  <string name="actfm_TVA_members_label">공유</string>
+  <string name="actfm_TVA_members_hint">회원과 공유하기</string>
+  <string name="actfm_TVA_tag_picture">사진</string>
+  <string name="actfm_TVA_silence_label">알림 끄기</string>
+  <string name="actfm_TVA_list_icon_label">아이콘</string>
+  <string name="actfm_TVA_tag_description_label">설명</string>
+  <string name="actfm_TVA_tag_settings_label">설정</string>
+  <string name="actfm_TVA_tag_description_hint">여기에 설명을 입력해주세요</string>
+  <string name="actfm_TVA_tag_name_hint">리스트명 입력</string>
+  <string name="actfm_TVA_login_to_share">일정을 공유하기 위해선 로그인이 필요합니다.</string>
   <string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects and instantly see when people get stuff done!</string>
-  <string name="actfm_EPA_title">Share / Assign</string>
-  <string name="actfm_EPA_save">Save &amp; Share</string>
+  <string name="actfm_EPA_title">공유/할당</string>
+  <string name="actfm_EPA_save">저장&amp;공유</string>
   <string name="actfm_EPA_assign_label">Who</string>
-  <string name="actfm_EPA_assign_label_long">Who should do this?</string>
-  <string name="actfm_EPA_assign_me">Me</string>
-  <string name="actfm_EPA_unassigned">Unassigned</string>
+  <string name="actfm_EPA_assign_label_long">누가 할일?</string>
+  <string name="actfm_EPA_assign_me">나</string>
+  <string name="actfm_EPA_unassigned">할당되지 않음</string>
+  <string name="actfm_EPA_choose_contact">선택하세요</string>
   <string name="actfm_EPA_task_rabbit">Outsource it!</string>
-  <string name="actfm_EPA_assign_custom">Custom...</string>
+  <string name="actfm_EPA_assign_custom">사용자 정의...</string>
   <string name="actfm_EPA_share_with">Share with:</string>
-  <string name="actfm_EPA_collaborators_header">Share with Friends</string>
-  <string name="actfm_EPA_list">List: %s</string>
-  <string name="actfm_EPA_assigned_hint">Contact Name</string>
-  <string name="actfm_EPA_message_text">Invitation Message:</string>
-  <string name="actfm_EPA_message_body">Help me get this done!</string>
-  <string name="actfm_EPA_tag_label">Create a shared tag?</string>
+  <string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
+  <string name="actfm_EPA_collaborators_header">친구들과 공유하기</string>
+  <string name="actfm_EPA_list">리스트: %s</string>
+  <string name="actfm_EPA_assigned_hint">연락처</string>
+  <string name="actfm_EPA_message_text">초대 메시지</string>
+  <string name="actfm_EPA_message_body">이걸 마칠 수 있게 도와주세요!</string>
+  <string name="actfm_EPA_assign_header_members">구성원</string>
+  <string name="actfm_EPA_assign_header_friends">친구들</string>
+  <string name="actfm_EPA_tag_label">공유 태그를 만드시겠습니까?</string>
   <string name="actfm_EPA_tag_hint">(i.e. Silly Hats Club)</string>
-  <string name="actfm_EPA_facebook">Facebook</string>
-  <string name="actfm_EPA_twitter">Twitter</string>
-  <string name="actfm_EPA_emailed_toast">Task shared with %s</string>
+  <string name="actfm_EPA_facebook">페이스북</string>
+  <string name="actfm_EPA_twitter">트위터</string>
+  <string name="actfm_EPA_emailed_toast">할 일이 %s와 공유됨</string>
   <string name="actfm_EPA_saved_toast">People Settings Saved</string>
-  <string name="actfm_EPA_invalid_email">Invalid E-mail: %s</string>
-  <string name="actfm_EPA_invalid_tag">List Not Found: %s</string>
-  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks! Please log in or make this a private task.</string>
-  <string name="actfm_EPA_login_button">Log in</string>
-  <string name="actfm_EPA_dont_share_button">Make private</string>
-  <string name="actfm_ALA_title">Welcome to Astrid.com!</string>
+  <string name="actfm_EPA_invalid_email">유효하지 않은 이메일: %s</string>
+  <string name="actfm_EPA_invalid_tag">리스트를 찾을 수 없음: %s</string>
+  <string name="actfm_EPA_login_to_share">로그인이 필요합니다</string>
+  <string name="actfm_EPA_login_button">로그인</string>
+  <string name="actfm_EPA_dont_share_button">공유하지 않음</string>
+  <string name="actfm_ALA_title">환영합니다</string>
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
-  <string name="actfm_ALA_fb_login">Connect with Facebook</string>
-  <string name="actfm_ALA_gg_login">Connect with Google</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
-  <string name="actfm_ALA_pw_new">Create a new account?</string>
-  <string name="actfm_ALA_pw_returning">Already have an account?</string>
-  <string name="actfm_ALA_name_label">Name</string>
-  <string name="actfm_ALA_firstname_label">First Name</string>
-  <string name="actfm_ALA_lastname_label">Last Name</string>
-  <string name="actfm_ALA_email_label">전자우편</string>
-  <string name="actfm_ALA_username_email_label">Username / Email</string>
+  <string name="actfm_ALA_fb_login">페이스북과 연동하기</string>
+  <string name="actfm_ALA_gg_login">구글과 연동하기</string>
+  <string name="actfm_ALA_pw_login">구글 또는 페이스북을 사용하지 않습니까?</string>
+  <string name="actfm_ALA_pw_link">동의하기</string>
+  <string name="actfm_ALA_pw_new">새 계정을 만드시겠습니까?</string>
+  <string name="actfm_ALA_pw_returning">이미 계정이 있으십니까?</string>
+  <string name="actfm_ALA_name_label">이름:</string>
+  <string name="actfm_ALA_firstname_label">성</string>
+  <string name="actfm_ALA_lastname_label">이름</string>
+  <string name="actfm_ALA_email_label">이메일</string>
+  <string name="actfm_ALA_username_email_label">사용자명/이메일</string>
   <string name="actfm_ALA_password_label">비밀번호</string>
-  <string name="actfm_ALA_signup_title">Create New Account</string>
-  <string name="actfm_ALA_login_title">Login to Astrid.com</string>
-  <string name="actfm_GAA_title">Select the Google account you want to use:</string>
-  <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_ALA_signup_title">새 계정 만들기</string>
+  <string name="actfm_ALA_login_title">로그인하기</string>
+  <string name="actfm_GAA_title">사용하려는 구글계정을 선택해주십시오</string>
+  <string name="actfm_OLA_prompt">로그인해주세요</string>
+  <string name="actfm_status_title_logged_in">상태 - %s(으)로 로그인됨</string>
   <string name="actfm_APr_header">Astrid.com</string>
-  <string name="actfm_https_title">Use HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS enabled (slower)</string>
-  <string name="actfm_https_disabled">HTTPS disabled (faster)</string>
+  <string name="actfm_https_title">HTTPS 사용</string>
+  <string name="actfm_https_enabled">HTTPS 활성화됨 (느림)</string>
+  <string name="actfm_https_disabled">HTTPS 비활성화됨 (빠름)</string>
   <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
+  <string name="actfm_notification_comments">새로운 코멘트를 받음 / 자세히 보려면 클릭</string>
+  <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">알람</string>
   <string name="alarm_ACS_button">알람 추가</string>
   <string-array name="reminders_alarm">
@@ -96,7 +104,7 @@
   <string name="backup_BPr_header">백업</string>
   <string name="backup_BPr_group_status">상태</string>
   <string name="backup_status_success">마지막:%s</string>
-  <string name="backup_status_failed">마지막 백업 실패</string>
+  <string name="backup_status_failed">최근 백업 실패</string>
   <string name="backup_status_failed_subtitle">(오류 내용을 보려면 탭하세요)</string>
   <string name="backup_status_never">백업한 적이 없습니다!</string>
   <string name="backup_BPr_group_options">옵션</string>
@@ -105,7 +113,7 @@
   <string name="backup_BPr_auto_enabled">백업 매일 할껀가요?</string>
   <string name="backup_BPr_how_to_restore">백업 어떻게 하실껀가요?</string>
   <string name="backup_BPr_how_to_restore_dialog">당신은 관리 및 복원 백업 Astrid Power Pack을 추가해야합니다. 그리고 Astrid는 혹시나 모를 상황에 대비하여 이전 상태를 자동으로 백업합니다.</string>
-  <string name="backup_BAc_label">백업</string>
+  <string name="backup_BAc_label">백업 설정</string>
   <string name="backup_BAc_title">백업 관리</string>
   <string name="backup_BAc_import">작업 가져오기</string>
   <string name="backup_BAc_export">작업 내보내기</string>
@@ -135,70 +143,73 @@
   <string name="DLG_accept">동의</string>
   <string name="DLG_decline">거절</string>
   <string name="DLG_eula_title">Astrid 사용 약관</string>
-  <string name="DLG_please_wait">Please Wait</string>
+  <string name="DLG_please_wait">기다려 주십시오</string>
   <string name="DLG_loading">로딩중...</string>
   <string name="DLG_dismiss">Dismiss</string>
-  <string name="DLG_ok">OK</string>
-  <string name="DLG_cancel">Cancel</string>
-  <string name="DLG_more">More</string>
-  <string name="DLG_undo">Undo</string>
+  <string name="DLG_ok">확인</string>
+  <string name="DLG_cancel">취소</string>
+  <string name="DLG_more">더보기</string>
+  <string name="DLG_undo">실행취소</string>
+  <string name="DLG_warning">주의</string>
   <string name="WID_dateButtonUnset">직접 입력</string>
   <string name="WID_dateButtonLabel">$D $T</string>
   <string name="WID_disableButton">사용 안 함</string>
   <string name="ENE_label">노트</string>
-  <string name="ENE_label_comments">Comments</string>
+  <string name="ENE_label_comments">댓글</string>
   <string name="ENA_no_comments">No activity yet</string>
-  <string name="ENA_no_user">You</string>
-  <string name="ENA_refresh_comments">Refresh Comments</string>
+  <string name="ENA_no_user">Someone</string>
+  <string name="ENA_refresh_comments">코멘트를 새로고침</string>
   <string name="TLA_no_items">작업이 없네요!</string>
+  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
   <string name="TLA_menu_addons">확장기능</string>
   <string name="TLA_menu_sort">정렬 &amp; 숨김</string>
-  <string name="TLA_menu_sync">지금 싱크!</string>
-  <string name="TLA_menu_lists">Lists</string>
-  <string name="TLA_menu_friends">Friends</string>
-  <string name="TLA_menu_suggestions">Suggestions</string>
-  <string name="TLA_menu_tutorial">Tutorial</string>
+  <string name="TLA_menu_sync">지금 동기화</string>
+  <string name="TLA_menu_search">검색</string>
+  <string name="TLA_menu_lists">리스트</string>
+  <string name="TLA_menu_friends">People</string>
+  <string name="TLA_menu_suggestions">제안</string>
+  <string name="TLA_menu_tutorial">튜토리얼</string>
   <string name="TLA_menu_settings">설정</string>
-  <string name="TLA_menu_support">Support</string>
+  <string name="TLA_menu_support">지원</string>
   <string name="TLA_search_label">이 목록 검색</string>
   <string name="TLA_custom">사용자 설정</string>
-  <string name="TLA_quick_add_hint">Add a task</string>
-  <string name="TLA_quick_add_hint_assign">Tap to assign %s a task</string>
-  <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
-  <string name="TLA_notification_disabled">Astrid reminders are disabled! You will not receive any reminders</string>
+  <string name="TLA_quick_add_hint">할일 추가하기</string>
+  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
+  <string name="TLA_notification_volume_low">알림이 음소거 되었습니다. 당신은 Astrid를 듣지 못할 것입니다!</string>
+  <string name="TLA_notification_disabled">Astrid 알림이 비활성화 되었습니다! 당신은 어떤 알림도 받을 수 없을 것입니다.</string>
   <string-array name="TLA_filters">
     <item>Active</item>
     <item>오늘</item>
-    <item>Soon</item>
-    <item>Late</item>
+    <item>곧</item>
+    <item>늦음</item>
     <item>마침</item>
-    <item>Hidden</item>
+    <item>숨김</item>
   </string-array>
   <string name="TLA_quickadd_confirm_title">You said, \"%s\"</string>
   <string name="TLA_quickadd_confirm_speech_bubble">I created a task called \"%1$s\" %2$s at %3$s</string>
   <string name="TLA_quickadd_confirm_speech_bubble_date">for %s</string>
   <string name="TLA_quickadd_confirm_hide_helpers">Don\'t display future confirmations</string>
-  <string name="TLA_repeat_scheduled_title">New repeating task %s</string>
+  <string name="TLA_repeat_scheduled_title">새로운 반복 할 일 %s</string>
   <string name="TLA_repeat_scheduled_speech_bubble">I\'ll remind you about this %s.</string>
   <string-array name="TLA_priority_strings">
-    <item>highest priority</item>
-    <item>high priority</item>
-    <item>medium priority</item>
-    <item>low priority</item>
+    <item>최우선순위</item>
+    <item>우선순위</item>
+    <item>보통</item>
+    <item>하위순위</item>
   </string-array>
-  <string name="TLA_all_activity">All Activity</string>
+  <string name="TLA_all_activity">모든 활동</string>
   <string name="TAd_hiddenFormat">%s [숨김]</string>
   <string name="TAd_deletedFormat">%s [삭제]</string>
   <string name="TAd_completed">%s\n전에 완료됨</string>
   <string name="TAd_actionEditTask">편집</string>
   <string name="TAd_contextEditTask">작업 편집</string>
-  <string name="TAd_contextCopyTask">Copy Task</string>
+  <string name="TAd_contextCopyTask">할 일 복사</string>
   <string name="TAd_contextHelpTask">Get help</string>
   <string name="TAd_contextDeleteTask">작업 삭제</string>
   <string name="TAd_contextUndeleteTask">작업 삭제 취소</string>
   <string name="TAd_contextPurgeTask">작업 정리</string>
   <string name="SSD_title">작업 정렬 및 숨김</string>
-  <string name="SSD_hidden_title">Hidden Tasks</string>
+  <string name="SSD_hidden_title">숨겨진 할 일</string>
   <string name="SSD_completed">완료한 작업 보여주기</string>
   <string name="SSD_hidden">숨긴 작업 보여주기</string>
   <string name="SSD_deleted">지운 작업 보여주기</string>
@@ -211,7 +222,7 @@
   <string name="SSD_sort_reverse">역순 정렬</string>
   <string name="SSD_save_temp">임시 정렬</string>
   <string name="SSD_save_always">항상 정렬</string>
-  <string name="FSA_label">Astrid List or Filter</string>
+  <string name="FSA_label">Astrid 리스트 또는 필터</string>
   <string name="FLA_title">리스트</string>
   <string name="FLA_loading">필터 로딩중...</string>
   <string name="FLA_context_shortcut">바탕화면 바로가기 만들기</string>
@@ -222,19 +233,19 @@
   <string name="FLA_search_hint">작업 검색</string>
   <string name="FLA_search_filter">\'%s\' 검색중</string>
   <string name="FLA_toast_onCreateShortcut">바로가기 생성 완료: %s</string>
-  <string name="FLA_new_filter">New Filter</string>
-  <string name="FLA_new_list">New List</string>
-  <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>
+  <string name="FLA_new_filter">새 필터</string>
+  <string name="FLA_new_list">새 리스트</string>
+  <string name="FLA_no_filter_selected">필터가 선택되지 않았습니다! 필터 또는 리스트를 선택해 주세요.</string>
   <string name="TEA_view_title">Astrid: \'%s\' 편집중</string>
-  <string name="TEA_view_titleNew">New Task</string>
-  <string name="TEA_title_label">작업명</string>
-  <string name="TEA_when_header_label">When</string>
+  <string name="TEA_view_titleNew">새로운 할일</string>
+  <string name="TEA_title_label">제목</string>
+  <string name="TEA_when_header_label">시간</string>
   <string name="TEA_title_hint">요약정보</string>
   <string name="TEA_importance_label">중요도</string>
   <string name="TEA_urgency_label">마감일</string>
   <string name="TEA_urgency_specific_time">정해진 시간에?</string>
-  <string name="TEA_urgency_none">None</string>
-  <string name="TEA_hideUntil_label">Show Task</string>
+  <string name="TEA_urgency_none">없음</string>
+  <string name="TEA_hideUntil_label">할 일 보이기</string>
   <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
   <string-array name="TEA_loading">
     <item>로딩중...</item>
@@ -246,14 +257,14 @@
   <string name="TEA_menu_save">변경사항 저장</string>
   <string name="TEA_menu_discard">저장하지 않음</string>
   <string name="TEA_menu_delete">작업 삭제</string>
-  <string name="TEA_menu_comments">Comments</string>
+  <string name="TEA_menu_comments">댓글</string>
   <string name="TEA_onTaskSave_due">작업 저장 완료: 완료일 %s</string>
   <string name="TEA_onTaskSave_notDue">작업 저장 완료</string>
   <string name="TEA_onTaskCancel">작업 편집 취소</string>
   <string name="TEA_onTaskDelete">Task deleted!</string>
-  <string name="TEA_tab_activity">Activity</string>
+  <string name="TEA_tab_activity">활동</string>
   <string name="TEA_tab_more">자세히</string>
-  <string name="TEA_tab_web">Ideas</string>
+  <string name="TEA_tab_web">아이디어</string>
   <string-array name="TEA_urgency">
     <item>마감일 없음</item>
     <item>정해진 일자/시간</item>
@@ -267,40 +278,65 @@
   <string name="TEA_no_time">No time</string>
   <string-array name="TEA_hideUntil">
     <item>항상 정렬</item>
-    <item>At due date</item>
+    <item>마감일에</item>
     <item>작업 마감일 몇일전</item>
     <item>작업 마감일 1주일 전</item>
     <item>정해진 일자/시간</item>
   </string-array>
-  <string name="TEA_control_title">Task Title</string>
+  <string name="TEA_control_title">할 일 제목</string>
   <string name="TEA_control_who">Who</string>
-  <string name="TEA_control_when">When</string>
+  <string name="TEA_control_when">언제</string>
   <string name="TEA_control_more_section">----More Section----</string>
   <string name="TEA_control_importance">중요도</string>
   <string name="TEA_control_lists">리스트</string>
   <string name="TEA_control_notes">노트</string>
+  <string name="TEA_control_files">파일</string>
   <string name="TEA_control_reminders">Reminders</string>
   <string name="TEA_control_timer">Timer Controls</string>
-  <string name="TEA_control_share">Share With Friends</string>
-  <string name="hide_until_prompt">Show in my list</string>
-  <string name="TEA_addons_text">Looking for more features?</string>
-  <string name="TEA_addons_button">Get the Power Pack!</string>
+  <string name="TEA_control_share">친구와 공유</string>
+  <string name="hide_until_prompt">내 리스트에 표시</string>
+  <string name="TEA_addons_text">새로운 기능을 찾고 있습니까?</string>
+  <string name="TEA_addons_button">Power Pack을 얻으십시오!</string>
   <string name="TEA_more">자세히</string>
-  <string name="TEA_no_activity">No Activity to Show.</string>
+  <string name="TEA_no_activity">표시할 활동이 없습니다.</string>
   <string name="TEA_load_more">Load more...</string>
-  <string name="TEA_when_dialog_title">When is this due?</string>
-  <string name="TEA_date_and_time">Date/Time</string>
+  <string name="TEA_when_dialog_title">마감이 언제입니까?</string>
+  <string name="TEA_date_and_time">날짜/시간</string>
+  <string name="TEA_new_task">New Task</string>
   <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
-  <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
+  <string name="WSV_not_online">저는 인터넷과 연결되었을 때 더 많은 일을 할 수 있습니다. 인터넷 연결을 확인해 주세요.</string>
+  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
   <string name="InA_title">Astrid 사용을 환영합니다!</string>
   <string name="InA_agree">동의합니다!!</string>
   <string name="InA_disagree">동의하지 않습니다.</string>
+  <string name="MCA_title">%1$s\ncalled at %2$s</string>
+  <string name="MCA_return_call">지금 전화하기</string>
+  <string name="MCA_add_task">나중에 전화하기</string>
+  <string name="MCA_ignore">무시</string>
+  <string name="MCA_ignore_title">모든 부재 중 전화를 무시하시겠습니까?</string>
+  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
+  <string name="MCA_ignore_all">모든 전화 무시</string>
+  <string name="MCA_ignore_this">이 전화만 무시</string>
+  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
+  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
+  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+  <string name="MCA_task_title_no_name">Call %s back</string>
+  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+  <string-array name="MCA_dialog_speech_options">
+    <item>It must be nice to be so popular!</item>
+    <item>Yay! People like you!</item>
+    <item>Make their day, give \'em a call!</item>
+    <item>사람들이 당신에게 연락한다면 행복해지지 않겠어요?</item>
+    <item>할 수 있어요!</item>
+    <item>You can always send a text...</item>
+  </string-array>
   <string name="HlA_get_support">고객지원 받기</string>
   <string name="UpS_changelog_title">Astrid 의 새로운 기능</string>
-  <string name="UpS_updates_title">Latest Astrid News</string>
+  <string name="UpS_updates_title">최신 Astrid 뉴스</string>
   <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
   <string name="EPr_title">Astrid: 환경 설정</string>
-  <string name="EPr_deactivated">deactivated</string>
+  <string name="EPr_deactivated">비활성화됨</string>
   <string name="EPr_appearance_header">모양</string>
   <string name="EPr_fontSize_title">작업 목록 폰트크기</string>
   <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
@@ -308,7 +344,7 @@
   <string name="EPr_showNotes_title">작업과 함께 노트 보이기</string>
   <string name="EPr_beastMode_title">Customize Task Edit Screen</string>
   <string name="EPr_beastMode_desc">Customize the layout of the Task Edit Screen</string>
-  <string name="EPr_beastMode_reset">Reset to defaults</string>
+  <string name="EPr_beastMode_reset">기본 설정으로 돌아가기</string>
   <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>
   <string name="EPr_showNotes_desc_enabled">노트 항상 보여주기</string>
   <string name="EPr_compressTaskRows_title">Compact Task Row</string>
@@ -316,38 +352,77 @@
   <string name="EPr_userLegacyImportance_title">Use legacy importance style</string>
   <string name="EPr_userLegacyImportance_desc">Use legacy importance style</string>
   <string name="EPr_fullTask_title">Show full task title</string>
-  <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
-  <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
-  <string name="EPr_ideaAuto_title">Auto-load Ideas Tab</string>
+  <string name="EPr_fullTask_desc_enabled">전체 할 일 제목이 표시됩니다.</string>
+  <string name="EPr_fullTask_desc_disabled">할 일 제목의 첫 두 줄이 표시됩니다.</string>
+  <string name="EPr_ideaAuto_title">아이디어 탭 자동 불러오기</string>
   <string name="EPr_ideaAuto_desc_enabled">Web searches for Ideas tab will be performed when tab is clicked</string>
   <string name="EPr_ideaAuto_desc_disabled">Web searches for Ideas tab will be performed only when manually requested</string>
-  <string name="EPr_theme_title">Color Theme</string>
+  <string name="EPr_theme_title">색상 테마</string>
   <string name="EPr_theme_desc">현재 설정: %s</string>
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
-  <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
+  <string name="EPr_theme_widget_title">위젯 테마</string>
+  <string name="EPr_taskRowPrefs_title">할 일 행 외관</string>
+  <string name="EPr_labs_header">Astrid Labs</string>
+  <string name="EPr_labs_desc">실험적 기능들을 경험하고 설정</string>
+  <string name="EPr_swipe_lists_performance_title">리스트 간 스와이프 이동</string>
+  <string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
+  <string name="EPr_use_contact_picker">Use contact picker</string>
+  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
+  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
+  <string name="EPr_third_party_addons">서드 파티 애드-온 활성화</string>
+  <string name="EPr_third_party_addons_desc_enabled">서드 파티 애드-온이 활성화됩니다.</string>
+  <string name="EPr_third_party_addons_desc_disabled">서드 파티 애드-온이 비활성화됩니다.</string>
+  <string name="EPr_ideas_tab_enabled">할 일 아이디어</string>
+  <string name="EPr_ideas_tab_description">할 일을 마무리할 수 있도록 도와주는 아이디어를 얻습니다.</string>
+  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <string name="EPr_swipe_lists_restart_alert">You will need to restart Astrid for this change to take effect</string>
+  <string-array name="EPr_swipe_lists_performance_mode">
+    <item>No swipe</item>
+    <item>Conserve Memory</item>
+    <item>보통 성능</item>
+    <item>높은 성능</item>
+  </string-array>
+  <string-array name="EPr_swipe_lists_performance_desc">
+    <item>리스트 간 스와이프 이동이 비활성화됨</item>
+    <item>느린 성능</item>
+    <item>기본 설정</item>
+    <item>더 많은 시스템 리소스를 사용</item>
+  </string-array>
+  <string name="EPr_swipe_lists_display">%1$s - %2$s</string>
   <string-array name="EPr_themes">
     <item>Day - Blue</item>
     <item>Day - Red</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
+    <item>밤</item>
+    <item>투명 (흰색 텍스트)</item>
+    <item>투명 (검은색 텍스트)</item>
   </string-array>
-  <string name="EPr_manage_header">Manage Old Tasks</string>
-  <string name="EPr_manage_delete_completed">Delete Completed Tasks</string>
-  <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
-  <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one</string>
+  <string-array name="EPr_themes_widget">
+    <item>애플리케이션과 동일하게</item>
+    <item>Day - Blue</item>
+    <item>Day - Red</item>
+    <item>밤</item>
+    <item>투명 (흰색 텍스트)</item>
+    <item>투명 (검은색 텍스트)</item>
+    <item>Old Style</item>
+  </string-array>
+  <string name="EPr_manage_header">오래된 할 일 관리</string>
+  <string name="EPr_manage_delete_completed">완료된 할 일 제거</string>
+  <string name="EPr_manage_delete_completed_message">완료된 할 일을 모두 삭제하시겠습니까?</string>
+  <string name="EPr_manage_delete_completed_summary">삭제된 할 일은 하나씩 삭제 취소 할 수 있습니다.</string>
   <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
-  <string name="EPr_manage_purge_deleted">Purge Deleted Tasks</string>
-  <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
+  <string name="EPr_manage_purge_deleted">삭제된 할 일을 제거</string>
+  <string name="EPr_manage_purge_deleted_message">모든 삭제된 할 일을 제거하시겠습니까?</string>
   <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
-  <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered without backup file!</string>
+  <string name="EPr_manage_purge_deleted_summary">주의! 제거된 할 일은 백업 파일 없이 복구할 수 없습니다!</string>
   <string name="EPr_manage_clear_all">Clear All Data</string>
-  <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
+  <string name="EPr_manage_clear_all_message">Astrid에서 모든 할 일과 설정을 삭제하시겠습니까?</string>
   <string name="EPr_manage_delete_completed_gcal">Delete Calendar Events for Completed Tasks</string>
   <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
   <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
-  <string name="EPr_manage_delete_all_gcal">Delete All Calendar Events for Tasks</string>
-  <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
+  <string name="EPr_manage_delete_all_gcal">할 일에 대한 모든 달력 이벤트 삭제</string>
+  <string name="EPr_manage_delete_all_gcal_message">할 일에 대한 모든 달력 이벤트를 삭제하시겠습니까?</string>
   <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
   <string name="AOA_title">Astrid: 확장기능</string>
   <string name="AOA_internal_author">Astrid 개발팀</string>
@@ -356,16 +431,19 @@
   <string name="AOA_free">무료</string>
   <string name="AOA_visit_website">웹사이트 방문</string>
   <string name="AOA_visit_market">안드로이드 마켓</string>
-  <string name="AOA_no_addons">Empty List!</string>
+  <string name="AOA_no_addons">빈 리스트!</string>
   <string name="TWi_loading">로딩중...</string>
   <string name="WCA_title">보여줄 작업리스트 선택</string>
   <string name="p_about">About Astrid</string>
-  <string name="p_about_text">Current version: %s\n\n Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-  <string name="p_help">도움말</string>
+  <string name="p_about_text">현재 버전: %s</string>
+  <string name="p_help">지원</string>
+  <string name="p_forums">포럼</string>
   <string name="task_killer_help">프로세스를 강제종료 할 수 있는 (%s) 앱을 사용하고 있는 것 같습니다! 가능하시면, 강제종료가 안되도록 제외목록에 포함시켜 주시기 바랍니다. 그렇지 않으면, Astrid 가 당신에게 마감일이 되어도 알려줄 수 없을 수 있습니다.\n</string>
   <string name="task_killer_help_ok">Astrid 를 강제종료하지 않겠습니다!</string>
   <string name="marketplace_title">Astrid 작업/할일 목록</string>
   <string name="marketplace_description">Astrid 는 많은 사람들로부터 사랑받는 할일/작업 관리 프로그램입니다. 이 프로그램은 당신이 작업들을 마칠 수 있도록 도와줍니다. 마감일 알려주기, 태그기능, 싱크, 언어 추가 기능, 위젯 등 다양한 기능을 제공합니다.</string>
+  <string name="DB_corrupted_title">Corrupted Database</string>
+  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Manage All Tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Backup-&gt;Import Tasks) in Astrid.</string>
   <string name="EPr_defaults_header">새 작업 기본값</string>
   <string name="EPr_default_urgency_title">기본 중요도</string>
   <string name="EPr_default_urgency_desc">현재 설정: %s</string>
@@ -378,7 +456,7 @@
   <string name="EPr_default_addtocalendar_title">Default Add To Calendar</string>
   <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the Google Calendar</string>
   <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
-  <string name="EPr_default_reminders_mode_title">Default Ring/Vibrate type</string>
+  <string name="EPr_default_reminders_mode_title">기본 벨소리/진동 타입</string>
   <string name="EPr_default_reminders_mode_desc">현재 설정: %s</string>
   <string-array name="EPr_default_importance">
     <item>!!! (Highest)</item>
@@ -416,7 +494,7 @@
   <string name="CFA_filterName_hint">필터의 저장할 이름을 정하세요...</string>
   <string name="CFA_filterName_copy">%s의 복사</string>
   <string name="CFA_universe_all">처리할 작업들</string>
-  <string name="CFA_type_add">or</string>
+  <string name="CFA_type_add">또는</string>
   <string name="CFA_type_subtract">not</string>
   <string name="CFA_type_intersect">also</string>
   <string name="CFA_context_chain">%s has criteria</string>
@@ -450,8 +528,8 @@
   <string name="gcal_TEA_showCalendar_label">캘린더 일정 열기</string>
   <string name="gcal_TEA_calendar_error">일정 열기 실패!</string>
   <string name="gcal_TEA_calendar_updated">캘린더 일정도 함께 업데이트 되었습니다!</string>
-  <string name="gcal_TEA_nocal">Don\'t add</string>
-  <string name="gcal_TEA_none_selected">Add to cal...</string>
+  <string name="gcal_TEA_nocal">추가하지 않음</string>
+  <string name="gcal_TEA_none_selected">달력에 추가</string>
   <string name="gcal_TEA_has_event">Cal event</string>
   <string name="gcal_completed_title">%s (완료)</string>
   <string name="gcal_GCP_default">기본 캘린더</string>
@@ -459,38 +537,40 @@
   <string name="gtasks_FEx_list">리스트 순</string>
   <string name="gtasks_FEx_title">Google Tasks: %s</string>
   <string name="gtasks_FEx_creating_list">Creating list...</string>
-  <string name="gtasks_FEx_create_list_dialog">New List Name:</string>
-  <string name="gtasks_FEx_create_list_error">Error creating new list</string>
+  <string name="gtasks_FEx_create_list_dialog">새 리스트 이름:</string>
+  <string name="gtasks_FEx_create_list_error">새 리스트를 만드는 중 오류 발생</string>
   <string name="gtasks_help_title">Google Tasks에 오신 것을 환영합니다!</string>
   <string name="CFC_gtasks_list_text">In List: ?</string>
   <string name="CFC_gtasks_list_name">In GTasks List...</string>
-  <string name="gtasks_GTA_clearing">Clearing completed tasks...</string>
-  <string name="gtasks_GTA_clear_completed">Clear Completed</string>
+  <string name="gtasks_GTA_clearing">완료된 할 일을 삭제하는 중...</string>
+  <string name="gtasks_GTA_clear_completed">삭제 완료</string>
   <string name="gtasks_GLA_title">Log In to Google Tasks</string>
   <string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps accounts are currently unsupported.</string>
-  <string name="gtasks_GLA_noaccounts">No available Google accounts to sync with.</string>
-  <string name="gtasks_GLA_further_help">To view your tasks with indentation and order preserved, go to the Filters page and select a Google Tasks list. By default, Astrid uses its own sort settings for tasks.</string>
+  <string name="gtasks_GLA_noaccounts">동기화 가능한 Google 계정이 없음</string>
+  <string name="gtasks_GLA_further_help">할 일의 들어쓰기와 순서를 유지하면서 보고자 하는 경우, 필터 페이지로 이동하여 Google Tasks 리스트를 선택하십시오. Astrid는 이러한 종류의 할 일을 정렬하기 위해 고유한 설정을 사용합니다.</string>
   <string name="gtasks_GLA_signIn">로그인</string>
-  <string name="gtasks_GLA_email">E-mail</string>
+  <string name="gtasks_GLA_email">이메일</string>
   <string name="gtasks_GLA_password">비밀번호</string>
-  <string name="gtasks_GLA_authenticating">Authenticating...</string>
+  <string name="gtasks_GLA_authenticating">인증 중...</string>
   <string name="gtasks_GLA_domain">Google Apps for Domain 계정</string>
   <string name="gtasks_GLA_errorEmpty">Error: 모든 필드값을 입력하세요!</string>
-  <string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and password in your phone\'s account manager</string>
-  <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers. Please try again later.</string>
+  <string name="gtasks_GLA_errorAuth">인증 오류! 휴대폰 계정 관리자의 사용자명과 비밀번호를 확인해 주십시오.</string>
+  <string name="gtasks_GLA_errorIOAuth">죄송합니다, Google 서버와 통신하는 데에 문제가 있습니다. 잠시 후 다시 시도해 주십시오.</string>
   <string name="gtasks_GLA_errorAuth_captcha">You may have encountered a captcha. Try logging in from the browser, then come back to try again:</string>
   <string name="gtasks_GPr_header">Google Tasks</string>
   <string name="gtasks_notification_title">Astrid: Google Tasks</string>
   <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error. The service may be down, please try again later.</string>
   <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
   <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
-  <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
-  <string name="help_popover_add_task">Start by adding a task or two</string>
-  <string name="help_popover_tap_task">Tap task to edit and share</string>
-  <string name="help_popover_list_settings">Tap to edit or share this list</string>
-  <string name="help_popover_collaborators">People you share with can help you build your list or finish tasks</string>
+  <string name="gtasks_error_accountManager">휴대폰 계정 관리자에서 오류 발생. 로그아웃 후 Google Tasks 설정에 다시 로그인 해 주십시오.</string>
+  <string name="gtasks_error_background_sync_auth">백그라운드에서 인증 오류 발생. Astrid가 실행 중일 때 동기화를 시작해 보십시오.</string>
+  <string name="gtasks_dual_sync_warning">현재 Astrid.com과 동기화 중입니다. 두 서비스를 동시에 동기화 하는 것은 예상치 않은 결과를 발생시킬 수 있습니다. Google Tasks와 동기화 하시겠습니까?</string>
+  <string name="help_popover_add_task">하나 또는 두 개의 태스크를 추가하여 시작</string>
+  <string name="help_popover_tap_task">할 일을 편집하거나 공유하려면 탭</string>
+  <string name="help_popover_list_settings">리스트를 편집하거나 공유하려면 탭</string>
+  <string name="help_popover_collaborators">공유된 사람들은 당신이 할 일을 마치거나 리스트를 만드는 것을 도와줄 수 있습니다.</string>
   <string name="help_popover_add_lists">Tap add a list</string>
-  <string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
+  <string name="help_popover_switch_lists">리스트를 추가하거나 리스트를 전환하려면 탭</string>
   <string name="help_popover_when_shortcut">Tap this shortcut to quick select date and time</string>
   <string name="help_popover_when_row">Tap anywhere on this row to access options like repeat</string>
   <string name="welcome_login_title">Astrid 사용을 환영합니다!</string>
@@ -567,6 +647,41 @@
   <string name="EPr_statistics_title">사용 통계정보(익명보장)</string>
   <string name="EPr_statistics_desc_disabled">사용 정보가 보고되지 않습니다.</string>
   <string name="EPr_statistics_desc_enabled">익명성이 보장되는 사용 통계정보 전송으로 우리가 Astrid 를 더욱 발전시킬 수 있도록 도와주세요.</string>
+  <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
+  <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
+  <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
+  <string name="premium_attach_file">Attach a file</string>
+  <string name="premium_record_audio">Record a note</string>
+  <string name="premium_no_files">No files attached</string>
+  <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
+  <string name="audio_recording_title">Recording Audio</string>
+  <string name="audio_stop_recording">Stop Recording</string>
+  <string name="audio_speak_now">Speak Now!</string>
+  <string name="audio_encoding">Encoding...</string>
+  <string name="audio_err_encoding">Error encoding audio</string>
+  <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
+  <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+  <string name="search_market_audio_title">No audio player found</string>
+  <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+  <string name="search_market_pdf_title">No PDF reader found</string>
+  <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+  <string name="search_market_ms_title">No MS Office reader found</string>
+  <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+  <string name="file_type_unhandled_title">No application found</string>
+  <string name="file_prefix_image">Image</string>
+  <string name="file_prefix_voice">Voice</string>
+  <string name="file_browser_up">Up</string>
+  <string name="file_browser_title">Choose a file</string>
+  <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+  <string name="file_add_picture">Attach a picture</string>
+  <string name="file_add_sdcard">Attach a file from your SD card</string>
+  <string name="file_download_title">Download file?</string>
+  <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+  <string name="file_download_progress">Downloading...</string>
+  <string name="file_err_memory">Image is too large to fit in memory</string>
+  <string name="file_err_copy">Error copying file for attachment</string>
+  <string name="file_err_download">Error downloading file</string>
+  <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">작업 공간</string>
   <string name="producteev_FEx_responsible_byme">Assigned by me to</string>
@@ -631,6 +746,33 @@
   <string name="rmd_NoA_done">이미 마침!</string>
   <string name="rmd_NoA_snooze">Snooze...</string>
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+  <string name="rmd_NoA_dlg_title">Reminder:</string>
+  <string-array name="rmd_reengage_notif_titles">
+    <item>A note from Astrid</item>
+    <item>Memo for %s.</item>
+    <item>Your Astrid digest</item>
+    <item>Reminders from Astrid</item>
+  </string-array>
+  <string name="rmd_reengage_name_default">you</string>
+  <string name="rmd_reengage_snooze">Snooze all</string>
+  <string name="rmd_reengage_add_tasks">Add a task</string>
+  <string-array name="rmd_reengage_dialog_options">
+    <item>Time to shorten your to-do list!</item>
+    <item>Dear sir or madam, some tasks await your inspection!</item>
+    <item>Hi there, could you take a look at these?</item>
+    <item>I\'ve got some tasks with your name on them!</item>
+    <item>A fresh batch of tasks for you today!</item>
+    <item>You look fabulous! Ready to get started?</item>
+    <item>A lovely day for getting some work done, I think!</item>
+  </string-array>
+  <string-array name="rmd_reengage_dialog_empty_options">
+    <item>Don\'t you want to get organized?</item>
+    <item>I\'m Astrid! I\'m here to help you do more!</item>
+    <item>You look busy! Let me take some of those tasks off of your plate.</item>
+    <item>I can help you keep track of all of the details in your life.</item>
+    <item>You\'re serious about getting more done? So am I!</item>
+    <item>Pleasure to make your acquaintance!</item>
+  </string-array>
   <string name="rmd_EPr_alerts_header">알림 설정</string>
   <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
   <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
@@ -855,21 +997,44 @@
     <item>Minute(s)</item>
     <item>Year(s)</item>
   </string-array>
+  <string-array name="repeat_until_shortcuts">
+    <item>Forever</item>
+    <item>Specific Day</item>
+    <item>Today</item>
+    <item>Tomorrow</item>
+    <item>(day after)</item>
+    <item>Next Week</item>
+    <item>In Two Weeks</item>
+    <item>Next Month</item>
+  </string-array>
+  <string name="repeat_until_title">Repeat until...</string>
+  <string name="repeat_keep_going">Keep going</string>
   <string-array name="repeat_type">
     <item>마감일로부터</item>
     <item>완료일로부터</item>
   </string-array>
   <string name="repeat_detail_byday">$I on $D</string>
   <string name="repeat_detail_duedate">Every %s</string>
+  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
   <string name="repeat_detail_completion">완료후 %s</string>
+  <string name="repeat_forever">Repeat forever</string>
+  <string name="repeat_until">Repeat until %s</string>
   <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
   <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
   <string-array name="repeat_encouragement">
     <item>Good job!</item>
     <item>Wow… I\'m so proud of you!</item>
-    <item>I love it when you\'re productive!</item>
+    <item>I love when you\'re productive!</item>
     <item>Doesn\'t it feel good to check something off?</item>
   </string-array>
+  <string-array name="repeat_encouragement_last_time">
+    <item>Good job!</item>
+    <item>I\'m so proud of you!</item>
+    <item>I love when you\'re productive!</item>
+  </string-array>
   <string name="rmilk_EOE_button">Remember the Milk 설정</string>
   <string name="rmilk_TLA_repeat">RTM 반복 작업</string>
   <string name="rmilk_TLA_sync">RTM 과 싱크가 필요</string>
@@ -934,16 +1099,19 @@
   <string name="update_string_friends">%1$s is now friends with %2$s</string>
   <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
   <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
-
-
-
-
-
-
-
+  <string name="update_string_task_created">%1$s created this task</string>
+  <string name="update_string_task_created_global">%1$s created $link_task</string>
+  <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
+  <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
+  <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
+  <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
   <string name="update_string_default_comment">%1$s commented: %3$s</string>
-
+  <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
   <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
+  <string name="update_string_tag_created">%1$s created this list</string>
+  <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
   <string name="voice_create_prompt">Speak to create a task</string>
   <string name="voice_edit_title_prompt">Speak to set task title</string>
   <string name="voice_edit_note_prompt">Speak to set task notes</string>
@@ -983,6 +1151,9 @@
   <string name="PPW_widget_42_label">Astrid Premium 4x2</string>
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Premium 4x4</string>
+  <string name="PPW_widget_v11_label">Astrid Scrollable Premium</string>
+  <string name="PPW_widget_custom_label">Astrid Scrollable Premium for Custom Launchers</string>
+  <string name="PPW_widget_custom_launcherpro_label">Astrid Scrollable Premium 4x4 for Launcher Pro</string>
   <string name="PPW_configure_title">위젯 설정</string>
   <string name="PPW_color">위젯 컬러</string>
   <string name="PPW_enable_calendar">캘린더 일정 보여주기</string>

astrid/res/values-ru/strings.xml

@@ -1,10 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="EPE_action">Опубликовать</string>
-  <string name="actfm_person_hint">Имя контакта</string>
+  <string name="actfm_person_hint">Контакт или его почта</string>
   <string name="actfm_person_or_tag_hint">Контакт или общий список</string>
   <string name="actfm_toast_success">Сохранено на сервере</string>
-
   <string name="actfm_tag_operation_disabled">Извините, эта операция не поддерживает общие метки</string>
   <string name="actfm_tag_operation_owner_delete">Вы владелец этого общего списка! Если вы удалите его, он будет удален для всех участников. Вы уверены, что хотите продолжить?</string>
   <string name="actfm_picture_camera">Сделать снимок</string>
@@ -15,6 +14,8 @@
   <string name="actfm_view_task_text">Задача была отправлена %s! Сейчас вы просматриваете ваши собственные задачи. Хотите просмотреть эту и другие задачи назначенные вам?</string>
   <string name="actfm_view_task_ok">Просмотреть назначенные</string>
   <string name="actfm_view_task_cancel">Остаться здесь</string>
+  <string name="actfm_my_shared_tasks_title">Мои общие задачи</string>
+  <string name="actfm_my_shared_tasks_empty">Нет общих задач</string>
   <string name="TVA_add_comment">Добавить комментарий...</string>
   <string name="UAd_title_comment">%1$s : %2$s</string>
   <string-array name="TVA_tabs">
@@ -30,6 +31,7 @@
   <string name="actfm_TVA_tag_owner_label">Создатель списка:</string>
   <string name="actfm_TVA_tag_owner_none">нет</string>
   <string name="actfm_TVA_members_label">Опубликовано для</string>
+  <string name="actfm_TVA_members_hint">Поделись с теми, у кого есть почтовый адрес</string>
   <string name="actfm_TVA_tag_picture">Укажите фото:</string>
   <string name="actfm_TVA_silence_label">Беззвучные уведомления</string>
   <string name="actfm_TVA_list_icon_label">Значок списка:</string>
@@ -45,25 +47,29 @@
   <string name="actfm_EPA_assign_label_long">Кто должен выполнить задачу?</string>
   <string name="actfm_EPA_assign_me">Я</string>
   <string name="actfm_EPA_unassigned">Не назначен</string>
-  <string name="actfm_EPA_task_rabbit">Outsource it!</string>
+  <string name="actfm_EPA_choose_contact">Выберите контакт</string>
+  <string name="actfm_EPA_task_rabbit">Делегируй это!</string>
   <string name="actfm_EPA_assign_custom">Свой...</string>
   <string name="actfm_EPA_share_with">Опубликовать для:</string>
+  <string name="actfm_EPA_assigned_toast">Отправлено %1$s (вы можете увидеть его в списке между вами и %2$s)</string>
   <string name="actfm_EPA_collaborators_header">Опубликовать для друзей</string>
   <string name="actfm_EPA_list">Список: %s</string>
   <string name="actfm_EPA_assigned_hint">Имя контакта</string>
   <string name="actfm_EPA_message_text">Приглашение:</string>
   <string name="actfm_EPA_message_body">Помогите мне выполнить это!</string>
+  <string name="actfm_EPA_assign_header_members">Список участников</string>
+  <string name="actfm_EPA_assign_header_friends">Друзья Astrid</string>
   <string name="actfm_EPA_tag_label">Создать совместный тэг</string>
   <string name="actfm_EPA_tag_hint">(например Клубный Клуб)</string>
   <string name="actfm_EPA_facebook">Facebook</string>
   <string name="actfm_EPA_twitter">Твиттер</string>
   <string name="actfm_EPA_emailed_toast">Задача опубликована для %s</string>
-  <string name="actfm_EPA_saved_toast">People Settings Saved</string>
+  <string name="actfm_EPA_saved_toast">Настройки людей сохранены</string>
   <string name="actfm_EPA_invalid_email">Неверный адрес электронной почты: %s</string>
   <string name="actfm_EPA_invalid_tag">Список не найден: %s</string>
-  <string name="actfm_EPA_login_to_share">Вам нужно зарегистрироваться на Astrid.com, чтобы публиковать задачи! Пожалуйста, зарегистрируйтесь или сделайте задачу приватной.</string>
+  <string name="actfm_EPA_login_to_share">Вам нужно авторизоваться на Astrid.com, чтобы поделиться задачами!</string>
   <string name="actfm_EPA_login_button">Войти</string>
-  <string name="actfm_EPA_dont_share_button">Сделать приватным</string>
+  <string name="actfm_EPA_dont_share_button">Сделать личной</string>
   <string name="actfm_ALA_title">Добро пожаловать на Astrid.com!</string>
   <string name="actfm_ALA_body">Astrid.com позволяет Вам получать доступ к вашим задачам онлайн, обмениваться ими и поручать их другим.</string>
   <string name="actfm_ALA_fb_login">Подключиться к Facebook</string>
@@ -82,12 +88,14 @@
   <string name="actfm_ALA_login_title">Авторизоваться на Astrid.com</string>
   <string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
   <string name="actfm_OLA_prompt">Пожалуйста, войдите:</string>
+  <string name="actfm_status_title_logged_in">Статус - Зарегистрирован как %s</string>
   <string name="actfm_APr_header">Astrid.com (Бета!)</string>
   <string name="actfm_https_title">Использовать HTTPS</string>
   <string name="actfm_https_enabled">HTTPS включен (медленнее)</string>
   <string name="actfm_https_disabled">HTTPS отключен (быстрее)</string>
   <string name="actfm_notification_title">Astrid.com Синхронизация</string>
   <string name="actfm_notification_comments">Получены новые комментарии / нажмите для детального просмотра</string>
+  <string name="actfm_dual_sync_warning">Сейчас происходит синхронизация с Google Tasks. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Astrid.com?</string>
   <string name="alarm_ACS_label">Напоминания</string>
   <string name="alarm_ACS_button">Добавить напоминание</string>
   <string-array name="reminders_alarm">
@@ -142,20 +150,23 @@
   <string name="DLG_cancel">Отмена</string>
   <string name="DLG_more">Подробнее</string>
   <string name="DLG_undo">Назад</string>
+  <string name="DLG_warning">Предупреждение</string>
   <string name="WID_dateButtonUnset">Нажмите для установки</string>
   <string name="WID_dateButtonLabel">$D $T</string>
   <string name="WID_disableButton">Отключить</string>
   <string name="ENE_label">Примечания</string>
   <string name="ENE_label_comments">Комментарии</string>
   <string name="ENA_no_comments">Нет данных для отображения</string>
-  <string name="ENA_no_user">Вы</string>
+  <string name="ENA_no_user">Кто-нибудь</string>
   <string name="ENA_refresh_comments">Обновить комментарии</string>
   <string name="TLA_no_items">Нет задач!</string>
+  <string name="TLA_no_items_person">%s не имеет\nобщих с вами задач</string>
   <string name="TLA_menu_addons">Расширения</string>
-  <string name="TLA_menu_sort">Сортировка и скрытые задачи</string>
-  <string name="TLA_menu_sync">Синхронизировать сейчас!</string>
+  <string name="TLA_menu_sort">Сорт. и скрыт.</string>
+  <string name="TLA_menu_sync">Синхронизация</string>
+  <string name="TLA_menu_search">Поиск</string>
   <string name="TLA_menu_lists">Списки</string>
-  <string name="TLA_menu_friends">Друзья</string>
+  <string name="TLA_menu_friends">Люди</string>
   <string name="TLA_menu_suggestions">Предложения</string>
   <string name="TLA_menu_tutorial">Руководство</string>
   <string name="TLA_menu_settings">Параметры</string>
@@ -163,7 +174,7 @@
   <string name="TLA_search_label">Поиск по списку</string>
   <string name="TLA_custom">Другой</string>
   <string name="TLA_quick_add_hint">Добавить задачу</string>
-  <string name="TLA_quick_add_hint_assign">Нажмите, чтобы назначить задачу %s</string>
+  <string name="TLA_quick_add_hint_assign">Добавить что-нибудь для %s</string>
   <string name="TLA_notification_volume_low">Тихий режим. Вы не услышите напоминаний Astrid!</string>
   <string name="TLA_notification_disabled">Напоминания Astrid отключены! Вы не будете получать никаких напоминаний</string>
   <string-array name="TLA_filters">
@@ -279,6 +290,7 @@
   <string name="TEA_control_importance">Важность</string>
   <string name="TEA_control_lists">Списки</string>
   <string name="TEA_control_notes">Примечания</string>
+  <string name="TEA_control_files">Файлы</string>
   <string name="TEA_control_reminders">Напоминания</string>
   <string name="TEA_control_timer">Учет времени</string>
   <string name="TEA_control_share">Опубликовать для друзей</string>
@@ -290,11 +302,35 @@
   <string name="TEA_load_more">Загрузить больше...</string>
   <string name="TEA_when_dialog_title">Когда это должно произойти?</string>
   <string name="TEA_date_and_time">Дата/время</string>
+  <string name="TEA_new_task">Новая задача</string>
   <string name="WSV_click_to_load">Нажми меня для поиска решений этой задачи!</string>
   <string name="WSV_not_online">Я способен на большее при подключении к Интернету. Пожалуйста, проверьте ваше подключение.</string>
+  <string name="TEA_contact_error">Извините, мы не мажем найти адрес эл. почты для выбранного контакта</string>
   <string name="InA_title">Добро пожаловать в Astrid!</string>
   <string name="InA_agree">Я согласен!!</string>
   <string name="InA_disagree">Я не согласен</string>
+  <string name="MCA_title">%1$s\nзврнил(а) в %2$s</string>
+  <string name="MCA_return_call">Позвонить сейчас</string>
+  <string name="MCA_add_task">Позвонить позже</string>
+  <string name="MCA_ignore">Игнорировать</string>
+  <string name="MCA_ignore_title">Игнорировать все пропущенные звонки?</string>
+  <string name="MCA_ignore_body">Вы проигнорировали несколько пропущенных звонков. Больше не спрашивать про них?</string>
+  <string name="MCA_ignore_all">Игнорировать все звонки</string>
+  <string name="MCA_ignore_this">Игнорировать только этот звонок</string>
+  <string name="MCA_missed_calls_pref_title">Пропущенные звонки</string>
+  <string name="MCA_missed_calls_pref_desc_enabled">Astrid будет уведомлять вас о пропущенных звонках и напомнит вам перезвонить</string>
+  <string name="MCA_missed_calls_pref_desc_disabled">Astrid не будет уведомлять вас о пропущенных звонках</string>
+  <string name="MCA_task_title_name">Перезвонить %1$s в %2$s</string>
+  <string name="MCA_task_title_no_name">Перезвонить %s</string>
+  <string name="MCA_schedule_dialog_title">Перезвонить %s в...</string>
+  <string-array name="MCA_dialog_speech_options">
+    <item>Должно быть здорово быть популярным!</item>
+    <item>Эй! Ты нравишься людям!</item>
+    <item>Обрадуй парнягу, сделай звонок!</item>
+    <item>Вы не будете рады если бы люди вам перезвонили?</item>
+    <item>Вы можете это сделать!</item>
+    <item>Вы можете всегда отправлять текст...</item>
+  </string-array>
   <string name="HlA_get_support">Получить поддержку</string>
   <string name="UpS_changelog_title">Что нового в Astrid?</string>
   <string name="UpS_updates_title">Последние новости Astrid</string>
@@ -324,7 +360,37 @@
   <string name="EPr_theme_title">Цветовая тема</string>
   <string name="EPr_theme_desc">Текущая: %s</string>
   <string name="EPr_theme_desc_unsupported">Настройка требует Android 2.0+</string>
+  <string name="EPr_theme_widget_title">Тема виджета</string>
   <string name="EPr_taskRowPrefs_title">Внешний вид задач в списке</string>
+  <string name="EPr_labs_header">Copy text \t Astrid Labs</string>
+  <string name="EPr_labs_desc">Попробуйте и настройте эксперементальные функции</string>
+  <string name="EPr_swipe_lists_performance_title">Свайп между списками</string>
+  <string name="EPr_swipe_lists_performance_subtitle">Управляет производительностью памяти свайпа между списками</string>
+  <string name="EPr_use_contact_picker">Использовать системный выбор контактов</string>
+  <string name="EPr_use_contact_picker_desc_enabled">Опция \"системный выбор контактов\" будет показана в окне назначения задачи</string>
+  <string name="EPr_use_contact_picker_desc_disabled">Опция \"системный выбор контактов\" будет скрыта</string>
+  <string name="EPr_third_party_addons">Включить сторонние дополнения</string>
+  <string name="EPr_third_party_addons_desc_enabled">Сторонние дополнения будут включены</string>
+  <string name="EPr_third_party_addons_desc_disabled">Сторонние дополнения будут отключены</string>
+  <string name="EPr_ideas_tab_enabled">Идеи по задаче</string>
+  <string name="EPr_ideas_tab_description">Взгляните на идеи, которые помогут вам выполнить задачи.</string>
+  <string name="EPr_cal_end_or_start_at_due_time">Время события</string>
+  <string name="EPr_cal_end_at_due_time">Время окончания события</string>
+  <string name="EPr_cal_start_at_due_time">Начать событие в своё время</string>
+  <string name="EPr_swipe_lists_restart_alert">Нужно перезапустить Astrid чтобы эти изменения вступили в силу</string>
+  <string-array name="EPr_swipe_lists_performance_mode">
+    <item>Нет свайпа</item>
+    <item>Беречь память</item>
+    <item>Нормальная производительность</item>
+    <item>Высокая производительность</item>
+  </string-array>
+  <string-array name="EPr_swipe_lists_performance_desc">
+    <item>Свайп между списками выключен</item>
+    <item>Меньшая производительность</item>
+    <item>Настройка по умолчанию</item>
+    <item>Использовать больше системных ресурсов</item>
+  </string-array>
+  <string name="EPr_swipe_lists_display">%1$s - %2$s</string>
   <string-array name="EPr_themes">
     <item>День - Синий</item>
     <item>День - Красный</item>
@@ -332,6 +398,15 @@
     <item>Прозрачный (белый текст)</item>
     <item>Прозрачный (черный текст)</item>
   </string-array>
+  <string-array name="EPr_themes_widget">
+    <item>Та же что и в приложении</item>
+    <item>День - Синий</item>
+    <item>День - Красный</item>
+    <item>Ночь</item>
+    <item>Прозрачный (белый текст)</item>
+    <item>Прозрачный (черный текст)</item>
+    <item>Старый стиль</item>
+  </string-array>
   <string name="EPr_manage_header">Управление старыми задачами</string>
   <string name="EPr_manage_delete_completed">Удалить завершенные задачи</string>
   <string name="EPr_manage_delete_completed_message">Вы действительно хотите удалить все завершенные задачи?</string>
@@ -361,11 +436,14 @@
   <string name="WCA_title">Выберите задачи для просмотра…</string>
   <string name="p_about">О Astrid</string>
   <string name="p_about_text">Текущая версия: %s\n\n Astrid имеет открытый исходный код и с гордостью поддерживается Todoroo, Inc.</string>
-  <string name="p_help">Справка</string>
+  <string name="p_help">Поддержка</string>
+  <string name="p_forums">Форумы</string>
   <string name="task_killer_help">Возможно вы используете менеджер задач (%s). По возможности добавьте Astrid в список исключений иначе возможны сложности с напоминаниями.\n</string>
   <string name="task_killer_help_ok">Я не хочу убивать Astrid!</string>
   <string name="marketplace_title">Список задач Astrid</string>
   <string name="marketplace_description">Astrid - распространённый список задач с открытым исходным кодом призванный помочь Вам справиться с делами. В нём есть напоминания, метки, синхронизация, плагин Locale, виджет и многое другое.</string>
+  <string name="DB_corrupted_title">Поврежденная база данных</string>
+  <string name="DB_corrupted_body">Ой-ой! Похоже у вас повреждена база данных. Если вы постоянно видите это сообщение, мы рекомендуем вам очистить данные (Параметры-&amp;g;Управление старыми задачами-&amp;g;Очистить все данные) и восстановить ваши задачи из резервной копии (Параметры-&amp;g;Резервные копии-&amp;gtИмпортировать задачи)</string>
   <string name="EPr_defaults_header">Параметры по умолчанию для новых задач</string>
   <string name="EPr_default_urgency_title">Актуальность по умолчанию</string>
   <string name="EPr_default_urgency_desc">Текущая: %s</string>
@@ -484,7 +562,9 @@
   <string name="gtasks_error_backend">Google\'s Task API в стадии бета и произошла ошибка. Служба может быть не доступна, пожалуйста, попробуйте позже.</string>
   <string name="gtasks_error_accountNotFound">Аккаунт %s не найден--пожалуйста, выйдите и войдите снова через настройки Google Tasks.</string>
   <string name="gtasks_error_authRefresh">Не удалось пройти аутентификацию в Google Tasks. Пожалуйста, проверьте пароль к учетной записи или попробуйте еще раз позже.</string>
-  <string name="gtasks_error_accountManager">Ошибка в менеджере аккаунтов вашего телефона, Пожалуйста выйдите и войдите снова в настройках Google Tasks.</string>
+  <string name="gtasks_error_accountManager">Ошибка в менеджере аккаунтов вашего телефона, Пожалуйста выйдите и войдите снова в настройках Google Tasks</string>
+  <string name="gtasks_error_background_sync_auth">Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Astrid запущен.</string>
+  <string name="gtasks_dual_sync_warning">Сейчас происходит синхронизация с Astrid.com. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Google Tasks?</string>
   <string name="help_popover_add_task">Начните с добавления одной-двух задач</string>
   <string name="help_popover_tap_task">Нажмите на задачу, чтобы изменить или поделиться</string>
   <string name="help_popover_list_settings">Нажмите, чтобы изменить или поделиться списком</string>
@@ -527,8 +607,8 @@
   <string name="opencrx_contact_input_hint">Назначено на</string>
   <string name="opencrx_PPr_header">OpenCRX</string>
   <string name="opencrx_no_creator">(Не синхронизировано)</string>
-  <string name="opencrx_PPr_defaultcreator_title">Создатель событий по умолчанию</string>
-  <string name="opencrx_PPr_defaultcreator_summary">Новые события буду созданы: %s</string>
+  <string name="opencrx_PPr_defaultcreator_title">Напоминатель по умолчанию</string>
+  <string name="opencrx_PPr_defaultcreator_summary">Новые активности будут создаты к: %s</string>
   <string name="opencrx_PPr_defaultcreator_summary_none">Новые события не будут синхронизироваться по-умолчанию</string>
   <string name="opencrx_group">сервер OpenCRX</string>
   <string name="opencrx_host_title">Хост</string>
@@ -539,7 +619,7 @@
   <string name="opencrx_segment_summary">"Для примера: "<i>Standard</i></string>
   <string name="opencrx_segment_default">Стандарт</string>
   <string name="opencrx_provider_title">Поставщик</string>
-  <string name="opencrx_provider_dialog_title">Поставщик данных OpenCRX</string>
+  <string name="opencrx_provider_dialog_title">Поставщик данных для openCRX</string>
   <string name="opencrx_provider_summary">"Для примера: "<i>CRX</i></string>
   <string name="opencrx_provider_default">CRX</string>
   <string name="opencrx_PLA_title">Войдите в openCRX</string>
@@ -552,21 +632,56 @@
   <string name="opencrx_notification_title">OpenCRX</string>
   <string name="opencrx_notification_text">%s задач обновлено / кликните для подробностей</string>
   <string name="opencrx_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
-  <string name="opencrx_MLA_email_empty">Login was not specified!</string>
+  <string name="opencrx_MLA_email_empty">Имя пользователя не указано!</string>
   <string name="opencrx_MLA_password_empty">Не указан пароль!</string>
   <string name="opencrx_TEA_task_assign_label">Назначить эту задачу этому человеку:</string>
   <string name="opencrx_TEA_task_unassigned">&lt;Без назначения&gt;</string>
-  <string name="opencrx_TEA_creator_assign_label">Назначить эту задачу этому создателю:</string>
+  <string name="opencrx_TEA_creator_assign_label">Назначить задачу этому автору:</string>
   <string name="opencrx_TEA_dashboard_default">&lt;По умолчанию&gt;</string>
-  <string name="opencrx_TEA_opencrx_title">Управление OpenCRX</string>
+  <string name="opencrx_TEA_opencrx_title">Управление openCRX</string>
   <string name="CFC_opencrx_in_workspace_text">в среде: ?</string>
   <string name="CFC_opencrx_in_workspace_name">в среде...</string>
   <string name="CFC_opencrx_assigned_to_text">Присвоено: ?</string>
   <string name="CFC_opencrx_assigned_to_name">Присвоено ...</string>
-  <string name="EPr_powerpack_header">Astrid Power Pack</string>
+  <string name="EPr_powerpack_header">Расширенный пакет Astrid</string>
   <string name="EPr_statistics_title">Анонимная статистика использования</string>
   <string name="EPr_statistics_desc_disabled">Данные об использовании не передаются</string>
   <string name="EPr_statistics_desc_enabled">Помогите нам сделать Astrid лучше, отправляя анонимную статистику использования</string>
+  <string name="speech_err_network">Ошибка подключения! Для голосового распознавания требуется интернет соединение.</string>
+  <string name="speech_err_no_match">Извините, я не расслышал! Повторите, пожалуйста.</string>
+  <string name="speech_err_default">Извините, ошибка службы голосового распознавания. Попробуйте, еще раз.</string>
+  <string name="premium_attach_file">Прикрепить файл</string>
+  <string name="premium_record_audio">Записать заметку</string>
+  <string name="premium_no_files">Нет прикреплённых файлов.</string>
+  <string name="premium_remove_file_confirm">Вы уверены? Это не может быть отменено.</string>
+  <string name="audio_recording_title">Запись голоса.</string>
+  <string name="audio_stop_recording">Остановить запись</string>
+  <string name="audio_speak_now">Говорите!</string>
+  <string name="audio_encoding">Кодирование</string>
+  <string name="audio_err_encoding">Ошибка кодировки голоса.</string>
+  <string name="audio_err_playback">Извините, система не поддерживает этот тип аудио файла.</string>
+  <string name="search_market_audio">Не найден проигрыватель для этого типа аудио. Хотите скачать его с Google Plus?</string>
+  <string name="search_market_audio_title">Не найдено проигрывателя.</string>
+  <string name="search_market_pdf">Не найдена программа для просмотра PDF файлов. Хотите скачать её с Google Plus?</string>
+  <string name="search_market_pdf_title">Не найдена программа для просмотра PDF файлов.</string>
+  <string name="search_market_ms">Не найдена программа для просмотра файлов MS Office. Хотите скачать её с Google Plus?</string>
+  <string name="search_market_ms_title">Не найдена программа для просмотра файлов MS Office.</string>
+  <string name="file_type_unhandled">Извините! Не найдена программа для просмотра файлов этого типа.</string>
+  <string name="file_type_unhandled_title">Не найдена программа для просмотра файлов этого типа.</string>
+  <string name="file_prefix_image">Изображение</string>
+  <string name="file_prefix_voice">Голос</string>
+  <string name="file_browser_up">Вверх</string>
+  <string name="file_browser_title">Выбрать файл</string>
+  <string name="file_browser_err_permissions">Ошибка доступа! Пожалуйста убедитесь, что вы не заблокировали Astrid для доступа к SD карте.</string>
+  <string name="file_add_picture">Прикрепите изображение</string>
+  <string name="file_add_sdcard">Прикрепите файл с Вашей SD карточки.</string>
+  <string name="file_download_title">Загрузить файл?</string>
+  <string name="file_download_body">Этот файл не был загружен на Вашу SD карточку. Загрузить?</string>
+  <string name="file_download_progress">Загрузка...</string>
+  <string name="file_err_memory">Изображение слишком большое, не хватает места в памяти.</string>
+  <string name="file_err_copy">Ошибка копирования прикрепляемого файла.</string>
+  <string name="file_err_download">Ошибка загрузки файла</string>
+  <string name="file_err_show">Извините, система не поддерживает этот тип файлов.</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">Рабочие области</string>
   <string name="producteev_FEx_responsible_byme">Назначено мною</string>
@@ -631,6 +746,33 @@
   <string name="rmd_NoA_done">Уже готово!</string>
   <string name="rmd_NoA_snooze">Дремать…</string>
   <string name="rmd_NoA_completed_toast">Поздравляем с окончанием!</string>
+  <string name="rmd_NoA_dlg_title">Напоминания:</string>
+  <string-array name="rmd_reengage_notif_titles">
+    <item>Заметка из Astrid</item>
+    <item>Напоминание для %s</item>
+    <item>Обзор задач от Astrid</item>
+    <item>Напоминания от Astrid</item>
+  </string-array>
+  <string name="rmd_reengage_name_default">Вы</string>
+  <string name="rmd_reengage_snooze">Всё отложить</string>
+  <string name="rmd_reengage_add_tasks">Добавить задачу</string>
+  <string-array name="rmd_reengage_dialog_options">
+    <item>Время сократить Ваш список задач!</item>
+    <item>Дорогой сэр или мадам, некоторые задачи ждут Вашего внимания!</item>
+    <item>Привет, могли бы Вы взглянуть сюда?</item>
+    <item>У меня есть несколько задач на Ваше имя!</item>
+    <item>Свежая пачка задач для Вас на сегодня.</item>
+    <item>Вы выглядите потрясающе! Готовы начать?</item>
+    <item>Прекрасный день, чтобы поработат, я думаю!</item>
+  </string-array>
+  <string-array name="rmd_reengage_dialog_empty_options">
+    <item>Разве вы не хотите навести порядок?</item>
+    <item>Я Astrid! Я здесь, чтобы помочь Вам сделать больше!</item>
+    <item>Вы выглядите занятым. Позвольте убрать некоторые задачи из вашего списка.</item>
+    <item>Я могу помочь Вам следить за всеми деталями Вашей жизни.</item>
+    <item>Вы серьёзно о том что нужно сделать побольше? Ну что, я тоже!</item>
+    <item>Очень приятно с Вами познакомиться!</item>
+  </string-array>
   <string name="rmd_EPr_alerts_header">Настройки напоминаний</string>
   <string name="rmd_EPr_enabled_title">Включить напоминания?</string>
   <string name="rmd_EPr_enabled_desc_true">Напоминания Astrid включены (это нормально)</string>
@@ -657,7 +799,7 @@
   <string name="rmd_EPr_vibrate_title">Будильник с вибрацией</string>
   <string name="rmd_EPr_vibrate_desc_true">Astrid будет вызывать вибрацию при уведомлении</string>
   <string name="rmd_EPr_vibrate_desc_false">Astrid не будет вызывать вибрацию при уведомлениях</string>
-  <string name="rmd_EPr_nagging_title">Astrid Encouragements</string>
+  <string name="rmd_EPr_nagging_title">Ободрения Astrid</string>
   <string name="rmd_EPr_nagging_desc_true">Astrid появится на экране, чтобы подбодрить вас при напоминаниях</string>
   <string name="rmd_EPr_nagging_desc_false">Astrid не будет показывать приободряющих сообщений</string>
   <string name="rmd_EPr_snooze_dialog_title">Дремать HH:MM</string>
@@ -805,16 +947,16 @@
     <item>Как насчёт перекусить после завершения?</item>
     <item>Всего одна просьба! Пожалуйста!</item>
     <item>Время укоротить список намеченного!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
+    <item>Вы в команде Порядка или команде Хаоса? Команде Порядка! Вперед!</item>
+    <item>Я говорил, что вы удивляете в последнее время? Так держать!</item>
+    <item>Кто задачу за день выполняет, у того беспорядка не бывает... Прощай беспорядок!</item>
+    <item>Как вы это делаете? Вау, я впечатлен!</item>
+    <item>Это не сделается просто из-за того что Вы отлично выглядите. Давайте, сделайте это!</item>
+    <item>Прекрасная погода для такой работы как эта, не правда ли?</item>
+    <item>Чашку чая пока вы работаете над этим?</item>
+    <item>Только если вы уже сделали это, вы можете пойти на улицу и поиграть.</item>
+    <item>Время пришло. Вы не можете откладывать неизбежное.</item>
+    <item>Частичка меня умирает каждый раз, когда вы игнорируете меня.</item>
   </string-array>
   <string-array name="postpone_nags">
     <item>Но признайса, ты ведь не любишь откладывать?</item>
@@ -837,11 +979,11 @@
   <string name="repeat_enabled">Повторения</string>
   <string name="repeat_every">С интервалом в %d</string>
   <string name="repeat_interval_prompt">Интервал повтора</string>
-  <string name="repeat_never">No Repeat</string>
+  <string name="repeat_never">Без повтора</string>
   <string name="repeat_dont">Не повторять</string>
   <string-array name="repeat_interval_short">
-    <item>д</item>
-    <item>нед</item>
+    <item>д.</item>
+    <item>нед.</item>
     <item>мес.</item>
     <item>час.</item>
     <item>мин.</item>
@@ -852,23 +994,46 @@
     <item>Неделя(ль)</item>
     <item>Месяц(ев)</item>
     <item>Час(ов)</item>
-    <item>Minute(s)</item>
+    <item>Минута(ы)</item>
     <item>Лет (Года)</item>
   </string-array>
+  <string-array name="repeat_until_shortcuts">
+    <item>Всегда</item>
+    <item>Определённый день</item>
+    <item>Сегодня</item>
+    <item>Завтра</item>
+    <item>(день спустя)</item>
+    <item>На следующей неделе</item>
+    <item>В течении двух недель</item>
+    <item>Следующий месяц</item>
+  </string-array>
+  <string name="repeat_until_title">Повторять пока ...</string>
+  <string name="repeat_keep_going">Продолжайте</string>
   <string-array name="repeat_type">
     <item>с намеченного времени</item>
     <item>со времени завершения</item>
   </string-array>
   <string name="repeat_detail_byday">$I каждый $D</string>
   <string name="repeat_detail_duedate">С интервалом %s</string>
+  <string name="repeat_detail_duedate_until">"Каждые  %1$s пока %2$s"</string>
   <string name="repeat_detail_completion">%s после завершения</string>
-  <string name="repeat_rescheduling_dialog_title">Перенос задачи \"%s\"</string>
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Я перенс эту повторяющуюся задачу с %2$s на %3$s</string>
+  <string name="repeat_forever">Повторять всегда</string>
+  <string name="repeat_until">Повторять пока %s</string>
+  <string name="repeat_rescheduling_dialog_title">Перепланирование задачи \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_title_last_time">Прекратить повторять задачу \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_bubble">%1$s я перепланировал эту повторяющуюся задачу с %2$s на %3$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Я перенес эту повторяющуюся задачу на %2$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_last_time">Вы должны были повторять это до %1$s, теперь повторения закончились. %2$s</string>
   <string-array name="repeat_encouragement">
     <item>Хорошая работа!</item>
     <item>Вау... Я так горжусь тобой!</item>
-    <item>I love it when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
+    <item>Я люблю когда Вы плодотворны!</item>
+    <item>Разве это не приятно вычеркивать что-нибудь?</item>
+  </string-array>
+  <string-array name="repeat_encouragement_last_time">
+    <item>Молодец!</item>
+    <item>Я так горжусь Вами!</item>
+    <item>Я люблю когда Вы плодотворны!</item>
   </string-array>
   <string name="rmilk_EOE_button">Запомнить настройки Milk</string>
   <string name="rmilk_TLA_repeat">Повторяющаяся задача RTM</string>
@@ -876,7 +1041,7 @@
   <string name="rmilk_FEx_header">Помни про молоко</string>
   <string name="rmilk_FEx_list">Списки</string>
   <string name="rmilk_FEx_list_title">Список RTM \'%s\'</string>
-  <string name="rmilk_MEA_title">Remember the Milk</string>
+  <string name="rmilk_MEA_title">Помни про молоко</string>
   <string name="rmilk_MEA_list_label">Список RTM:</string>
   <string name="rmilk_MEA_repeat_label">Состояние повтора RTM</string>
   <string name="rmilk_MEA_repeat_hint">например, каждую неделю, спустя 14 дней</string>
@@ -890,7 +1055,7 @@
   <string name="subtasks_help_2">Перетащите вертикально, чтобы перестроить</string>
   <string name="subtasks_help_3">Перетащите горизонтально для отступа</string>
   <string name="TEA_tags_label">Списки</string>
-  <string name="TEA_tags_label_long">Поместите задачу в один или несколько списков</string>
+  <string name="TEA_tags_label_long">Поместить задачу в списки</string>
   <string name="TEA_tags_none">Пусто</string>
   <string name="TEA_tag_hint">Новый список</string>
   <string name="TEA_tag_dropdown">Выберите список</string>
@@ -917,7 +1082,7 @@
   <string name="TEA_tags_deleted">Список %1$s был удален, затронуло %2$d задач</string>
   <string name="TEA_tags_left">Вы покинули обший список %1$s, затронуло %2$d задач</string>
   <string name="TEA_tags_renamed">Переименовано %1$s в %2$s для %3$d задач</string>
-  <string name="tag_case_migration_notice">Мы заметили, что у вас есть списки, которые имеют одинаковое имя с различной капитализации. Мы считаем, что вы, возможно, хотели бы, чтобы они были в одном списке, поэтому мы объединили дубликаты. Не волнуйтесь:  списки просто переименованы с номерами (например, Shopping_1, Shopping_2). Если вы не хотите этого, вы можете просто удалить новый объединенный список!</string>
+  <string name="tag_case_migration_notice">"Мы заметили, что у вас есть списки, которые имеют одинаковое имя с различной капитализации. Мы считаем, что вы, возможно, хотели бы, чтобы они были в  одном списке, поэтому мы объединили дубликаты. Не волнуйтесь:  списки просто переименованы с номерами (например, Shopping_1, Shopping_2). Если вы не хотите этого, вы можете просто удалить новый объединенный список!"</string>
   <string name="tag_settings_title">Настройки:</string>
   <string name="tag_updates_title">Активность: %s</string>
   <string name="tag_delete_button">Удалить список</string>
@@ -928,22 +1093,25 @@
   <string name="TFE_category">Фильтр таймеров</string>
   <string name="TFE_workingOn">Задачи для замера времени</string>
   <string name="TEA_timer_controls">Учет времени</string>
-  <string name="TEA_timer_comment_started">started this task:</string>
-  <string name="TEA_timer_comment_stopped">stopped doing this task:</string>
-  <string name="TEA_timer_comment_spent">Time spent:</string>
+  <string name="TEA_timer_comment_started">задача началась:</string>
+  <string name="TEA_timer_comment_stopped">зада завершилась:</string>
+  <string name="TEA_timer_comment_spent">Времени потрачено:</string>
   <string name="update_string_friends">%1$s теперь друзья с %2$s</string>
   <string name="update_string_request_friendship">%1$s хочет дружить с вами</string>
   <string name="update_string_confirmed_friendship">%1$s подтвердил(а) ваш запрос на дружбу</string>
-
-
-
-
-
-
-
+  <string name="update_string_task_created">%1$s создал(а) эту задачу</string>
+  <string name="update_string_task_created_global">%1$s создал(а) $link_task</string>
+  <string name="update_string_task_created_on_list">%1$s добавил(а) $link_task в этот список</string>
+  <string name="update_string_task_completed">%1$s завершил(а) $link_task. Ура!</string>
+  <string name="update_string_task_uncompleted">%1$s не завершил(а) $link_task.</string>
+  <string name="update_string_task_tagged">%1$s добавил(а) $link_task в %4$s</string>
+  <string name="update_string_task_tagged_list">%1$s добавил(а) $link_task в этот список</string>
+  <string name="update_string_task_assigned">%1$s создал(а) $link_task на %4$s</string>
   <string name="update_string_default_comment">%1$s прокомментировал(а): %3$s</string>
-
-  <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
+  <string name="update_string_task_comment">%1$s На: $link_task: %3$s</string>
+  <string name="update_string_tag_comment">%1$s На: %2$s: %3$s</string>
+  <string name="update_string_tag_created">%1$s создал(а) этот список</string>
+  <string name="update_string_tag_created_global">%1$s создал(а) %2$s</string>
   <string name="voice_create_prompt">Говорите чтобы создать задачу</string>
   <string name="voice_edit_title_prompt">Произнесите название задачи</string>
   <string name="voice_edit_note_prompt">Произнесите заметки задачи</string>
@@ -960,11 +1128,11 @@
   <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid должен произносить название задач во время напоминаний</string>
   <string name="EPr_voiceRemindersEnabled_desc_disabled">Оповещение звуком во время напоминания</string>
   <string name="EPr_voice_header">Параметры голосового ввода</string>
-  <string name="welcome_show_eula">Примите EULA для начала!</string>
+  <string name="welcome_show_eula">Примите EULA чтобы начать!</string>
   <string name="welcome_setting">Показать обучение</string>
   <string name="welcome_title_1">Добро пожаловать в Astrid!</string>
   <string name="welcome_title_2">Пишите списки</string>
-  <string name="welcome_title_3">Переходи между списками</string>
+  <string name="welcome_title_3">Переходите между списками</string>
   <string name="welcome_title_4">Делитесь списками</string>
   <string name="welcome_title_5">Делите задачи</string>
   <string name="welcome_title_6">Подробности</string>
@@ -974,7 +1142,7 @@
   <string name="welcome_body_2">Удобен для любого списка:\nчто почитать, посмотреть, купить, посетить!</string>
   <string name="welcome_body_3">Нажми на название списка,\nчтобы увидеть все свои списки</string>
   <string name="welcome_body_4">Поделитесь списками с\nдрузьями, соседями\nили любимым человеком!</string>
-  <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>
+  <string name="welcome_body_5">Больше не беспокойтесь,\nкто несет десерт!</string>
   <string name="welcome_body_6">Нажмите чтобы добавить заметки,\nустановить напоминания,\nи многое другое!</string>
   <string name="welcome_body_7">Вход</string>
   <string name="welcome_body_7_return">Нажми Astrid, чтобы вернуться</string>
@@ -983,6 +1151,9 @@
   <string name="PPW_widget_42_label">Astrid Premium 4x2</string>
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Премиум 4x4</string>
+  <string name="PPW_widget_v11_label">Astrid Scrollable Premium</string>
+  <string name="PPW_widget_custom_label">Astrid Scrollable Premium for Custom Launchers</string>
+  <string name="PPW_widget_custom_launcherpro_label">Astrid Scrollable Premium 4x4 for Launcher Pro</string>
   <string name="PPW_configure_title">Настройка виджета</string>
   <string name="PPW_color">Цвет виджета</string>
   <string name="PPW_enable_calendar">Показать календарное событие</string>
@@ -1023,9 +1194,9 @@
   </string-array>
   <string name="PPW_widget_dlg_text">Этот виджет доступен только для владельцев PowerPack!</string>
   <string name="PPW_widget_dlg_ok">Предпросмотр</string>
-  <string name="PPW_demo_title1">Items on %s will go here</string>
+  <string name="PPW_demo_title1">Записи от %s будут идти здесь</string>
   <string name="PPW_demo_title2">Power Pack включает премиум-виджеты...</string>
-  <string name="PPW_demo_title3">...voice add and good feelings!</string>
+  <string name="PPW_demo_title3">... добавьте голосовую заметку и приятных ощущений!</string>
   <string name="PPW_demo_title4">Нажми и узнай больше!</string>
   <string name="PPW_info_title">Бесплатный Power Pack!</string>
   <string name="PPW_info_signin">Войди!</string>

astrid/res/values-th/strings.xml

@@ -4,7 +4,6 @@
   <string name="actfm_person_hint">Contact or Email</string>
   <string name="actfm_person_or_tag_hint">Contact or Shared List</string>
   <string name="actfm_toast_success">Saved on Server</string>
-
   <string name="actfm_tag_operation_disabled">Sorry, this operation is not yet supported for shared tags.</string>
   <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?</string>
   <string name="actfm_picture_camera">Take a Picture</string>
@@ -15,6 +14,8 @@
   <string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own tasks. Do you want to view this and other tasks you\'ve assigned?</string>
   <string name="actfm_view_task_ok">View Assigned</string>
   <string name="actfm_view_task_cancel">Stay Here</string>
+  <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
+  <string name="actfm_my_shared_tasks_empty">No shared tasks</string>
   <string name="TVA_add_comment">Add a comment...</string>
   <string name="UAd_title_comment">%1$s re: %2$s</string>
   <string-array name="TVA_tabs">
@@ -30,6 +31,7 @@
   <string name="actfm_TVA_tag_owner_label">List Creator:</string>
   <string name="actfm_TVA_tag_owner_none">none</string>
   <string name="actfm_TVA_members_label">Shared With</string>
+  <string name="actfm_TVA_members_hint">Share with anyone who has an email address</string>
   <string name="actfm_TVA_tag_picture">List Picture</string>
   <string name="actfm_TVA_silence_label">Silence Notifications</string>
   <string name="actfm_TVA_list_icon_label">List Icon:</string>
@@ -45,14 +47,18 @@
   <string name="actfm_EPA_assign_label_long">Who should do this?</string>
   <string name="actfm_EPA_assign_me">Me</string>
   <string name="actfm_EPA_unassigned">Unassigned</string>
+  <string name="actfm_EPA_choose_contact">Choose a contact</string>
   <string name="actfm_EPA_task_rabbit">Outsource it!</string>
   <string name="actfm_EPA_assign_custom">Custom...</string>
   <string name="actfm_EPA_share_with">Share with:</string>
+  <string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
   <string name="actfm_EPA_collaborators_header">Share with Friends</string>
   <string name="actfm_EPA_list">List: %s</string>
   <string name="actfm_EPA_assigned_hint">Contact Name</string>
   <string name="actfm_EPA_message_text">Invitation Message:</string>
   <string name="actfm_EPA_message_body">Help me get this done!</string>
+  <string name="actfm_EPA_assign_header_members">List Members</string>
+  <string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
   <string name="actfm_EPA_tag_label">Create a shared tag?</string>
   <string name="actfm_EPA_tag_hint">(i.e. Silly Hats Club)</string>
   <string name="actfm_EPA_facebook">Facebook</string>
@@ -61,9 +67,9 @@
   <string name="actfm_EPA_saved_toast">People Settings Saved</string>
   <string name="actfm_EPA_invalid_email">Invalid E-mail: %s</string>
   <string name="actfm_EPA_invalid_tag">List Not Found: %s</string>
-  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks! Please log in or make this a private task.</string>
+  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
   <string name="actfm_EPA_login_button">Log in</string>
-  <string name="actfm_EPA_dont_share_button">Make private</string>
+  <string name="actfm_EPA_dont_share_button">Don\'t share</string>
   <string name="actfm_ALA_title">Welcome to Astrid.com!</string>
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
@@ -82,12 +88,14 @@
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
   <string name="actfm_GAA_title">Select the Google account you want to use:</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_status_title_logged_in">Status - Logged in as %s</string>
   <string name="actfm_APr_header">Astrid.com</string>
   <string name="actfm_https_title">Use HTTPS</string>
   <string name="actfm_https_enabled">HTTPS enabled (slower)</string>
   <string name="actfm_https_disabled">HTTPS disabled (faster)</string>
   <string name="actfm_notification_title">Astrid.com Sync</string>
   <string name="actfm_notification_comments">New comments received / click for more details</string>
+  <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarms</string>
   <string name="alarm_ACS_button">Add an Alarm</string>
   <string-array name="reminders_alarm">
@@ -142,20 +150,23 @@
   <string name="DLG_cancel">Cancel</string>
   <string name="DLG_more">More</string>
   <string name="DLG_undo">Undo</string>
+  <string name="DLG_warning">Warning</string>
   <string name="WID_dateButtonUnset">คลิก เพื่อตั้งค่า</string>
   <string name="WID_dateButtonLabel">$D $T</string>
   <string name="WID_disableButton">ปิดการใช้งาน</string>
   <string name="ENE_label">บันทึกย่อ</string>
   <string name="ENE_label_comments">Comments</string>
   <string name="ENA_no_comments">No activity yet</string>
-  <string name="ENA_no_user">You</string>
+  <string name="ENA_no_user">Someone</string>
   <string name="ENA_refresh_comments">Refresh Comments</string>
   <string name="TLA_no_items">ไม่มีแผนงานใดๆ !</string>
+  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
   <string name="TLA_menu_addons">ส่วนเสริม</string>
   <string name="TLA_menu_sort">Sort &amp; Hidden</string>
-  <string name="TLA_menu_sync">ปรับข้อมูลตอนนี้เลย!</string>
+  <string name="TLA_menu_sync">Sync Now</string>
+  <string name="TLA_menu_search">Search</string>
   <string name="TLA_menu_lists">Lists</string>
-  <string name="TLA_menu_friends">Friends</string>
+  <string name="TLA_menu_friends">People</string>
   <string name="TLA_menu_suggestions">Suggestions</string>
   <string name="TLA_menu_tutorial">Tutorial</string>
   <string name="TLA_menu_settings">ตั้งค่า</string>
@@ -163,7 +174,7 @@
   <string name="TLA_search_label">ค้นหาในรายการนี้</string>
   <string name="TLA_custom">ปรับแต่ง</string>
   <string name="TLA_quick_add_hint">Add a task</string>
-  <string name="TLA_quick_add_hint_assign">Tap to assign %s a task</string>
+  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
   <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
   <string name="TLA_notification_disabled">Astrid reminders are disabled! You will not receive any reminders</string>
   <string-array name="TLA_filters">
@@ -279,6 +290,7 @@
   <string name="TEA_control_importance">ความสำคัญ</string>
   <string name="TEA_control_lists">Lists</string>
   <string name="TEA_control_notes">บันทึกย่อ</string>
+  <string name="TEA_control_files">Files</string>
   <string name="TEA_control_reminders">Reminders</string>
   <string name="TEA_control_timer">Timer Controls</string>
   <string name="TEA_control_share">Share With Friends</string>
@@ -290,11 +302,35 @@
   <string name="TEA_load_more">Load more...</string>
   <string name="TEA_when_dialog_title">When is this due?</string>
   <string name="TEA_date_and_time">Date/Time</string>
+  <string name="TEA_new_task">New Task</string>
   <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
   <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
+  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
   <string name="InA_title">ยินดีต้อนรับสู่ Astrid!</string>
   <string name="InA_agree">ฉันเห็นด้วย!!</string>
   <string name="InA_disagree">ฉันไม่เห็นด้วย</string>
+  <string name="MCA_title">%1$s\ncalled at %2$s</string>
+  <string name="MCA_return_call">Call now</string>
+  <string name="MCA_add_task">Call later</string>
+  <string name="MCA_ignore">Ignore</string>
+  <string name="MCA_ignore_title">Ignore all missed calls?</string>
+  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
+  <string name="MCA_ignore_all">Ignore all calls</string>
+  <string name="MCA_ignore_this">Ignore this call only</string>
+  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
+  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
+  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+  <string name="MCA_task_title_no_name">Call %s back</string>
+  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+  <string-array name="MCA_dialog_speech_options">
+    <item>It must be nice to be so popular!</item>
+    <item>Yay! People like you!</item>
+    <item>Make their day, give \'em a call!</item>
+    <item>Wouldn\'t you be happy if people called you back?</item>
+    <item>You can do it!</item>
+    <item>You can always send a text...</item>
+  </string-array>
   <string name="HlA_get_support">ขอความช่วยเหลือ</string>
   <string name="UpS_changelog_title">มีอะไรใหม่ใน Astrid?</string>
   <string name="UpS_updates_title">ข่าวล่าสุดของ Astrid</string>
@@ -324,7 +360,37 @@
   <string name="EPr_theme_title">Color Theme</string>
   <string name="EPr_theme_desc">Currently: %s</string>
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
+  <string name="EPr_theme_widget_title">Widget Theme</string>
   <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
+  <string name="EPr_labs_header">Astrid Labs</string>
+  <string name="EPr_labs_desc">Try and configure experimental features</string>
+  <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
+  <string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
+  <string name="EPr_use_contact_picker">Use contact picker</string>
+  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
+  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
+  <string name="EPr_third_party_addons">Enable Third Party Add-ons</string>
+  <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
+  <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
+  <string name="EPr_ideas_tab_enabled">Task Ideas</string>
+  <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
+  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <string name="EPr_swipe_lists_restart_alert">You will need to restart Astrid for this change to take effect</string>
+  <string-array name="EPr_swipe_lists_performance_mode">
+    <item>No swipe</item>
+    <item>Conserve Memory</item>
+    <item>Normal Performance</item>
+    <item>High Performance</item>
+  </string-array>
+  <string-array name="EPr_swipe_lists_performance_desc">
+    <item>Swipe between lists is disabled</item>
+    <item>Slower performance</item>
+    <item>Default setting</item>
+    <item>Uses more system resources</item>
+  </string-array>
+  <string name="EPr_swipe_lists_display">%1$s - %2$s</string>
   <string-array name="EPr_themes">
     <item>Day - Blue</item>
     <item>Day - Red</item>
@@ -332,6 +398,15 @@
     <item>Transparent (White Text)</item>
     <item>Transparent (Black Text)</item>
   </string-array>
+  <string-array name="EPr_themes_widget">
+    <item>Same as app</item>
+    <item>Day - Blue</item>
+    <item>Day - Red</item>
+    <item>Night</item>
+    <item>Transparent (White Text)</item>
+    <item>Transparent (Black Text)</item>
+    <item>Old Style</item>
+  </string-array>
   <string name="EPr_manage_header">Manage Old Tasks</string>
   <string name="EPr_manage_delete_completed">Delete Completed Tasks</string>
   <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
@@ -361,11 +436,14 @@
   <string name="WCA_title">เลือกแผนงานเพื่อดู...</string>
   <string name="p_about">About Astrid</string>
   <string name="p_about_text">Current version: %s\n\n Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-  <string name="p_help">ความช่วยเหลือ</string>
+  <string name="p_help">Support</string>
+  <string name="p_forums">Forums</string>
   <string name="task_killer_help">It looks like you are using an app that can kill processes (%s)! If you can, add Astrid to the exclusion list so it doesn\'t get killed. Otherwise, Astrid might not let you know when your tasks are due.\n</string>
   <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
   <string name="marketplace_title">งาน/รายการสิ่งที่จะทำ ของ Astrid</string>
   <string name="marketplace_description">Astrid is the much loved open-source todo list / task manager designed to help you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more.</string>
+  <string name="DB_corrupted_title">Corrupted Database</string>
+  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Manage All Tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Backup-&gt;Import Tasks) in Astrid.</string>
   <string name="EPr_defaults_header">ค่าตั้งต้นของแผนงานใหม่</string>
   <string name="EPr_default_urgency_title">ความเร่งด่วนตั้งต้น</string>
   <string name="EPr_default_urgency_desc">Currently: %s</string>
@@ -485,6 +563,8 @@
   <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
   <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
   <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+  <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
+  <string name="gtasks_dual_sync_warning">You are currently synchronizing with Astrid.com. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Google Tasks?</string>
   <string name="help_popover_add_task">Start by adding a task or two</string>
   <string name="help_popover_tap_task">Tap task to edit and share</string>
   <string name="help_popover_list_settings">Tap to edit or share this list</string>
@@ -567,6 +647,41 @@
   <string name="EPr_statistics_title">Anonymous Usage Stats</string>
   <string name="EPr_statistics_desc_disabled">ไม่มีข้อมูลการใช้งานที่จะรายงาน</string>
   <string name="EPr_statistics_desc_enabled">Help us make Astrid better by sending anonymous usage data</string>
+  <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
+  <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
+  <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
+  <string name="premium_attach_file">Attach a file</string>
+  <string name="premium_record_audio">Record a note</string>
+  <string name="premium_no_files">No files attached</string>
+  <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
+  <string name="audio_recording_title">Recording Audio</string>
+  <string name="audio_stop_recording">Stop Recording</string>
+  <string name="audio_speak_now">Speak Now!</string>
+  <string name="audio_encoding">Encoding...</string>
+  <string name="audio_err_encoding">Error encoding audio</string>
+  <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
+  <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+  <string name="search_market_audio_title">No audio player found</string>
+  <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+  <string name="search_market_pdf_title">No PDF reader found</string>
+  <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+  <string name="search_market_ms_title">No MS Office reader found</string>
+  <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+  <string name="file_type_unhandled_title">No application found</string>
+  <string name="file_prefix_image">Image</string>
+  <string name="file_prefix_voice">Voice</string>
+  <string name="file_browser_up">Up</string>
+  <string name="file_browser_title">Choose a file</string>
+  <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+  <string name="file_add_picture">Attach a picture</string>
+  <string name="file_add_sdcard">Attach a file from your SD card</string>
+  <string name="file_download_title">Download file?</string>
+  <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+  <string name="file_download_progress">Downloading...</string>
+  <string name="file_err_memory">Image is too large to fit in memory</string>
+  <string name="file_err_copy">Error copying file for attachment</string>
+  <string name="file_err_download">Error downloading file</string>
+  <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">พื้นที่ทำงาน</string>
   <string name="producteev_FEx_responsible_byme">มอบหมายให้กับ</string>
@@ -631,6 +746,33 @@
   <string name="rmd_NoA_done">เสร็จเรียบร้อยแล้ว!</string>
   <string name="rmd_NoA_snooze">หลับ..</string>
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+  <string name="rmd_NoA_dlg_title">Reminder:</string>
+  <string-array name="rmd_reengage_notif_titles">
+    <item>A note from Astrid</item>
+    <item>Memo for %s.</item>
+    <item>Your Astrid digest</item>
+    <item>Reminders from Astrid</item>
+  </string-array>
+  <string name="rmd_reengage_name_default">you</string>
+  <string name="rmd_reengage_snooze">Snooze all</string>
+  <string name="rmd_reengage_add_tasks">Add a task</string>
+  <string-array name="rmd_reengage_dialog_options">
+    <item>Time to shorten your to-do list!</item>
+    <item>Dear sir or madam, some tasks await your inspection!</item>
+    <item>Hi there, could you take a look at these?</item>
+    <item>I\'ve got some tasks with your name on them!</item>
+    <item>A fresh batch of tasks for you today!</item>
+    <item>You look fabulous! Ready to get started?</item>
+    <item>A lovely day for getting some work done, I think!</item>
+  </string-array>
+  <string-array name="rmd_reengage_dialog_empty_options">
+    <item>Don\'t you want to get organized?</item>
+    <item>I\'m Astrid! I\'m here to help you do more!</item>
+    <item>You look busy! Let me take some of those tasks off of your plate.</item>
+    <item>I can help you keep track of all of the details in your life.</item>
+    <item>You\'re serious about getting more done? So am I!</item>
+    <item>Pleasure to make your acquaintance!</item>
+  </string-array>
   <string name="rmd_EPr_alerts_header">ตั้งค่าการเตือนความจำ</string>
   <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
   <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
@@ -855,21 +997,44 @@
     <item>Minute(s)</item>
     <item>Year(s)</item>
   </string-array>
+  <string-array name="repeat_until_shortcuts">
+    <item>Forever</item>
+    <item>Specific Day</item>
+    <item>Today</item>
+    <item>Tomorrow</item>
+    <item>(day after)</item>
+    <item>Next Week</item>
+    <item>In Two Weeks</item>
+    <item>Next Month</item>
+  </string-array>
+  <string name="repeat_until_title">Repeat until...</string>
+  <string name="repeat_keep_going">Keep going</string>
   <string-array name="repeat_type">
     <item>from due date</item>
     <item>from completion date</item>
   </string-array>
   <string name="repeat_detail_byday">$I on $D</string>
   <string name="repeat_detail_duedate">Every %s</string>
+  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
   <string name="repeat_detail_completion">%s after completion</string>
+  <string name="repeat_forever">Repeat forever</string>
+  <string name="repeat_until">Repeat until %s</string>
   <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
   <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
   <string-array name="repeat_encouragement">
     <item>Good job!</item>
     <item>Wow… I\'m so proud of you!</item>
-    <item>I love it when you\'re productive!</item>
+    <item>I love when you\'re productive!</item>
     <item>Doesn\'t it feel good to check something off?</item>
   </string-array>
+  <string-array name="repeat_encouragement_last_time">
+    <item>Good job!</item>
+    <item>I\'m so proud of you!</item>
+    <item>I love when you\'re productive!</item>
+  </string-array>
   <string name="rmilk_EOE_button">Remember the Milk Settings</string>
   <string name="rmilk_TLA_repeat">RTM Repeating Task</string>
   <string name="rmilk_TLA_sync">Needs synchronization with RTM</string>
@@ -934,16 +1099,19 @@
   <string name="update_string_friends">%1$s is now friends with %2$s</string>
   <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
   <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
-
-
-
-
-
-
-
+  <string name="update_string_task_created">%1$s created this task</string>
+  <string name="update_string_task_created_global">%1$s created $link_task</string>
+  <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
+  <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
+  <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
+  <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
   <string name="update_string_default_comment">%1$s commented: %3$s</string>
-
+  <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
   <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
+  <string name="update_string_tag_created">%1$s created this list</string>
+  <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
   <string name="voice_create_prompt">Speak to create a task</string>
   <string name="voice_edit_title_prompt">Speak to set task title</string>
   <string name="voice_edit_note_prompt">Speak to set task notes</string>
@@ -983,6 +1151,9 @@
   <string name="PPW_widget_42_label">Astrid Premium 4x2</string>
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Premium 4x4</string>
+  <string name="PPW_widget_v11_label">Astrid Scrollable Premium</string>
+  <string name="PPW_widget_custom_label">Astrid Scrollable Premium for Custom Launchers</string>
+  <string name="PPW_widget_custom_launcherpro_label">Astrid Scrollable Premium 4x4 for Launcher Pro</string>
   <string name="PPW_configure_title">Configure Widget</string>
   <string name="PPW_color">Widget color</string>
   <string name="PPW_enable_calendar">Show calendar events</string>

astrid/res/values-zh-rTW/strings.xml

@@ -4,17 +4,18 @@
   <string name="actfm_person_hint">聯絡人或電郵地址</string>
   <string name="actfm_person_or_tag_hint">聯絡人或已分享清單</string>
   <string name="actfm_toast_success">已存到伺服器</string>
-
-  <string name="actfm_tag_operation_disabled">Sorry, this operation is not yet supported for shared tags.</string>
+  <string name="actfm_tag_operation_disabled">抱歉，共享標籤並不支持此項操作。</string>
   <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?</string>
-  <string name="actfm_picture_camera">拍個照吧</string>
+  <string name="actfm_picture_camera">拍下照片</string>
   <string name="actfm_picture_gallery">從圖庫選擇</string>
   <string name="actfm_picture_clear">清除圖片</string>
-  <string name="actfm_FLA_menu_refresh">重新整理表單</string>
+  <string name="actfm_FLA_menu_refresh">重新整理清單</string>
   <string name="actfm_view_task_title">檢視工作？</string>
-  <string name="actfm_view_task_text">工作已被送到 %s！您目前正在查看自己的任務，你要查看你其他指派的工作嗎？</string>
-  <string name="actfm_view_task_ok">查看指派的工作</string>
+  <string name="actfm_view_task_text">工作已被送到 %s！您目前正在查看自己的任務，你要查看你其餘被指派的工作嗎？</string>
+  <string name="actfm_view_task_ok">查看被指派的工作</string>
   <string name="actfm_view_task_cancel">留下來吧</string>
+  <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
+  <string name="actfm_my_shared_tasks_empty">未有共享工作</string>
   <string name="TVA_add_comment">添加評論</string>
   <string name="UAd_title_comment">%1$s 關於: %2$s</string>
   <string-array name="TVA_tabs">
@@ -30,6 +31,7 @@
   <string name="actfm_TVA_tag_owner_label">新增清單</string>
   <string name="actfm_TVA_tag_owner_none">無</string>
   <string name="actfm_TVA_members_label">Shared With</string>
+  <string name="actfm_TVA_members_hint">Share with anyone who has an email address</string>
   <string name="actfm_TVA_tag_picture">清單圖片</string>
   <string name="actfm_TVA_silence_label">靜音提醒</string>
   <string name="actfm_TVA_list_icon_label">清單圖示</string>
@@ -45,14 +47,18 @@
   <string name="actfm_EPA_assign_label_long">Who should do this?</string>
   <string name="actfm_EPA_assign_me">Me</string>
   <string name="actfm_EPA_unassigned">Unassigned</string>
+  <string name="actfm_EPA_choose_contact">Choose a contact</string>
   <string name="actfm_EPA_task_rabbit">Outsource it!</string>
   <string name="actfm_EPA_assign_custom">自訂…</string>
   <string name="actfm_EPA_share_with">加入合作者：</string>
+  <string name="actfm_EPA_assigned_toast">已傳送給 %1$s。 (你能在你和 %2$s 的清單中找到這工作)</string>
   <string name="actfm_EPA_collaborators_header">與朋友分享</string>
   <string name="actfm_EPA_list">清單：%s</string>
   <string name="actfm_EPA_assigned_hint">聯絡人名稱</string>
   <string name="actfm_EPA_message_text">邀請訊息：</string>
   <string name="actfm_EPA_message_body">請幫我完成這分工作！</string>
+  <string name="actfm_EPA_assign_header_members">List Members</string>
+  <string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
   <string name="actfm_EPA_tag_label">新建一個共享的標籤嗎？</string>
   <string name="actfm_EPA_tag_hint">例如：俱樂部</string>
   <string name="actfm_EPA_facebook">Facebook</string>
@@ -61,9 +67,9 @@
   <string name="actfm_EPA_saved_toast">已更新參與人設定</string>
   <string name="actfm_EPA_invalid_email">無效的電郵地址：%s</string>
   <string name="actfm_EPA_invalid_tag">無效的清單: %s</string>
-  <string name="actfm_EPA_login_to_share">你需要登錄Astrid.com以共享任務！請登錄或改為私密任務。</string>
+  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
   <string name="actfm_EPA_login_button">登入</string>
-  <string name="actfm_EPA_dont_share_button">改為私密</string>
+  <string name="actfm_EPA_dont_share_button">Don\'t share</string>
   <string name="actfm_ALA_title">嘿喲！歡迎來到 Astrid.com!</string>
   <string name="actfm_ALA_body">Astrid.com讓你在線上存取你的工作表，與朋友分享或委派工作。</string>
   <string name="actfm_ALA_fb_login">連接到Facebook賬戶</string>
@@ -82,12 +88,14 @@
   <string name="actfm_ALA_login_title">登入Asrid.com</string>
   <string name="actfm_GAA_title">選擇您要使用的Google帳戶：</string>
   <string name="actfm_OLA_prompt">Please log in:</string>
+  <string name="actfm_status_title_logged_in">Status - Logged in as %s</string>
   <string name="actfm_APr_header">Astrid.com</string>
   <string name="actfm_https_title">使用 HTTPS</string>
   <string name="actfm_https_enabled">使用 HTTPS (緩慢)</string>
   <string name="actfm_https_disabled">不使用 HTTPS (較快)</string>
   <string name="actfm_notification_title">Astrid.com 同步</string>
   <string name="actfm_notification_comments">收到新的備註 / 點擊觀看</string>
+  <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">警示</string>
   <string name="alarm_ACS_button">加入警示</string>
   <string-array name="reminders_alarm">
@@ -142,20 +150,23 @@
   <string name="DLG_cancel">Cancel</string>
   <string name="DLG_more">More</string>
   <string name="DLG_undo">Undo</string>
+  <string name="DLG_warning">Warning</string>
   <string name="WID_dateButtonUnset">點選</string>
   <string name="WID_dateButtonLabel">$D $T</string>
   <string name="WID_disableButton">停用</string>
   <string name="ENE_label">備註</string>
   <string name="ENE_label_comments">Comments</string>
   <string name="ENA_no_comments">No activity yet</string>
-  <string name="ENA_no_user">You</string>
+  <string name="ENA_no_user">Someone</string>
   <string name="ENA_refresh_comments">Refresh Comments</string>
   <string name="TLA_no_items">無工作!</string>
+  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
   <string name="TLA_menu_addons">附加程式</string>
   <string name="TLA_menu_sort">排序</string>
-  <string name="TLA_menu_sync">立刻同步</string>
+  <string name="TLA_menu_sync">Sync Now</string>
+  <string name="TLA_menu_search">Search</string>
   <string name="TLA_menu_lists">Lists</string>
-  <string name="TLA_menu_friends">Friends</string>
+  <string name="TLA_menu_friends">People</string>
   <string name="TLA_menu_suggestions">Suggestions</string>
   <string name="TLA_menu_tutorial">Tutorial</string>
   <string name="TLA_menu_settings">設定</string>
@@ -163,7 +174,7 @@
   <string name="TLA_search_label">尋找此列表</string>
   <string name="TLA_custom">自訂</string>
   <string name="TLA_quick_add_hint">Add a task</string>
-  <string name="TLA_quick_add_hint_assign">Tap to assign %s a task</string>
+  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
   <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
   <string name="TLA_notification_disabled">Astrid reminders are disabled! You will not receive any reminders</string>
   <string-array name="TLA_filters">
@@ -279,6 +290,7 @@
   <string name="TEA_control_importance">重要性</string>
   <string name="TEA_control_lists">清單</string>
   <string name="TEA_control_notes">備註</string>
+  <string name="TEA_control_files">Files</string>
   <string name="TEA_control_reminders">Reminders</string>
   <string name="TEA_control_timer">Timer Controls</string>
   <string name="TEA_control_share">Share With Friends</string>
@@ -290,11 +302,35 @@
   <string name="TEA_load_more">Load more...</string>
   <string name="TEA_when_dialog_title">When is this due?</string>
   <string name="TEA_date_and_time">Date/Time</string>
+  <string name="TEA_new_task">New Task</string>
   <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
   <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
+  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
   <string name="InA_title">歡迎使用Astrid!</string>
   <string name="InA_agree">我同意!!</string>
   <string name="InA_disagree">我不同意!!</string>
+  <string name="MCA_title">%1$s\ncalled at %2$s</string>
+  <string name="MCA_return_call">Call now</string>
+  <string name="MCA_add_task">Call later</string>
+  <string name="MCA_ignore">Ignore</string>
+  <string name="MCA_ignore_title">Ignore all missed calls?</string>
+  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
+  <string name="MCA_ignore_all">Ignore all calls</string>
+  <string name="MCA_ignore_this">Ignore this call only</string>
+  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
+  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
+  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+  <string name="MCA_task_title_no_name">Call %s back</string>
+  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+  <string-array name="MCA_dialog_speech_options">
+    <item>It must be nice to be so popular!</item>
+    <item>Yay! People like you!</item>
+    <item>Make their day, give \'em a call!</item>
+    <item>Wouldn\'t you be happy if people called you back?</item>
+    <item>You can do it!</item>
+    <item>You can always send a text...</item>
+  </string-array>
   <string name="HlA_get_support">取得協助</string>
   <string name="UpS_changelog_title">Astrid 有哪些最新消息?</string>
   <string name="UpS_updates_title">Astrid 最新消息</string>
@@ -324,7 +360,37 @@
   <string name="EPr_theme_title">Color Theme</string>
   <string name="EPr_theme_desc">目前設定: %s</string>
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
+  <string name="EPr_theme_widget_title">Widget Theme</string>
   <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
+  <string name="EPr_labs_header">Astrid Labs</string>
+  <string name="EPr_labs_desc">Try and configure experimental features</string>
+  <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
+  <string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
+  <string name="EPr_use_contact_picker">Use contact picker</string>
+  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
+  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
+  <string name="EPr_third_party_addons">Enable Third Party Add-ons</string>
+  <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
+  <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
+  <string name="EPr_ideas_tab_enabled">Task Ideas</string>
+  <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
+  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <string name="EPr_swipe_lists_restart_alert">You will need to restart Astrid for this change to take effect</string>
+  <string-array name="EPr_swipe_lists_performance_mode">
+    <item>No swipe</item>
+    <item>Conserve Memory</item>
+    <item>Normal Performance</item>
+    <item>High Performance</item>
+  </string-array>
+  <string-array name="EPr_swipe_lists_performance_desc">
+    <item>Swipe between lists is disabled</item>
+    <item>Slower performance</item>
+    <item>Default setting</item>
+    <item>Uses more system resources</item>
+  </string-array>
+  <string name="EPr_swipe_lists_display">%1$s - %2$s</string>
   <string-array name="EPr_themes">
     <item>Day - Blue</item>
     <item>Day - Red</item>
@@ -332,6 +398,15 @@
     <item>Transparent (White Text)</item>
     <item>Transparent (Black Text)</item>
   </string-array>
+  <string-array name="EPr_themes_widget">
+    <item>Same as app</item>
+    <item>Day - Blue</item>
+    <item>Day - Red</item>
+    <item>Night</item>
+    <item>Transparent (White Text)</item>
+    <item>Transparent (Black Text)</item>
+    <item>Old Style</item>
+  </string-array>
   <string name="EPr_manage_header">Manage Old Tasks</string>
   <string name="EPr_manage_delete_completed">Delete Completed Tasks</string>
   <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
@@ -361,11 +436,14 @@
   <string name="WCA_title">選擇工作顯示...</string>
   <string name="p_about">About Astrid</string>
   <string name="p_about_text">Current version: %s\n\n Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-  <string name="p_help">幫助</string>
+  <string name="p_help">Support</string>
+  <string name="p_forums">Forums</string>
   <string name="task_killer_help">似乎您有使用會刪除程序的應用程式 (%s)! 假如可以,將Astrid加入到例外清單避免被關閉.\n</string>
   <string name="task_killer_help_ok">我不會中止Astrid!</string>
   <string name="marketplace_title">Astricd工作/待辦清單</string>
   <string name="marketplace_description">Astrid工作管理是受到高度喜愛的開放源碼應用程式且可以非常簡單的完成工作。內含工作標籤、提醒、同步 、本地端插件、widget和其他功能。</string>
+  <string name="DB_corrupted_title">Corrupted Database</string>
+  <string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. If you see this error regularly, we suggest you clear all data (Settings-&gt;Manage All Tasks-&gt;Clear all data) and restore your tasks from a backup (Settings-&gt;Backup-&gt;Import Tasks) in Astrid.</string>
   <string name="EPr_defaults_header">工作預設值</string>
   <string name="EPr_default_urgency_title">預設嚴重性</string>
   <string name="EPr_default_urgency_desc">目前設定: %s</string>
@@ -485,6 +563,8 @@
   <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
   <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
   <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+  <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
+  <string name="gtasks_dual_sync_warning">You are currently synchronizing with Astrid.com. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Google Tasks?</string>
   <string name="help_popover_add_task">Start by adding a task or two</string>
   <string name="help_popover_tap_task">Tap task to edit and share</string>
   <string name="help_popover_list_settings">Tap to edit or share this list</string>
@@ -567,6 +647,41 @@
   <string name="EPr_statistics_title">匿名使用統計</string>
   <string name="EPr_statistics_desc_disabled">沒有使用資料會被回傳</string>
   <string name="EPr_statistics_desc_enabled">傳送匿名使用資料以協助我們改進Astrid</string>
+  <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
+  <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
+  <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
+  <string name="premium_attach_file">Attach a file</string>
+  <string name="premium_record_audio">Record a note</string>
+  <string name="premium_no_files">No files attached</string>
+  <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
+  <string name="audio_recording_title">Recording Audio</string>
+  <string name="audio_stop_recording">Stop Recording</string>
+  <string name="audio_speak_now">Speak Now!</string>
+  <string name="audio_encoding">Encoding...</string>
+  <string name="audio_err_encoding">Error encoding audio</string>
+  <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
+  <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+  <string name="search_market_audio_title">No audio player found</string>
+  <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+  <string name="search_market_pdf_title">No PDF reader found</string>
+  <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+  <string name="search_market_ms_title">No MS Office reader found</string>
+  <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+  <string name="file_type_unhandled_title">No application found</string>
+  <string name="file_prefix_image">Image</string>
+  <string name="file_prefix_voice">Voice</string>
+  <string name="file_browser_up">Up</string>
+  <string name="file_browser_title">Choose a file</string>
+  <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+  <string name="file_add_picture">Attach a picture</string>
+  <string name="file_add_sdcard">Attach a file from your SD card</string>
+  <string name="file_download_title">Download file?</string>
+  <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+  <string name="file_download_progress">Downloading...</string>
+  <string name="file_err_memory">Image is too large to fit in memory</string>
+  <string name="file_err_copy">Error copying file for attachment</string>
+  <string name="file_err_download">Error downloading file</string>
+  <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
   <string name="producteev_FEx_header">Producteev</string>
   <string name="producteev_FEx_dashboard">工作區</string>
   <string name="producteev_FEx_responsible_byme">指派給</string>
@@ -631,6 +746,33 @@
   <string name="rmd_NoA_done">已完成!</string>
   <string name="rmd_NoA_snooze">晚點提醒...</string>
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+  <string name="rmd_NoA_dlg_title">Reminder:</string>
+  <string-array name="rmd_reengage_notif_titles">
+    <item>A note from Astrid</item>
+    <item>Memo for %s.</item>
+    <item>Your Astrid digest</item>
+    <item>Reminders from Astrid</item>
+  </string-array>
+  <string name="rmd_reengage_name_default">you</string>
+  <string name="rmd_reengage_snooze">Snooze all</string>
+  <string name="rmd_reengage_add_tasks">Add a task</string>
+  <string-array name="rmd_reengage_dialog_options">
+    <item>Time to shorten your to-do list!</item>
+    <item>Dear sir or madam, some tasks await your inspection!</item>
+    <item>Hi there, could you take a look at these?</item>
+    <item>I\'ve got some tasks with your name on them!</item>
+    <item>A fresh batch of tasks for you today!</item>
+    <item>You look fabulous! Ready to get started?</item>
+    <item>A lovely day for getting some work done, I think!</item>
+  </string-array>
+  <string-array name="rmd_reengage_dialog_empty_options">
+    <item>Don\'t you want to get organized?</item>
+    <item>I\'m Astrid! I\'m here to help you do more!</item>
+    <item>You look busy! Let me take some of those tasks off of your plate.</item>
+    <item>I can help you keep track of all of the details in your life.</item>
+    <item>You\'re serious about getting more done? So am I!</item>
+    <item>Pleasure to make your acquaintance!</item>
+  </string-array>
   <string name="rmd_EPr_alerts_header">提醒設定</string>
   <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
   <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
@@ -855,21 +997,44 @@
     <item>Minute(s)</item>
     <item>Year(s)</item>
   </string-array>
+  <string-array name="repeat_until_shortcuts">
+    <item>Forever</item>
+    <item>Specific Day</item>
+    <item>Today</item>
+    <item>Tomorrow</item>
+    <item>(day after)</item>
+    <item>Next Week</item>
+    <item>In Two Weeks</item>
+    <item>Next Month</item>
+  </string-array>
+  <string name="repeat_until_title">Repeat until...</string>
+  <string name="repeat_keep_going">Keep going</string>
   <string-array name="repeat_type">
     <item>由到期日</item>
     <item>由完成日</item>
   </string-array>
   <string name="repeat_detail_byday">$I 的 $D</string>
   <string name="repeat_detail_duedate">每隔 %s</string>
+  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
   <string name="repeat_detail_completion">%s 完成後</string>
+  <string name="repeat_forever">Repeat forever</string>
+  <string name="repeat_until">Repeat until %s</string>
   <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
   <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
+  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
   <string-array name="repeat_encouragement">
     <item>Good job!</item>
     <item>Wow… I\'m so proud of you!</item>
-    <item>I love it when you\'re productive!</item>
+    <item>I love when you\'re productive!</item>
     <item>Doesn\'t it feel good to check something off?</item>
   </string-array>
+  <string-array name="repeat_encouragement_last_time">
+    <item>Good job!</item>
+    <item>I\'m so proud of you!</item>
+    <item>I love when you\'re productive!</item>
+  </string-array>
   <string name="rmilk_EOE_button">Remember the Milk 設定</string>
   <string name="rmilk_TLA_repeat">RTM重複工作</string>
   <string name="rmilk_TLA_sync">需要與RTM同步</string>
@@ -934,16 +1099,19 @@
   <string name="update_string_friends">%1$s is now friends with %2$s</string>
   <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
   <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
-
-
-
-
-
-
-
+  <string name="update_string_task_created">%1$s created this task</string>
+  <string name="update_string_task_created_global">%1$s created $link_task</string>
+  <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
+  <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
+  <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
+  <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+  <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
   <string name="update_string_default_comment">%1$s commented: %3$s</string>
-
+  <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
   <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
+  <string name="update_string_tag_created">%1$s created this list</string>
+  <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
   <string name="voice_create_prompt">請說話以建立工作</string>
   <string name="voice_edit_title_prompt">請說話以設定工作主旨</string>
   <string name="voice_edit_note_prompt">請說話以設定工作備註</string>
@@ -983,6 +1151,9 @@
   <string name="PPW_widget_42_label">Astrid Premium 4x2</string>
   <string name="PPW_widget_43_label">Astrid Premium 4x3</string>
   <string name="PPW_widget_44_label">Astrid Premium 4x4</string>
+  <string name="PPW_widget_v11_label">Astrid Scrollable Premium</string>
+  <string name="PPW_widget_custom_label">Astrid Scrollable Premium for Custom Launchers</string>
+  <string name="PPW_widget_custom_launcherpro_label">Astrid Scrollable Premium 4x4 for Launcher Pro</string>
   <string name="PPW_configure_title">Configure Widget</string>
   <string name="PPW_color">Widget color</string>
   <string name="PPW_enable_calendar">Show calendar events</string>