NON-WORKING Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle

1 files changed, 241 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index 86fd2b4ac..b6ab2c8a4 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -9,13 +9,10 @@
   <string name="title_encrypt_text">加密文字</string>
   <string name="title_encrypt_files">加密檔案</string>
   <string name="title_decrypt">解密</string>
-  <string name="title_unlock">口令</string>
   <string name="title_add_subkey">新增子金鑰</string>
   <string name="title_edit_key">編輯金鑰</string>
-  <string name="title_preferences">偏好設定</string>
-  <string name="title_cloud_search_preferences">雲端檢索設定</string>
+  <string name="title_cloud_search_preferences">雲端查詢設定</string>
   <string name="title_api_registered_apps">應用程式</string>
-  <string name="title_key_server_preference">金鑰伺服器設定</string>
   <string name="title_change_passphrase">變更口令</string>
   <string name="title_share_fingerprint_with">分享指紋…</string>
   <string name="title_share_key">分享金鑰…</string>
@@ -24,6 +21,7 @@
   <string name="title_encrypt_to_file">加密到檔案</string>
   <string name="title_decrypt_to_file">解密到檔案</string>
   <string name="title_import_keys">匯入金鑰</string>
+  <string name="title_add_keys">新增金鑰</string>
   <string name="title_export_key">匯出金鑰</string>
   <string name="title_export_keys">匯出所有金鑰</string>
   <string name="title_key_not_found">找不到金鑰</string>
@@ -33,13 +31,16 @@
   <string name="title_help">說明</string>
   <string name="title_log_display">紀錄</string>
   <string name="title_create_key">建立金鑰</string>
+  <string name="title_exchange_keys">交換金鑰</string>
+  <string name="title_advanced_key_info">進階資訊</string>
   <!--section-->
   <string name="section_user_ids">身份</string>
   <string name="section_keys">子金鑰</string>
-  <string name="section_cloud_search">雲端檢索</string>
+  <string name="section_cloud_search">雲端查詢</string>
   <string name="section_general">一般</string>
   <string name="section_defaults">預設</string>
   <string name="section_advanced">進階</string>
+  <string name="section_passphrase_cache">口令快取</string>
   <string name="section_certification_key">用來簽署的私鑰</string>
   <string name="section_key_server">金鑰伺服器</string>
   <string name="section_fingerprint">指紋</string>
@@ -65,7 +66,6 @@
   <string name="btn_create_key">建立金鑰</string>
   <string name="btn_add_files">加入檔案</string>
   <string name="btn_add_share_decrypted_text">解密並分享訊息</string>
-  <string name="btn_decrypt_clipboard">解密剪貼簿的內容</string>
   <string name="btn_decrypt_and_verify">並且驗證簽名</string>
   <string name="btn_decrypt_files">解密檔案</string>
   <!--menu-->
@@ -74,6 +74,7 @@
   <string name="menu_export_key">匯出到檔案</string>
   <string name="menu_delete_key">刪除金鑰</string>
   <string name="menu_create_key">建立金鑰</string>
+  <string name="menu_import_existing_key">從檔案匯入</string>
   <string name="menu_search">搜尋</string>
   <string name="menu_beam_preferences">Beam 設定</string>
   <string name="menu_key_edit_cancel">取消</string>
@@ -91,8 +92,6 @@
   <string name="label_algorithm">演算法</string>
   <string name="label_write_version_header">讓別人知道我在使用OpenKeychain</string>
   <string name="label_write_version_header_summary">在簽名、密文與匯出的金鑰裡寫入\'OpenKeychain v2.7\'</string>
-  <string name="label_use_default_yubikey_pin">使用預設的Yubikey PIN</string>
-  <string name="label_label_use_default_yubikey_pin_summary">使用預設的PIN (123456)來通過NFC存取Yubikeys</string>
   <string name="label_asymmetric_from">簽名自:</string>
   <string name="label_to">加密給:</string>
   <string name="label_delete_after_encryption">加密後刪除檔案</string>
