diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 17:07:59 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 17:07:59 +0200 |
commit | f9dea313004b51c5220a2d0b5e9407aab0604df5 (patch) | |
tree | f4977e51cb4bed5eae3b646c071d53a956ea1be6 /OpenKeychain/src/main/res | |
parent | 6a5bd6509b088cf8cee3e9ddf9a5eac5a33de98a (diff) | |
download | open-keychain-f9dea313004b51c5220a2d0b5e9407aab0604df5.tar.gz open-keychain-f9dea313004b51c5220a2d0b5e9407aab0604df5.tar.bz2 open-keychain-f9dea313004b51c5220a2d0b5e9407aab0604df5.zip |
implement deletion of files
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-es/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-eu/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-nl/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-pl/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ru/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sl/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sr/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sv/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-zh-rTW/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 14 |
14 files changed, 22 insertions, 18 deletions
diff --git a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml index e18bdf8e4..b825fa498 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml @@ -3,7 +3,7 @@ <item android:id="@+id/view_log" - android:title="@string/view_log" + android:title="@string/btn_view_log" android:icon="@drawable/ic_view_list_grey_24dp" /> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index d0610e06b..d2f643e9f 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -363,7 +363,7 @@ <string name="import_qr_code_button">QR-Code scannen</string> <string name="import_qr_code_text">Halte deine Kamera über den QR-Code!</string> <!--Generic result toast--> - <string name="view_log">Details</string> + <string name="snackbar_details">Details</string> <string name="with_warnings">, mit Warnungen</string> <string name="with_cancelled">. bis abgebrochen wurde</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 8c469bf71..8b20aeb04 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -363,7 +363,7 @@ <string name="import_qr_code_button">Escanear código QR</string> <string name="import_qr_code_text">¡Sitúe su cámara sobre el código QR!</string> <!--Generic result toast--> - <string name="view_log">Detalles</string> + <string name="snackbar_details">Detalles</string> <string name="with_warnings">, con advertencias</string> <string name="with_cancelled">, hasta que sea cancelado</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index b51b85b16..a0b206f93 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -304,7 +304,7 @@ <string name="import_qr_code_button">Eskaneatu QR Kodea</string> <string name="import_qr_code_text">Jarri zure kamera QR Kodearen gainean!</string> <!--Generic result toast--> - <string name="view_log">Xehetasunak</string> + <string name="snackbar_details">Xehetasunak</string> <string name="with_warnings">, kontuz oharrekin</string> <!--Import result toast--> <string name="import_error_nothing">Ez dago ezer inportatzeko.</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index fd8a51220..7f408f603 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -363,7 +363,7 @@ <string name="import_qr_code_button">Balayer le code QR</string> <string name="import_qr_code_text">Placez votre appareil photo au-dessus du code QR !</string> <!--Generic result toast--> - <string name="view_log">Détails</string> + <string name="snackbar_details">Détails</string> <string name="with_warnings">, avec des avertissements</string> <string name="with_cancelled">, jusqu\'à l\'annulation</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 87eb5e9df..790913684 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -364,7 +364,7 @@ <string name="import_qr_code_button">QCコードのスキャン</string> <string name="import_qr_code_text">カメラをQRコードにかざしてください!</string> <!--Generic result toast--> - <string name="view_log">概要</string> + <string name="snackbar_details">概要</string> <string name="with_warnings">、とワーニング</string> <string name="with_cancelled">、キャンセルされるまで</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index dc612e0f6..e69208dbb 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -363,7 +363,7 @@ <string name="import_qr_code_button">QR code scannen</string> <string name="import_qr_code_text">Plaats je camera voor de QR-code!</string> <!--Generic result toast--> - <string name="view_log">Details</string> + <string name="snackbar_details">Details</string> <string name="with_warnings">, met waarschuwingen</string> <string name="with_cancelled">, tot annulatie</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index 10df2a5cb..caa9092e5 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -308,7 +308,7 @@ <string name="import_qr_code_button">Skanuj kod QR</string> <string name="import_qr_code_text">Umieść kod QR przed kamerą!</string> <!--Generic result toast--> - <string name="view_log">Szczegóły</string> + <string name="snackbar_details">Szczegóły</string> <string name="with_warnings">, z ostrzeżeniami</string> <string name="with_cancelled">, aż anulowano</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index f9377ef0e..e5e164c49 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -332,7 +332,7 @@ <string name="import_qr_code_button">Сканировать QR код...</string> <string name="import_qr_code_text">Расположите вашу камеру над QR кодом!</string> <!--Generic result toast--> - <string name="view_log">Сведения</string> + <string name="snackbar_details">Сведения</string> <string name="with_warnings">, с предупреждениями</string> <string name="with_cancelled">, до отмены</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index e6b28b6e5..21c528820 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -371,7 +371,7 @@ <string name="import_qr_code_button">Skeniraj kodo QR</string> <string name="import_qr_code_text">Zajamite kodo QR s kamero!</string> <!--Generic result toast--> - <string name="view_log">Podrobnosti</string> + <string name="snackbar_details">Podrobnosti</string> <string name="with_warnings">, z opozorili</string> <string name="with_cancelled">, do preklica</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 8a8ad3449..ebacebb5f 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -370,7 +370,7 @@ <string name="import_qr_code_button">Очитај бар-код</string> <string name="import_qr_code_text">Усмерите камеру на бар-код!</string> <!--Generic result toast--> - <string name="view_log">Детаљи</string> + <string name="snackbar_details">Детаљи</string> <string name="with_warnings">, са упозорењима</string> <string name="with_cancelled">, док није отказано</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 39d55e258..94f4fbe31 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -350,7 +350,7 @@ <string name="import_qr_code_button">Skanna QR-kod</string> <string name="import_qr_code_text">Håll din kamera över QR-koden!</string> <!--Generic result toast--> - <string name="view_log">Detaljer</string> + <string name="snackbar_details">Detaljer</string> <string name="with_warnings">, med varningar</string> <string name="with_cancelled">, tills det avbryts</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 3ef6269dd..53cc26aeb 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -348,7 +348,7 @@ <string name="import_qr_code_button">掃描二維條碼</string> <string name="import_qr_code_text">將您的相機對準 QR Code !</string> <!--Generic result toast--> - <string name="view_log">詳細</string> + <string name="snackbar_details">詳細</string> <string name="with_warnings">,包含警告</string> <string name="with_cancelled">,直到被取消</string> <!--Import result toast--> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fa6c585b1..7f5998772 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -63,7 +63,8 @@ <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string> <string name="btn_encrypt_share_file">"Encrypt and share file"</string> <string name="btn_encrypt_save_file">"Encrypt and save file"</string> - <string name="btn_save">"Save"</string> + <string name="btn_save">"Save file"</string> + <string name="btn_view_log">"View log"</string> <string name="btn_do_not_save">"Cancel"</string> <string name="btn_delete">"Delete"</string> <string name="btn_no_date">"No Expiry"</string> @@ -420,7 +421,7 @@ <string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string> <!-- Generic result toast --> - <string name="view_log">"Details"</string> + <string name="snackbar_details">"Details"</string> <string name="with_warnings">", with warnings"</string> <string name="with_cancelled">", until cancelled"</string> @@ -1341,8 +1342,11 @@ <string name="view_internal">"View in OpenKeychain"</string> <string name="error_preparing_data">"Error preparing data!"</string> <string name="label_clip_title">"Encrypted Data"</string> - <string name="progress_processing">Processing…</string> - <string name="error_saving_file">Error saving file!</string> - <string name="file_saved">File saved!</string> + <string name="progress_processing">"Processing…"</string> + <string name="error_saving_file">"Error saving file!"</string> + <string name="file_saved">"File saved!"</string> + <string name="file_delete_ok">"Original file deleted."</string> + <string name="file_delete_none">"No file deleted! (Already deleted?)"</string> + <string name="file_delete_exception">"Could not delete original file!"</string> </resources> |