From 2db8346f379053c2a575d509ad46ab8097202b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 15 Oct 2015 23:40:35 +0200 Subject: Renaming export strings to backup --- .../org/sufficientlysecure/keychain/Constants.java | 5 +- .../keychain/operations/BackupOperation.java | 58 +++++++++++----------- .../keychain/operations/UploadOperation.java | 8 +-- .../operations/results/OperationResult.java | 24 ++++----- OpenKeychain/src/main/res/values-de/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-es/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-eu/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-fr/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-ja/strings.xml | 20 ++++---- OpenKeychain/src/main/res/values-nl/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-pl/strings.xml | 4 +- OpenKeychain/src/main/res/values-ru/strings.xml | 8 +-- OpenKeychain/src/main/res/values-sr/strings.xml | 24 ++++----- OpenKeychain/src/main/res/values-sv/strings.xml | 12 ++--- OpenKeychain/src/main/res/values-tr/strings.xml | 10 ++-- .../src/main/res/values-zh-rTW/strings.xml | 6 +-- OpenKeychain/src/main/res/values/strings.xml | 28 +++++------ 17 files changed, 164 insertions(+), 163 deletions(-) (limited to 'OpenKeychain/src/main') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 7747ecb43..d02629b1a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -61,8 +61,9 @@ public final class Constants { public static final String FILE_EXTENSION_BACKUP_SECRET = ".sec.asc"; public static final String FILE_EXTENSION_BACKUP_PUBLIC = ".pub.asc"; public static final String FILE_ENCRYPTED_BACKUP_PREFIX = "backup_"; - public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET = ".sec.asc"; - public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC = ".pub.asc"; + // actually it is ASCII Armor, so .asc would be more accurate, but Android displays a nice icon for .pgp files! + public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET = ".sec.pgp"; + public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC = ".pub.pgp"; // used by QR Codes (Guardian Project, Monkeysphere compatiblity) public static final String FINGERPRINT_SCHEME = "openpgp4fpr"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java index 1ec43b625..206212387 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java @@ -63,13 +63,13 @@ import org.sufficientlysecure.keychain.util.Log; /** - * An operation class which implements high level export + * An operation class which implements high level backup * operations. * This class receives a source and/or destination of keys as input and performs - * all steps for this export. + * all steps for this backup. * * @see org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter#getSelectedEntries() - * For the export operation, the input consists of a set of key ids and + * For the backup operation, the input consists of a set of key ids and * either the name of a file or an output uri to write to. */ public class BackupOperation extends BaseOperation { @@ -96,21 +96,21 @@ public class BackupOperation extends BaseOperation { } @NonNull - public ExportResult execute(@NonNull BackupKeyringParcel exportInput, @Nullable CryptoInputParcel cryptoInput) { + public ExportResult execute(@NonNull BackupKeyringParcel backupInput, @Nullable CryptoInputParcel cryptoInput) { OperationLog log = new OperationLog(); - if (exportInput.mMasterKeyIds != null) { - log.add(LogType.MSG_EXPORT, 0, exportInput.mMasterKeyIds.length); + if (backupInput.mMasterKeyIds != null) { + log.add(LogType.MSG_BACKUP, 0, backupInput.mMasterKeyIds.length); } else { - log.add(LogType.MSG_EXPORT_ALL, 0); + log.add(LogType.MSG_BACKUP_ALL, 0); } try { - boolean nonEncryptedOutput = exportInput.mSymmetricPassphrase == null; + boolean nonEncryptedOutput = backupInput.mSymmetricPassphrase == null; - Uri exportOutputUri = nonEncryptedOutput - ? exportInput.mOutputUri + Uri backupOutputUri = nonEncryptedOutput + ? backupInput.mOutputUri : TemporaryFileProvider.createFile(mContext); int exportedDataSize; @@ -118,21 +118,21 @@ public class BackupOperation extends BaseOperation { { // export key data, and possibly return if we don't encrypt DataOutputStream outStream = new DataOutputStream(new BufferedOutputStream( - mContext.getContentResolver().openOutputStream(exportOutputUri))); + mContext.getContentResolver().openOutputStream(backupOutputUri))); - boolean exportSuccess = exportKeysToStream( - log, exportInput.mMasterKeyIds, exportInput.mExportSecret, outStream); + boolean backupSuccess = exportKeysToStream( + log, backupInput.mMasterKeyIds, backupInput.mExportSecret, outStream); exportedDataSize = outStream.size(); - if (!exportSuccess) { + if (!backupSuccess) { // if there was an error, it will be in the log so we just have to return return new ExportResult(ExportResult.RESULT_ERROR, log); } if (nonEncryptedOutput) { // log.add(LogType.MSG_EXPORT_NO_ENCRYPT, 1); - log.add(LogType.MSG_EXPORT_SUCCESS, 1); + log.add(LogType.MSG_BACKUP_SUCCESS, 1); return new ExportResult(ExportResult.RESULT_OK, log); } } @@ -140,23 +140,23 @@ public class BackupOperation extends BaseOperation { PgpSignEncryptOperation pseOp = new PgpSignEncryptOperation(mContext, mProviderHelper, mProgressable, mCancelled); PgpSignEncryptInputParcel inputParcel = new PgpSignEncryptInputParcel(); - inputParcel.setSymmetricPassphrase(exportInput.mSymmetricPassphrase); + inputParcel.setSymmetricPassphrase(backupInput.mSymmetricPassphrase); inputParcel.setEnableAsciiArmorOutput(true); inputParcel.setAddBackupHeader(true); - InputStream inStream = mContext.getContentResolver().openInputStream(exportOutputUri); + InputStream inStream = mContext.getContentResolver().openInputStream(backupOutputUri); String filename; - if (exportInput.mMasterKeyIds != null && exportInput.mMasterKeyIds.length == 1) { - filename = Constants.FILE_BACKUP_PREFIX + KeyFormattingUtils.convertKeyIdToHex(exportInput.mMasterKeyIds[0]); + if (backupInput.mMasterKeyIds != null && backupInput.mMasterKeyIds.length == 1) { + filename = Constants.FILE_BACKUP_PREFIX + KeyFormattingUtils.convertKeyIdToHex(backupInput.mMasterKeyIds[0]); } else { filename = Constants.FILE_BACKUP_PREFIX + new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date()); } - filename += exportInput.mExportSecret ? Constants.FILE_EXTENSION_BACKUP_SECRET : Constants.FILE_EXTENSION_BACKUP_PUBLIC; + filename += backupInput.mExportSecret ? Constants.FILE_EXTENSION_BACKUP_SECRET : Constants.FILE_EXTENSION_BACKUP_PUBLIC; InputData inputData = new InputData(inStream, exportedDataSize, filename); - OutputStream outStream = mContext.getContentResolver().openOutputStream(exportInput.mOutputUri); + OutputStream outStream = mContext.getContentResolver().openOutputStream(backupInput.mOutputUri); outStream = new BufferedOutputStream(outStream); PgpSignEncryptResult encryptResult = pseOp.execute(inputParcel, new CryptoInputParcel(), inputData, outStream); @@ -167,11 +167,11 @@ public class BackupOperation extends BaseOperation { } log.add(encryptResult, 1); - log.add(LogType.MSG_EXPORT_SUCCESS, 1); + log.add(LogType.MSG_BACKUP_SUCCESS, 1); return new ExportResult(ExportResult.RESULT_OK, log); } catch (FileNotFoundException e) { - log.add(LogType.MSG_EXPORT_ERROR_URI_OPEN, 1); + log.add(LogType.MSG_BACKUP_ERROR_URI_OPEN, 1); return new ExportResult(ExportResult.RESULT_ERROR, log); } @@ -188,7 +188,7 @@ public class BackupOperation extends BaseOperation { Cursor cursor = queryForKeys(masterKeyIds); if (cursor == null || !cursor.moveToFirst()) { - log.add(LogType.MSG_EXPORT_ERROR_DB, 1); + log.add(LogType.MSG_BACKUP_ERROR_DB, 1); return false; // new ExportResult(ExportResult.RESULT_ERROR, log); } @@ -203,14 +203,14 @@ public class BackupOperation extends BaseOperation { while (!cursor.isAfterLast()) { long keyId = cursor.getLong(INDEX_MASTER_KEY_ID); - log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId)); + log.add(LogType.MSG_BACKUP_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId)); if (writePublicKeyToStream(log, outStream, cursor)) { okPublic += 1; boolean hasSecret = cursor.getInt(INDEX_HAS_ANY_SECRET) > 0; if (exportSecret && hasSecret) { - log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId)); + log.add(LogType.MSG_BACKUP_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId)); if (writeSecretKeyToStream(log, outStream, cursor)) { okSecret += 1; } @@ -224,7 +224,7 @@ public class BackupOperation extends BaseOperation { updateProgress(R.string.progress_done, numKeys, numKeys); } catch (IOException e) { - log.add(LogType.MSG_EXPORT_ERROR_IO, 1); + log.add(LogType.MSG_BACKUP_ERROR_IO, 1); return false; // new ExportResult(ExportResult.RESULT_ERROR, log); } finally { // Make sure the stream is closed @@ -252,7 +252,7 @@ public class BackupOperation extends BaseOperation { ring.encode(arOutStream); } catch (PgpGeneralException e) { - log.add(LogType.MSG_EXPORT_ERROR_KEY, 2); + log.add(LogType.MSG_BACKUP_ERROR_KEY, 2); } finally { if (arOutStream != null) { arOutStream.close(); @@ -273,7 +273,7 @@ public class BackupOperation extends BaseOperation { ring.encode(arOutStream); } catch (PgpGeneralException e) { - log.add(LogType.MSG_EXPORT_ERROR_KEY, 2); + log.add(LogType.MSG_BACKUP_ERROR_KEY, 2); } finally { if (arOutStream != null) { arOutStream.close(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java index 499f592cf..bac9a7975 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java @@ -122,7 +122,7 @@ public class UploadOperation extends BaseOperation { ByteArrayOutputStream bos = new ByteArrayOutputStream(); ArmoredOutputStream aos = null; OperationLog log = new OperationLog(); - log.add(LogType.MSG_EXPORT_UPLOAD_PUBLIC, 0, KeyFormattingUtils.convertKeyIdToHex( + log.add(LogType.MSG_BACKUP_UPLOAD_PUBLIC, 0, KeyFormattingUtils.convertKeyIdToHex( keyring.getPublicKey().getKeyId() )); @@ -134,17 +134,17 @@ public class UploadOperation extends BaseOperation { String armoredKey = bos.toString("UTF-8"); server.add(armoredKey, proxy); - log.add(LogType.MSG_EXPORT_UPLOAD_SUCCESS, 1); + log.add(LogType.MSG_BACKUP_UPLOAD_SUCCESS, 1); return new UploadResult(UploadResult.RESULT_OK, log); } catch (IOException e) { Log.e(Constants.TAG, "IOException", e); - log.add(LogType.MSG_EXPORT_ERROR_KEY, 1); + log.add(LogType.MSG_BACKUP_ERROR_KEY, 1); return new UploadResult(UploadResult.RESULT_ERROR, log); } catch (AddKeyException e) { Log.e(Constants.TAG, "AddKeyException", e); - log.add(LogType.MSG_EXPORT_ERROR_UPLOAD, 1); + log.add(LogType.MSG_BACKUP_ERROR_UPLOAD, 1); return new UploadResult(UploadResult.RESULT_ERROR, log); } finally { mProgressable.setProgress(R.string.progress_uploading, 1, 1); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 382d6c46d..ca5931f8d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -765,18 +765,18 @@ public abstract class OperationResult implements Parcelable { MSG_IMPORT_PARTIAL (LogLevel.ERROR, R.string.msg_import_partial), MSG_IMPORT_SUCCESS (LogLevel.OK, R.string.msg_import_success), - MSG_EXPORT (LogLevel.START, R.plurals.msg_export), - MSG_EXPORT_UPLOAD_PUBLIC (LogLevel.START, R.string.msg_export_upload_public), - MSG_EXPORT_PUBLIC (LogLevel.DEBUG, R.string.msg_export_public), - MSG_EXPORT_SECRET (LogLevel.DEBUG, R.string.msg_export_secret), - MSG_EXPORT_ALL (LogLevel.START, R.string.msg_export_all), - MSG_EXPORT_ERROR_URI_OPEN (LogLevel.ERROR, R.string.msg_export_error_uri_open), - MSG_EXPORT_ERROR_DB (LogLevel.ERROR, R.string.msg_export_error_db), - MSG_EXPORT_ERROR_IO (LogLevel.ERROR, R.string.msg_export_error_io), - MSG_EXPORT_ERROR_KEY (LogLevel.ERROR, R.string.msg_export_error_key), - MSG_EXPORT_ERROR_UPLOAD (LogLevel.ERROR, R.string.msg_export_error_upload), - MSG_EXPORT_SUCCESS (LogLevel.OK, R.string.msg_export_success), - MSG_EXPORT_UPLOAD_SUCCESS (LogLevel.OK, R.string.msg_export_upload_success), + MSG_BACKUP(LogLevel.START, R.plurals.msg_backup), + MSG_BACKUP_UPLOAD_PUBLIC(LogLevel.START, R.string.msg_backup_upload_public), + MSG_BACKUP_PUBLIC(LogLevel.DEBUG, R.string.msg_backup_public), + MSG_BACKUP_SECRET(LogLevel.DEBUG, R.string.msg_backup_secret), + MSG_BACKUP_ALL(LogLevel.START, R.string.msg_backup_all), + MSG_BACKUP_ERROR_URI_OPEN(LogLevel.ERROR, R.string.msg_backup_error_uri_open), + MSG_BACKUP_ERROR_DB(LogLevel.ERROR, R.string.msg_backup_error_db), + MSG_BACKUP_ERROR_IO(LogLevel.ERROR, R.string.msg_backup_error_io), + MSG_BACKUP_ERROR_KEY(LogLevel.ERROR, R.string.msg_backup_error_key), + MSG_BACKUP_ERROR_UPLOAD(LogLevel.ERROR, R.string.msg_backup_error_upload), + MSG_BACKUP_SUCCESS(LogLevel.OK, R.string.msg_backup_success), + MSG_BACKUP_UPLOAD_SUCCESS(LogLevel.OK, R.string.msg_backup_upload_success), MSG_CRT_UPLOAD_SUCCESS (LogLevel.OK, R.string.msg_crt_upload_success), diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 7de834eea..d1a354828 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -1175,26 +1175,26 @@ Importvorgang ist aufgrund eines Ein-/Ausgabefehlers fehlgeschlagen! Importvorgang erfolgreich, mit Fehlern! Importvorgang erfolgreich! - + Schlüssel wird exportiert %d Schlüssel werden exportiert Dateiname: %s - Exportiere alle Schlüssel - Exportiere öffentlichen Schlüssel %s - Öffentlicher Schlüssel %s wird hochgeladen - Exportiere privaten Schlüssel %s + Exportiere alle Schlüssel + Exportiere öffentlichen Schlüssel %s + Öffentlicher Schlüssel %s wird hochgeladen + Exportiere privaten Schlüssel %s Kein Dateiname spezifiziert! Fehler beim Öffnen der Datei ! Keine URI spezifiziert! - Fehler beim Öffnen des URI-Streams! + Fehler beim Öffnen des URI-Streams! Speicher ist nicht Schreibbereit ! - Datenbankfehler! - Eingabe/Ausgabe Fehler! - Fehlber bei der Vorverarbeitung der Schlüsseldaten! - Fehler beim Hochladen des Schlüssels zum Server! Bitte überprüfe deine Internetverbindung - Exportvorgang erfolgreich! - Hochladen auf Schlüsselserver erfolgreich + Datenbankfehler! + Eingabe/Ausgabe Fehler! + Fehlber bei der Vorverarbeitung der Schlüsseldaten! + Fehler beim Hochladen des Schlüssels zum Server! Bitte überprüfe deine Internetverbindung + Exportvorgang erfolgreich! + Hochladen auf Schlüsselserver erfolgreich Nichts zu löschen! Private Schlüssel können nur einzeln gelöscht werden! diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index fa0a53b88..86851dc7a 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -1174,26 +1174,26 @@ ¡Fallo en la operación de importación debido a un error de e/s! ¡Operación de importado completada, con errores! ¡Operación de importado exitosa! - + Exportando una clave Exportando %d claves Nombre de fichero: %s - Exportando todas las claves - Exportando clave pública %s - Subiendo clave pública %s - Exportando clave secreta (privada) %s + Exportando todas las claves + Exportando clave pública %s + Subiendo clave pública %s + Exportando clave secreta (privada) %s ¡No se especificó nombre de fichero! ¡Error al abrir el fichero! ¡No se especificó URI! - ¡Error al abrir URI de flujo de datos (stream)! + ¡Error al abrir URI de flujo de datos (stream)! ¡El almacenamiento no está listo para escritura! - ¡Error de base de datos! - ¡Error de entrada/salida! - ¡Error al preprocesar los datos de la clave! - ¡Error al subir clave al servidor! Por favor, compruebe su conexión a Internet - Operación de exportado exitosa - Subida al servidor de claves completada + ¡Error de base de datos! + ¡Error de entrada/salida! + ¡Error al preprocesar los datos de la clave! + ¡Error al subir clave al servidor! Por favor, compruebe su conexión a Internet + Operación de exportado exitosa + Subida al servidor de claves completada ¡No hay nada que borrar! ¡Las claves secretas (privadas) sólo se pueden borrar individualmente! diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index 81daa67ef..9ad66be5b 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -1072,25 +1072,25 @@ Eragiketa hutsegitea s/i akats bategaitik! Inportatze eragiketa ongi burutu da, akatsekin! Inportatze eragiketa ongi burutu da! - + Giltza bat esportatzen %d giltza esportatzen - Giltza guztiak esportatzen - Giltza publikoa esportatzen %s - %s giltza publikoa igotzen - %s giltza sekretua esportatzen + Giltza guztiak esportatzen + Giltza publikoa esportatzen %s + %s giltza publikoa igotzen + %s giltza sekretua esportatzen Ez da agirizenik adierazi! Akatsa agiria irekitzen! Ez da URI-rik adierazi! - Akatsa URI jarioa irekitzerakoan! + Akatsa URI jarioa irekitzerakoan! Biltegia ez dago gertu idazteko! - Datubase akatsa! - Sarrera/irteera akatsa! - Akatsa giltza datuak aurre-prozesatzerakoan! - Hutsegitea giltza zerbitzarira igotzean! Mesedez egiaztatu zure internet elkarketa. - Esportatze eragiketa ongi burutu da! - Giltza-zerbitzarira igotzea ongi! + Datubase akatsa! + Sarrera/irteera akatsa! + Akatsa giltza datuak aurre-prozesatzerakoan! + Hutsegitea giltza zerbitzarira igotzean! Mesedez egiaztatu zure internet elkarketa. + Esportatze eragiketa ongi burutu da! + Giltza-zerbitzarira igotzea ongi! Ez dago ezer ezabatzeko! Giltza sekretuak banaka bakarrik ezabatu daitezke! diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index d67a9560f..77bd15f8d 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -1174,26 +1174,26 @@ Échec de l\'opération causé par une erreur d\'E/S ! Opération d\'importation réussie, avec des erreurs ! Opération d\'importation réussie ! - + Exportation d\'une clef Exportation de %d clefs Nom de fichier : %s - Exportation de toutes les clefs - Exportation de la clef publique %s - Téléversement de la clef publique %s - Exportation de la clef secrète %s + Exportation de toutes les clefs + Exportation de la clef publique %s + Téléversement de la clef publique %s + Exportation de la clef secrète %s Aucun nom de fichier spécifié ! Erreur d\'ouverture du fichier ! Aucun URI spécifié ! - Erreur d\'ouverture du flux de l\'URI ! + Erreur d\'ouverture du flux de l\'URI ! Le stockage n\'est pas prêt pour l\'écriture ! - Erreur de base de données ! - Erreur d\'entrée/sortie ! - Erreur de prétraitement des données de la clef ! - Échec de téléversement de la clef vers le serveur. Veuillez vérifier votre connexion Internet. - Opération d\'exportation réussie ! - Téléversement vers le serveur de clefs réussi + Erreur de base de données ! + Erreur d\'entrée/sortie ! + Erreur de prétraitement des données de la clef ! + Échec de téléversement de la clef vers le serveur. Veuillez vérifier votre connexion Internet. + Opération d\'exportation réussie ! + Téléversement vers le serveur de clefs réussi Rien à supprimer ! Les clefs secrètes ne peuvent être supprimées qu\'individuellement ! diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 3abf085c6..a3b2e6ac1 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -1138,22 +1138,22 @@ I/Oエラーによりインポート操作が失敗しました! インポート操作に成功、ただしエラーあり! インポート操作に成功! - + %d 個の鍵のエクスポート - すべての鍵のエクスポート - 公開鍵 %s のエクスポート - 秘密鍵 %s のエクスポート + すべての鍵のエクスポート + 公開鍵 %s のエクスポート + 秘密鍵 %s のエクスポート 指定のファイル名のファイルはありません! ファイルオープン中のエラー! 指定のURIはありません! - URIオープン中のエラー! + URIオープン中のエラー! ストレージが書き込み準備できていません! - データベースエラー! - 入出力エラー! - 鍵データの事前処理のエラー! - エクスポート操作に成功! - 鍵サーバへアップロードに成功 + データベースエラー! + 入出力エラー! + 鍵データの事前処理のエラー! + エクスポート操作に成功! + 鍵サーバへアップロードに成功 削除するものがありません! 秘密鍵は個別にしか削除できません! diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index 29d0cd57d..632ba68aa 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -1124,25 +1124,25 @@ Importeren mislukt door i/o-fout! Importeren geslaagd, met fouten! Importeren geslaagd! - + Bezig met exporteren van een sleutel Bezig met exporteren van %d sleutels - Bezig met exporteren van alle sleutels - Bezig met exporteren van publieke sleutel %s - Bezig met uploaden van publieke sleutel %s - Bezig met exporteren van geheime sleutel %s + Bezig met exporteren van alle sleutels + Bezig met exporteren van publieke sleutel %s + Bezig met uploaden van publieke sleutel %s + Bezig met exporteren van geheime sleutel %s Geen bestandsnaam opgegeven! Fout bij openen van bestand! Geen URI opgegeven! - Fout bij openen van URI stream! + Fout bij openen van URI stream! Opslag is niet klaar voor schrijven! - Databasefout! - Input/output-fout! - Fout bij voorwerken van sleutelgegevens! - Fout bij uploaden van sleutel naar server! Controleer je internetverbinding - Exporteren geslaagd - Uploaden naar sleutelserver geslaagd + Databasefout! + Input/output-fout! + Fout bij voorwerken van sleutelgegevens! + Fout bij uploaden van sleutel naar server! Controleer je internetverbinding + Exporteren geslaagd + Uploaden naar sleutelserver geslaagd Niets om te verwijderen! Geheime sleutels kunnen enkel individueel verwijderd worden! diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index bf46e5c42..a4991cbaf 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -533,8 +533,8 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw Operacja importowania nie udała się! Dysk nie jest gotowy do zapisu! - Błąd bazy danych! - Operacja eksportu zakończona pomyślnie + Błąd bazy danych! + Operacja eksportu zakończona pomyślnie Nie ma nic do usunięcia! Klucze prywatne mogą być usuwane tylko pojedynczo! diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index e3f9ccaea..ceb98ece4 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -883,14 +883,14 @@ Ошибка операции импорта! Операция импорта прервана из-за ошибки ввода/вывода! Операция импорта успешна! - Экспорт всех ключей + Экспорт всех ключей Не выбрано имя файла! Ошибка открытия файла! Не выбран URL! Диск не готов для записи! - Ошибка базы данных! - Ошибка ввода/вывода! - Операция экспорта успешна + Ошибка базы данных! + Ошибка ввода/вывода! + Операция экспорта успешна Нет данных для удаления! Секретные ключи можно удалять только по одному! Аккаунт сохранен diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index db31cd414..2b12f6b60 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -1202,27 +1202,27 @@ Радња увоза није успела због У/И грешке! Радња увоза је успела, са грешкама! Радња увоза је успела! - + Извозим један кључ Извозим %d кључа Извозим %d кључева Име фајла: %s - Извозим све кључеве - Извозим јавни кључ %s - Отпремам јавни кључ %s - Извозим тајни кључ %s + Извозим све кључеве + Извозим јавни кључ %s + Отпремам јавни кључ %s + Извозим тајни кључ %s Није наведено име фајла! Грешка отварања фајла! Није наведен УРИ! - Грешка отварања УРИ тока! + Грешка отварања УРИ тока! Складиште није спремно за уписивање! - Грешка базе података! - Грешка улаза/излаза! - Грешка предобраде података кључа! - Грешка отпремања кључа на сервер. Проверите вашу везу са интернетом. - Радња извоза је успела - Отпремање на сервер кључева је успело + Грешка базе података! + Грешка улаза/излаза! + Грешка предобраде података кључа! + Грешка отпремања кључа на сервер. Проверите вашу везу са интернетом. + Радња извоза је успела + Отпремање на сервер кључева је успело Нема ништа за брисање! Тајне кључеве можете брисати само појединачно! diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 2f4986df9..a6c44f7c4 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -838,17 +838,17 @@ Importoperation misslyckades! Importoperation lyckades, med fel! Importoperation lyckades! - + Exporterar en nyckel Exporterar %d nycklar - Exporterar alla nycklar - Exporterar publik nyckel %s - Exporterar privat nyckel %s + Exporterar alla nycklar + Exporterar publik nyckel %s + Exporterar privat nyckel %s Fel vid öppning av fil! Ingen URI specifierad! - Databasfel! - Exportoperation lyckades + Databasfel! + Exportoperation lyckades Inget att radera! Privata nycklar kan bara raderas var för sig! diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml index 090356f9d..3df2c1f5e 100644 --- a/OpenKeychain/src/main/res/values-tr/strings.xml +++ b/OpenKeychain/src/main/res/values-tr/strings.xml @@ -409,11 +409,11 @@ Anahtar bulunamadı! %s anahtar sunucusu kullanılıyor Parmakizi kontrolü TAMAM - Tüm anahtarları dışa aktarma - URI akışı açılırken hata! - Veritabanı hatası! - Giriş/çıkış hatası! - Dışa aktarma işlemi başarılı + Tüm anahtarları dışa aktarma + URI akışı açılırken hata! + Veritabanı hatası! + Giriş/çıkış hatası! + Dışa aktarma işlemi başarılı Silinecek bir şey yok! Hesap kaydedildi Başarıyla indirildi! diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 87144422d..68c99a16e 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -739,9 +739,9 @@ 使用金鑰伺服器%s 指紋檢查正確 正在合併取得的資料 - 資料庫錯誤！ - 輸入/輸出錯誤！ - 匯出處理成功 + 資料庫錯誤！ + 輸入/輸出錯誤！ + 匯出處理成功 沒有東西可以刪除！ 私鑰只能分別刪除！ 帳戶已儲存 diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7c63a2a96..bc238690b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1294,21 +1294,21 @@ "Import operation successful, with errors!" "Import operation successful!" - - "Exporting one key" - "Exporting %d keys" + + "Backup with one key" + "Backup with %d keys" - "Exporting all keys" - "Exporting public key %s" - "Uploading public key %s" - "Exporting secret key %s" - "Error opening URI stream!" - "Database error!" - "Input/output error!" - "Error preprocessing key data!" - "Error uploading key to server! Please check your Internet connection" - "Export operation successful" - "Upload to keyserver successful" + "Backup with all keys" + "Creating backup of public key %s" + "Uploading public key %s" + "Creating backup of secret key %s" + "Error opening URI stream!" + "Database error!" + "Input/output error!" + "Error preprocessing key data!" + "Error uploading key to server! Please check your Internet connection" + "Backup operation successful" + "Upload to keyserver successful" "Nothing to delete!" "Secret keys can only be deleted individually!" -- cgit v1.2.3