@@ -100,6 +99,7 @@
   <string name="label_encryption_algorithm">加密演算法</string>
   <string name="label_hash_algorithm">雜湊演算法</string>
   <string name="label_symmetric">使用口令加密</string>
+  <string name="label_passphrase_cache_ttl">快取時間</string>
   <string name="label_message_compression">訊息壓縮</string>
   <string name="label_file_compression">檔案壓縮</string>
   <string name="label_keyservers">金鑰伺服器</string>
@@ -113,6 +113,7 @@
   <string name="label_name">名字</string>
   <string name="label_comment">註記</string>
   <string name="label_email">Email</string>
+  <string name="label_send_key">與雲端同步</string>
   <string name="label_fingerprint">指紋</string>
   <string name="expiry_date_dialog_title">設定效期</string>
   <string name="can_encrypt">可以加密</string>
@@ -151,28 +152,61 @@
   <string name="flag_authenticate">驗證</string>
   <!--sentences-->
   <string name="wrong_passphrase">口令錯誤。</string>
+  <string name="no_filemanager_installed">找不到相容的檔案管理員。</string>
+  <string name="passphrases_do_not_match">口令不相符。</string>
+  <string name="passphrase_must_not_be_empty">請輸入口令。</string>
   <string name="passphrase_for_symmetric_encryption">對稱加密。</string>
+  <string name="file_delete_confirmation">你確定要刪除\n%s？</string>
   <string name="file_delete_successful">刪除成功。</string>
+  <string name="no_file_selected">請先選擇檔案。</string>
+  <string name="encrypt_sign_successful">成功簽名並/或加密。</string>
+  <string name="encrypt_sign_clipboard_successful">成功簽名並/或加密到剪貼簿。</string>
+  <string name="enter_passphrase_twice">重複輸入口令</string>
+  <string name="select_encryption_key">選擇至少一把加密金鑰。</string>
+  <string name="select_encryption_or_signature_key">選擇至少一把加密或簽名金鑰。</string>
+  <string name="specify_file_to_encrypt_to">請選擇要將檔案加密到哪。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="specify_file_to_decrypt_to">請選擇要將檔案解密到哪。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="specify_file_to_export_to">請選擇要將檔案匯出到哪。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="key_deletion_confirmation_multi">你確定要刪除選擇的公鑰？\n此動作無法復原！</string>
+  <string name="secret_key_deletion_confirmation">你確定要刪除密鑰\'%s\'？\n此動作無法復原！</string>
+  <string name="public_key_deletetion_confirmation">你確定要刪除公鑰\'%s\'？\n此動作無法復原！</string>
   <string name="also_export_secret_keys">一併匯出私鑰</string>
   <string name="key_exported">成功匯出 1 把金鑰。</string>
   <string name="keys_exported">成功匯出 %d 把金鑰。</string>
   <string name="nfc_successful">NFC Beam發送金鑰成功!</string>
   <string name="key_copied_to_clipboard">金鑰已複製到剪貼簿!</string>
   <string name="fingerprint_copied_to_clipboard">指紋已複製到剪貼簿!</string>
+  <string name="select_key_to_certify">請選擇要用來認證的金鑰！</string>
   <string name="key_too_big_for_sharing">金鑰太大無法使用此方式分享!</string>
   <string name="text_copied_to_clipboard">文字已複製到剪貼簿!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">刪除%s失敗</string>
   <string name="error_file_not_found">找不到檔案</string>
   <string name="error_no_secret_key_found">沒有適合的私鑰</string>
   <string name="error_external_storage_not_ready">外部儲存空間尚未就緒</string>
   <string name="error_key_size_minimum512bit">金鑰長度必須大於512位元</string>
