From 20cebc2788ef409e64727e5f9da393704224af70 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 8 Jul 2015 17:25:07 +0200 Subject: change wording of export dialog, remove "export secret" checkbox --- .../keychain/ui/BackupFragment.java | 1 - .../keychain/ui/ViewKeyActivity.java | 28 ++++------------ .../keychain/ui/ViewKeyAdvShareFragment.java | 25 ++++---------- .../keychain/util/ExportHelper.java | 38 +++++++++++++--------- OpenKeychain/src/main/res/values-cs/strings.xml | 2 +- OpenKeychain/src/main/res/values-de/strings.xml | 2 +- OpenKeychain/src/main/res/values-es/strings.xml | 2 +- OpenKeychain/src/main/res/values-eu/strings.xml | 2 +- OpenKeychain/src/main/res/values-fr/strings.xml | 2 +- OpenKeychain/src/main/res/values-it/strings.xml | 2 +- OpenKeychain/src/main/res/values-ja/strings.xml | 2 +- OpenKeychain/src/main/res/values-nl/strings.xml | 2 +- OpenKeychain/src/main/res/values-sl/strings.xml | 2 +- OpenKeychain/src/main/res/values-sr/strings.xml | 2 +- OpenKeychain/src/main/res/values-sv/strings.xml | 2 +- .../src/main/res/values-zh-rTW/strings.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 9 +++-- 17 files changed, 53 insertions(+), 72 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java index 714623ad4..3582bf2b8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java @@ -39,7 +39,6 @@ public class BackupFragment extends Fragment { // This ids for multiple key export. private ArrayList mIdsForRepeatAskPassphrase; - private ArrayList mIdsForExport; // This index for remembering the number of master key. private int mIndex; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 122c30cad..63597ea87 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -95,7 +95,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints"; static final int REQUEST_QR_FINGERPRINT = 1; - static final int REQUEST_EXPORT = 2; + static final int REQUEST_BACKUP = 2; static final int REQUEST_CERTIFY = 3; public static final String EXTRA_DISPLAY_RESULT = "display_result"; @@ -325,7 +325,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements return true; } case R.id.menu_key_view_export_file: { - startPassphraseActivity(REQUEST_EXPORT); + startPassphraseActivity(REQUEST_BACKUP); return true; } case R.id.menu_key_view_delete: { @@ -413,23 +413,9 @@ public class ViewKeyActivity extends BaseNfcActivity implements startActivityForResult(intent, requestCode); } - private void exportToFile(Uri dataUri, ProviderHelper providerHelper) { - try { - Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(dataUri); - - HashMap data = providerHelper.getGenericData( - baseUri, - new String[]{KeychainContract.Keys.MASTER_KEY_ID, KeychainContract.KeyRings.HAS_SECRET}, - new int[]{ProviderHelper.FIELD_TYPE_INTEGER, ProviderHelper.FIELD_TYPE_INTEGER}); - - new ExportHelper(this).showExportKeysDialog( - new long[]{(Long) data.get(KeychainContract.KeyRings.MASTER_KEY_ID)}, - Constants.Path.APP_DIR_FILE, ((Long) data.get(KeychainContract.KeyRings.HAS_SECRET) != 0) - ); - } catch (ProviderHelper.NotFoundException e) { - Notify.create(this, R.string.error_key_not_found, Notify.Style.ERROR).show(); - Log.e(Constants.TAG, "Key not found", e); - } + private void backupToFile() { + new ExportHelper(this).showExportKeysDialog( + mMasterKeyId, Constants.Path.APP_DIR_FILE, true); } private void deleteKey() { @@ -489,8 +475,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements return; } - case REQUEST_EXPORT: { - exportToFile(mDataUri, mProviderHelper); + case REQUEST_BACKUP: { + backupToFile(); return; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java index 0613388d7..65f70ec14 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java @@ -22,7 +22,6 @@ import java.io.BufferedWriter; import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStreamWriter; -import java.util.HashMap; import android.app.Activity; import android.app.ActivityOptions; @@ -84,6 +83,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements private Uri mDataUri; private byte[] mFingerprint; + private long mMasterKeyId; @Override public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) { @@ -135,7 +135,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements vKeySafeButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - exportToFile(mDataUri, new ProviderHelper(getActivity())); + exportToFile(); } }); vKeyClipboardButton.setOnClickListener(new View.OnClickListener() { @@ -173,23 +173,9 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements return root; } - private void exportToFile(Uri dataUri, ProviderHelper providerHelper) { - try { - Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(dataUri); - - HashMap data = providerHelper.getGenericData( - baseUri, - new String[]{KeychainContract.Keys.MASTER_KEY_ID, KeychainContract.KeyRings.HAS_SECRET}, - new int[]{ProviderHelper.FIELD_TYPE_INTEGER, ProviderHelper.FIELD_TYPE_INTEGER}); - - new ExportHelper(getActivity()).showExportKeysDialog( - new long[]{(Long) data.get(KeychainContract.KeyRings.MASTER_KEY_ID)}, - Constants.Path.APP_DIR_FILE, ((Long) data.get(KeychainContract.KeyRings.HAS_SECRET) != 0) - ); - } catch (ProviderHelper.NotFoundException e) { - Notify.create(getActivity(), R.string.error_key_not_found, Notify.Style.ERROR).show(); - Log.e(Constants.TAG, "Key not found", e); - } + private void exportToFile() { + new ExportHelper(getActivity()).showExportKeysDialog( + mMasterKeyId, Constants.Path.APP_DIR_FILE, false); } private void startSafeSlinger(Uri dataUri) { @@ -383,6 +369,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements /** Load QR Code asynchronously and with a fade in animation */ private void setFingerprint(byte[] fingerprintBlob) { mFingerprint = fingerprintBlob; + mMasterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(fingerprintBlob); final String fingerprint = KeyFormattingUtils.convertFingerprintToHex(fingerprintBlob); mFingerprintView.setText(KeyFormattingUtils.colorizeFingerprint(fingerprint)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java index cc51ef700..89a6da9cb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java @@ -17,6 +17,9 @@ package org.sufficientlysecure.keychain.util; + +import java.io.File; + import android.support.v4.app.FragmentActivity; import org.sufficientlysecure.keychain.Constants; @@ -25,15 +28,12 @@ import org.sufficientlysecure.keychain.operations.results.ExportResult; import org.sufficientlysecure.keychain.service.ExportKeyringParcel; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; -import java.io.File; - public class ExportHelper implements CryptoOperationHelper.Callback { protected File mExportFile; FragmentActivity mActivity; - private CryptoOperationHelper mExportOpHelper; private boolean mExportSecret; private long[] mMasterKeyIds; @@ -42,15 +42,13 @@ public class ExportHelper this.mActivity = activity; } - /** - * Show dialog where to export keys - */ - public void showExportKeysDialog(final long[] masterKeyIds, final File exportFile, - final boolean showSecretCheckbox) { + /** Show dialog where to export keys */ + public void showExportKeysDialog(final Long masterKeyId, final File exportFile, + final boolean exportSecret) { mExportFile = exportFile; String title; - if (masterKeyIds == null) { + if (masterKeyId == null) { // export all keys title = mActivity.getString(R.string.title_export_keys); } else { @@ -58,17 +56,24 @@ public class ExportHelper title = mActivity.getString(R.string.title_export_key); } - String message = mActivity.getString(R.string.specify_file_to_export_to); - String checkMsg = showSecretCheckbox ? - mActivity.getString(R.string.also_export_secret_keys) : null; + String message; + if (exportSecret) { + message = mActivity.getString(masterKeyId == null + ? R.string.specify_backup_dest_secret + : R.string.specify_backup_dest_secret_single); + } else { + message = mActivity.getString(masterKeyId == null + ? R.string.specify_backup_dest + : R.string.specify_backup_dest_single); + } FileHelper.saveFile(new FileHelper.FileDialogCallback() { @Override public void onFileSelected(File file, boolean checked) { mExportFile = file; - exportKeys(masterKeyIds, checked); + exportKeys(masterKeyId == null ? null : new long[] { masterKeyId }, exportSecret); } - }, mActivity.getSupportFragmentManager(), title, message, exportFile, checkMsg); + }, mActivity.getSupportFragmentManager(), title, message, exportFile, null); } // TODO: If ExportHelper requires pending data (see CryptoOPerationHelper), activities using @@ -82,8 +87,9 @@ public class ExportHelper mExportSecret = exportSecret; mMasterKeyIds = masterKeyIds; // if masterKeyIds is null it means export all - mExportOpHelper = new CryptoOperationHelper(mActivity, this, R.string.progress_exporting); - mExportOpHelper.cryptoOperation(); + CryptoOperationHelper exportOpHelper = + new CryptoOperationHelper<>(mActivity, this, R.string.progress_exporting); + exportOpHelper.cryptoOperation(); } @Override diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 36e75e976..4b367a5b3 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -206,7 +206,7 @@ Vyberte alespoň jeden šifrovací klíč. Prosím specifikujte do kterého souboru zašifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán. Prosím specifikujte do kterého souboru rozšifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán. - Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán. + Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán. Opravdu chcete smazat všechny vybrané soubory? Po smazání již nebudete schopni přečíst zprávy zašifrované tímto klíčem a stratíte všechny potvrzení udělané tímto klíčem! Smazat klíč \'%s\'? diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 29e5c25bb..8e14f9135 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -211,7 +211,7 @@ Mindestens einen Schlüssel zum Verschlüsseln auswählen. Bitte angeben in welche Datei verschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. Bitte angeben in welche Datei entschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. - Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. + Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. Möchtest du wirklich alle ausgewählten Schlüssel löschen? Nach dem Löschen wird es dir nicht mehr möglich sein mit diesem Schlüssel verschlüsselte Nachrichten zu lesen und zudem wirst du alle damit getätigten Bestätigungen verlieren! Schlüssel \'%s\' löschen? diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 0d585dda4..0668136cc 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -247,7 +247,7 @@ Seleccionar al menos una clave de cifrado o una clave de firma. Por favor especifique hacia qué fichero cifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe! Por favor especifique hacia qué fichero descifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe! - Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe! + Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe! ¿De verdad quiere borrar todas las claves seleccionadas? ¡Después del borrado no podrá leer mensajes cifrados con esta clave y perderá todas las confirmaciones de clave hechas con ella! ¿Borrar clave \'%s\'? diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index d8f7f4dfd..94400140b 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -245,7 +245,7 @@ Hautatu gutxienez enkriptaketa giltza bat edo sinadura giltza bat. Mesedez adierazi zein agirira enkriptatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero! Mesedez adierazi zein agirira dekriptatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero! - Mesedez adierazi zein agirira esportatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero! + Mesedez adierazi zein agirira esportatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero! Egitan nahi duzu hautaturiko giltzak ezabatzea? Ezabatu ondoren ezingo dituzu giltza honekin enkriptatutako mezuak irakurri eta berarekin egindako giltza baieztapen guztiak galduko dira! Ezabatu \'%s\' giltza? diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index c6d4dae81..7b3ad3fb7 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -221,7 +221,7 @@ Choisir au moins une clef de chiffrement ou une clef de signature. Veuillez spécifier vers quel fichier chiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe ! Veuillez spécifier vers quel fichier déchiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe ! - Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe ! + Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe ! Voulez-vous vraiment supprimer toutes les clefs sélectionnées ? Après suppression vous ne pourrez plus lire les messages chiffrés avec cette clef et vous perdrez toutes les confirmations de clefs faites avec elle ! Supprimer la clef \'%s\' ? diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 0b3aa7a0c..604f72f13 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -219,7 +219,7 @@ Selezionare almeno una chiave per la cifratura o una chiave per la firma. Per favore specifica il file da codificare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente. Per favore specifica il file da decifrare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente. - Per favore specifica il file da esportare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente. + Per favore specifica il file da esportare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente. Vuoi veramente eliminare tutte le chiavi selezionate? Dopo la cancellazione non sarai in grado di leggere i messaggi cifrati con questa chiave e perderai tutte le conferme principali fatti con essa! Elimnina chiave \'%s\'? diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 0f57c5023..a50d0f941 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -202,7 +202,7 @@ 少なくとも1つの暗号化鍵か署名鍵を選択して下さい。 どれのファイルを暗号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！ どれのファイルを暗号するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！ - どれのファイルを復号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！ + どれのファイルを復号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！ 選択したすべての鍵を本当に削除してよいですか? 削除後はこの鍵で暗号化されたメッセージが読めなくなります、またその鍵で行われたすべての鍵確認を失います! 鍵 \'%s\' を削除しますか? diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index d28a6db93..b35ed585e 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -247,7 +247,7 @@ Kies ten minste één versleutelingssleutel of een ondertekeningssleutel. Gelieve aan te geven naar welk bestand versleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden! Gelieve aan te geven naar welk bestand ontsleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden! - Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden! + Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden! Ben je zeker dat je alle geselecteerde sleutels wil verwijderen? Na verwijderen zal je niet langer berichten versleuteld met deze sleutel kunnen lezen, en alle sleutelbevestigingen die ermee gedaan zijn verliezen! Sleutel \'%s\' verwijderen? diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 06cba3827..ab3f009df 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -180,7 +180,7 @@ Izberite vsaj en šifrirni ključ. Določite datoteko, v katero želite šifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana. Določite datoteko, v katero želite dešifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana. - Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana. + Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana. Ali zares želite izbrisati vse izbrane ključe? Po izbrisu ne bo več mogoče prebirati sporočil šifriranih s tem ključem! Izgubljene bodo tudi vse z njim narejene potrditve. Izbrišem ključ \'%s\'? diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 21b425b1a..b3ad055ec 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -212,7 +212,7 @@ Изаберите бар један кључ за шифровање или потписивање. Одредите у који фајл да шифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји. Одредите у који фајл да дешифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји. - Одредите у који фајл да извезем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји. + Одредите у који фајл да извезем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји. Желите ли заиста да обришете све изабране јавне кључеве?\nОво не можете да поништите! Желите ли заиста да обришете ТАЈНИ кључ „%s“?\nОво не можете да поништите! Желите ли заиста да обришете јавни кључ „%s“??\nОво не можете да поништите! diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index fa503ca6e..402e60645 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -204,7 +204,7 @@ Välj åtminstone en krypteringsnyckel. Ange vilken fil du vill kryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över! Ange vilken fil du vill kryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över! - Ange vilken fil du vill exportera till.\nVARNING: Om filen redan finns kommer den att skrivas över! + Ange vilken fil du vill exportera till.\nVARNING: Om filen redan finns kommer den att skrivas över! Vill du verkligen radera alla markerade nycklar? Efter radering kommer du inte kunna läsa meddelande krypterade med den här nyckeln samt förlora alla nyckelbekräftningar som gjorts med den! Radera nyckel \'%s\'? diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index d7a38f3ba..21bb339e7 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -175,7 +175,7 @@ 選擇至少一把加密金鑰。 請指定欲加密的檔案。\n警告：已經存在的檔案將被覆蓋。 請指定欲解密的檔案。\n警告：已經存在的檔案將被覆蓋。 - 請指定欲輸出的檔案。\n警告：已經存在的檔案將被覆蓋。 + 請指定欲輸出的檔案。\n警告：已經存在的檔案將被覆蓋。 您真的想要刪除所有已選金鑰嗎？ 刪除之後您將無法閱讀以這把金鑰加密的訊息，而且所有用這把金鑰做的認證都會失效！ 刪除金鑰 \'%s\' ？ diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 86fcdbf7e..fd8e77996 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -25,8 +25,8 @@ "Encrypt To File" "Decrypt To File" "Import Keys" - "Export Key" - "Export Keys" + "Backup Key" + "Backup Keys" "Key Not Found" "Upload to Keyserver" "Confirm Key" @@ -275,7 +275,10 @@ "Select at least one encryption key or a signature key." "Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists!" "Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists!" - "Please specify which file to export to.\nWARNING: File will be overwritten if it exists!" + "A backup excluding your keys will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!" + "This key will be shared, please specify a destination file.\nWARNING: File will be overwritten if it exists!" + "A full backup of your key will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!" + "A full backup of all keys including yours will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!" "Do you really want to delete all selected keys?" "After deletion you will not be able to read messages encrypted with this key and lose all key confirmations done with it!" "Delete key '%s'?" -- cgit v1.2.3