+  <string name="error_user_id_no_email">沒有找到電子郵件</string>
+  <string name="error_key_needs_a_user_id">需要至少一個身分識別</string>
+  <string name="error_no_signature_passphrase">沒有提供口令</string>
+  <string name="error_no_signature_key">找不到簽名金鑰</string>
+  <string name="error_integrity_check_failed">完整性檢查失敗！資料已被修改！</string>
   <string name="error_wrong_passphrase">口令錯誤</string>
+  <string name="error_could_not_extract_private_key">無法抽取私鑰</string>
   <!--errors without preceeding Error:-->
-  <string name="error_nfc_needed">您的裝置不支援NFC!</string>
+  <string name="error_jelly_bean_needed">需要Android 4.1以上才能使用NFC Beam功能！</string>
+  <string name="error_nothing_import">找不到金鑰！</string>
   <!--results shown after decryption/verification-->
+  <string name="decrypt_result_no_signature">尚未簽名</string>
   <string name="decrypt_result_invalid_signature">無效的簽章!</string>
+  <string name="decrypt_result_signature_expired_key">金鑰已過期！</string>
+  <string name="decrypt_result_signature_revoked_key">金鑰已被撤銷！</string>
+  <string name="decrypt_result_signature_missing_key">未知的公鑰</string>
+  <string name="decrypt_result_encrypted">已加密</string>
+  <string name="decrypt_result_not_encrypted">未加密</string>
+  <string name="decrypt_invalid_text">簽名無效或是金鑰已經過期/被撤銷，無法確認訊息內容的作者。是否繼續顯示？</string>
+  <string name="decrypt_invalid_button">我明白這樣做的風險，顯示它！</string>
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完成。</string>
@@ -182,43 +216,240 @@
   <string name="progress_importing">匯入中…</string>
   <string name="progress_exporting">匯出中…</string>
   <string name="progress_uploading">正在上傳…</string>
+  <string name="progress_generating_rsa">正在產生新的RSA金鑰…</string>
+  <string name="progress_generating_dsa">正在產生新的DSA金鑰…</string>
+  <string name="progress_generating_elgamal">正在產生新的ElGamal金鑰…</string>
+  <string name="progress_generating_ecdsa">正在產生新的ECDSA金鑰…</string>
+  <string name="progress_generating_ecdh">正在產生新的ECDH金鑰…</string>
+  <string name="progress_modify">正在變更鑰匙圈…</string>
+  <string name="progress_modify_unlock">正在解鎖鑰匙圈…</string>
+  <string name="progress_modify_adduid">正在新增使用者身份…</string>
+  <string name="progress_modify_revokeuid">正在撤銷使用者身份…</string>
+  <string name="progress_modify_primaryuid">正在變更主要使用者身份…</string>
+  <string name="progress_modify_subkeychange">正在變更子金鑰…</string>
+  <string name="progress_modify_subkeyrevoke">正在撤銷子金鑰…</string>
+  <string name="progress_modify_subkeyadd">正在新增子金鑰…</string>
+  <string name="progress_modify_passphrase">正在變更口令…</string>
+  <plurals name="progress_exporting_key">
+    <item quantity="other">正在匯出金鑰…</item>
+  </plurals>
+  <string name="progress_extracting_signature_key">正在抽取簽名金鑰…</string>
+  <string name="progress_extracting_key">正在抽取金鑰…</string>
+  <string name="progress_preparing_streams">正在準備串流…</string>
+  <string name="progress_encrypting">正在加密資料…</string>
+  <string name="progress_decrypting">正在解密資料…</string>
+  <string name="progress_preparing_signature">正在準備簽名…</string>
+  <string name="progress_generating_signature">正在產生簽名…</string>
+  <string name="progress_processing_signature">正在處理簽名…</string>
+  <string name="progress_verifying_signature">正在驗證簽名…</string>
+  <string name="progress_signing">簽名中…</string>
+  <string name="progress_certifying">正在認證…</string>
+  <string name="progress_reading_data">正在讀取資料…</string>
+  <string name="progress_finding_key">正在尋找金鑰…</string>
+  <string name="progress_decompressing_data">正在解壓縮…</string>
+  <string name="progress_verifying_integrity">正在驗證完整性…</string>
+  <string name="progress_deleting">正在刪除金鑰…</string>
   <!--action strings-->
   <!--key bit length selections-->
+  <string name="key_size_512">512</string>
+  <string name="key_size_768">768</string>
+  <string name="key_size_1024">1024</string>
+  <string name="key_size_1536">1536</string>
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_3072">3072</string>
+  <string name="key_size_4096">4096</string>
+  <string name="key_size_8192">8192</string>
+  <string name="key_size_custom">自訂金鑰長度</string>
   <!--elliptic curve names-->
+  <string name="key_curve_nist_p256">NIST P-256</string>
+  <string name="key_curve_nist_p384">NIST P-384</string>
+  <string name="key_curve_nist_p521">NIST P-521</string>
   <!--not in for now, see SaveKeyringParcel
     <string name="key_curve_bp_p256">"Brainpool P-256"</string>
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
     <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
   <!--compression-->
+  <string name="compression_fast">快</string>
+  <string name="compression_very_slow">非常慢</string>
   <!--Help-->
+  <string name="help_tab_start">快速上手</string>
+  <string name="help_tab_faq">常見問題</string>
+  <string name="help_tab_wot">信任網</string>
+  <string name="help_tab_nfc_beam">NFC Beam</string>
+  <string name="help_tab_changelog">更新紀錄</string>
+  <string name="help_tab_about">關於</string>
+  <string name="help_about_version">版本：</string>
   <!--Import-->
+  <string name="import_tab_keyserver">金鑰伺服器</string>
+  <string name="import_tab_cloud">雲端查詢</string>
+  <string name="import_tab_direct">檔案/剪貼簿</string>
+  <string name="import_tab_qr_code">二維條碼/NFC</string>
+  <string name="import_import">匯入選擇的金鑰</string>
+  <string name="import_qr_code_button">掃描二維條碼</string>
   <!--Generic result toast-->
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="other">成功匯入%1$d金鑰</item>
+  </plurals>
+  <plurals name="import_keys_added_and_updated_2">
+    <item quantity="other">並更新%1$d金鑰%2$s。</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="other">成功匯入%1$d金鑰%2$s。</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="other">成功更新%1$d金鑰%2$s。</item>
+  </plurals>
+  <string name="import_error_nothing">沒有東西可以匯入。</string>
+  <string name="import_error_nothing_cancelled">匯入已取消。</string>
   <!--Delete result toast-->
+  <string name="delete_nothing">沒有東西可以刪除。</string>
+  <string name="delete_cancelled">刪除已取消。</string>
   <!--Certify result toast-->
   <!--Intent labels-->
+  <string name="intent_decrypt_file">使用OpenKeychain解密檔案</string>
+  <string name="intent_import_key">匯入金鑰至OpenKeychain</string>
+  <string name="intent_send_encrypt">使用OpenKeychain加密</string>
+  <string name="intent_send_decrypt">使用OpenKeychain解密</string>
   <!--Remote API-->
+  <string name="api_settings_show_info">顯示進階資訊</string>
+  <string name="api_settings_hide_info">隱藏進階資訊</string>
+  <string name="api_settings_show_advanced">顯示進階設定</string>
+  <string name="api_settings_hide_advanced">隱藏進階設定</string>
+  <string name="api_settings_no_key">沒有選擇金鑰</string>
+  <string name="api_settings_select_key">選擇金鑰</string>
+  <string name="api_settings_create_key">為此帳戶建立金鑰</string>
+  <string name="api_settings_save">儲存</string>
+  <string name="api_settings_save_msg">帳戶已儲存</string>
+  <string name="api_settings_cancel">取消</string>
+  <string name="api_settings_revoke">撤銷存取</string>
+  <string name="api_settings_start">開啟應用程式</string>
+  <string name="api_settings_delete_account">移除帳戶</string>
+  <string name="api_settings_settings">設定</string>
+  <string name="api_settings_key">帳戶金鑰：</string>
+  <string name="api_settings_accounts_empty">沒有帳戶被指派給這個應用程式。</string>
+  <string name="api_create_account_text">這個帳戶尚未設置金鑰，請指派一個現有金鑰或是建立新的。\n應用程式只能使用這邊所選的金鑰進行解密/簽名。</string>
+  <string name="api_update_account_text">此帳戶指定的金鑰已被刪除，請重新選擇一個。\n應用程式只能使用這邊所選的金鑰進行解密/簽名。</string>
+  <string name="api_register_text">應用程式試圖以您的名義加/解密訊息並簽名，是否允許存取？\n\n警告：如果你不知道為什麼出現這個畫面，請拒絕存取！你可以稍後在〝應用程式〞畫面撤銷存取。</string>
+  <string name="api_register_allow">允許存取</string>
+  <string name="api_register_disallow">拒絕存取</string>
+  <string name="api_error_wrong_signature">簽名檢查失敗！你是否從其他來源安裝此應用？如果你確定這不是個攻擊，撤銷並重新註冊應用程式到OpenKeychain。</string>
   <!--Share-->
+  <string name="share_qr_code_dialog_title">以二維條碼分享</string>
+  <string name="share_nfc_dialog">以NFC分享</string>
   <!--Key list-->
+  <string name="key_list_empty_text1">找不到金鑰！</string>
   <!--Key view-->
+  <string name="key_view_action_edit">編輯金鑰</string>
+  <string name="key_view_action_encrypt">加密文字</string>
+  <string name="key_view_action_encrypt_files">檔案</string>
+  <string name="key_view_action_upload">上傳到金鑰伺服器</string>
+  <string name="key_view_tab_main">摘要</string>
+  <string name="key_view_tab_share">分享</string>
+  <string name="key_view_tab_keys">子金鑰</string>
+  <string name="user_id_info_revoked_title">已撤銷</string>
+  <string name="user_id_info_revoked_text">這個身分識別被金鑰持有人撤銷，已不再有效。</string>
+  <string name="user_id_info_certified_title">已認證</string>
+  <string name="user_id_info_certified_text">這個身分識別已經過你的認證。</string>
+  <string name="user_id_info_uncertified_title">未認證</string>
+  <string name="user_id_info_uncertified_text">這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。</string>
+  <string name="user_id_info_invalid_title">無效</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">變更口令</string>
+  <string name="edit_key_action_add_identity">新增身分識別</string>
+  <string name="edit_key_action_add_subkey">新增子金鑰</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>變更為主身分識別</item>
+    <item>撤銷身分識別</item>
+  </string-array>
+  <string name="edit_key_edit_user_id_revoked">這個身分識別已被撤銷。此動作無法還原。</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>變更到期日</item>
+    <item>撤銷子金鑰</item>
+    <item>Strip Subkey</item>
+  </string-array>
+  <string name="edit_key_error_add_identity">新增至少一組身分識別！</string>
+  <string name="edit_key_error_add_subkey">新增至少一組子金鑰！</string>
   <!--Create key-->
+  <string name="create_key_upload">上傳到金鑰伺服器</string>
+  <string name="create_key_empty">必填欄位</string>
+  <string name="create_key_passphrases_not_equal">口令不相符</string>
+  <string name="create_key_final_robot_text">建立金鑰可能需要一點時間，來杯咖啡吧…</string>
+  <string name="create_key_text">輸入你的全名、電子郵件，並選擇一組口令。</string>
   <!--View key-->
   <!--Navigation Drawer-->
+  <string name="nav_keys">金鑰</string>
+  <string name="nav_apps">應用程式</string>
+  <string name="my_keys">我的金鑰</string>
   <!--hints-->
   <!--certs-->
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
   <!--Import Secret log entries-->
+  <string name="msg_is_db_exception">資料庫錯誤！</string>
+  <string name="msg_is_merge_public">將匯入的資料合併至公鑰鑰匙圈</string>
+  <string name="msg_is_merge_secret">將匯入的資料合併至密鑰鑰匙圈</string>
+  <string name="msg_is_pubring_generate">從密鑰鑰匙圈產生公鑰鑰匙圈</string>
+  <string name="msg_is_success_identical">鑰匙圈沒有新資料，不必進行操作</string>
+  <string name="msg_is_success">成功匯入密鑰鑰匙圈</string>
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_not_found">找不到金鑰！</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_error_invalid_siglist">找不到有效的簽名資訊！</string>
+  <string name="msg_dc">開始解密…</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_crt_warn_not_found">找不到金鑰！</string>
+  <string name="msg_crt_warn_cert_failed">產生認證失敗！</string>
+  <string name="msg_crt_warn_save_failed">儲存失敗！</string>
+  <string name="msg_crt_upload_success">成功上傳金鑰到伺服器</string>
+  <string name="msg_import_fetch_error">無法取得金鑰！(網路問題？)</string>
+  <string name="msg_import_fetch_keybase">從keybase.io取回：%s</string>
+  <string name="msg_import_fetch_keyserver_error">無法從keybase取得金鑰！</string>
+  <string name="msg_import_fetch_keyserver">從金鑰伺服器取回：%s</string>
+  <string name="msg_import_fetch_keyserver_ok">成功取得金鑰</string>
+  <string name="msg_import_keyserver">使用金鑰伺服器%s</string>
+  <string name="msg_import_fingerprint_ok">指紋檢查正確</string>
+  <string name="msg_import_merge">正在合併取得的資料</string>
+  <string name="msg_export_error_db">資料庫錯誤！</string>
+  <string name="msg_export_error_io">輸入/輸出錯誤！</string>
+  <string name="msg_export_success">匯出處理成功</string>
+  <string name="msg_del_error_empty">沒有東西可以刪除！</string>
+  <string name="msg_del_error_multi_secret">密鑰只能分別刪除！</string>
+  <string name="msg_acc_saved">帳戶已儲存</string>
+  <string name="msg_download_success">下載成功！</string>
+  <string name="msg_download_no_valid_keys">在檔案/剪貼簿中找不到有效的金鑰！</string>
+  <string name="msg_download_query_failed">查詢金鑰的時候發生錯誤。</string>
   <!--PassphraseCache-->
-  <!--unsorted-->
+  <string name="passp_cache_notif_n_keys">OpenKeychain快取了%d個口令</string>
+  <string name="passp_cache_notif_keys">已快取的口令：</string>
+  <string name="passp_cache_notif_clear">清除快取</string>
+  <string name="passp_cache_notif_pwd">口令</string>
   <!--First Time-->
+  <!--unsorted-->
+  <string name="empty_certs">這把金鑰未經過認證</string>
+  <string name="certs_text">只有有效的自簽署認證以及經由你的金鑰簽署的有效認證會被顯示在這。</string>
+  <string name="label_revocation">撤銷原因</string>
+  <string name="error_key_not_found">找不到金鑰！</string>
+  <string name="key_no_passphrase">沒有口令</string>
+  <string name="key_unavailable">無法使用</string>
+  <string name="title_view_cert">查看認證內容</string>
+  <string name="unknown_algorithm">未知</string>
+  <string name="error_no_encrypt_subkey">沒有可供加密的子金鑰！</string>
+  <string name="info_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string>
+  <string name="exchange_description">要發起金鑰交換，先在右邊選擇與會人數，然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題，以確保會議成員與交換的指紋是正確的。</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>