Renaming export strings to backup

17 files changed, 164 insertions, 163 deletions

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<BackupKeyringParcel> {
@@ -96,21 +96,21 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> {
     }
 
     @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<BackupKeyringParcel> {
             { // 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<BackupKeyringParcel> {
             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<BackupKeyringParcel> {
             }
 
             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<BackupKeyringParcel> {
         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<BackupKeyringParcel> {
             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<BackupKeyringParcel> {
             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<BackupKeyringParcel> {
             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<BackupKeyringParcel> {
             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<UploadKeyringParcel> {
         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<UploadKeyringParcel> {
             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 @@
   <string name="msg_import_error_io">Importvorgang ist aufgrund eines Ein-/Ausgabefehlers fehlgeschlagen!</string>
   <string name="msg_import_partial">Importvorgang erfolgreich, mit Fehlern!</string>
   <string name="msg_import_success">Importvorgang erfolgreich!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Schlüssel wird exportiert</item>
     <item quantity="other">%d Schlüssel werden exportiert</item>
   </plurals>
   <string name="msg_export_file_name">Dateiname: %s</string>
-  <string name="msg_export_all">Exportiere alle Schlüssel</string>
-  <string name="msg_export_public">Exportiere öffentlichen Schlüssel %s</string>
-  <string name="msg_export_upload_public">Öffentlicher Schlüssel %s wird hochgeladen</string>
-  <string name="msg_export_secret">Exportiere privaten Schlüssel %s</string>
+  <string name="msg_backup_all">Exportiere alle Schlüssel</string>
+  <string name="msg_backup_public">Exportiere öffentlichen Schlüssel %s</string>
+  <string name="msg_backup_upload_public">Öffentlicher Schlüssel %s wird hochgeladen</string>
+  <string name="msg_backup_secret">Exportiere privaten Schlüssel %s</string>
   <string name="msg_export_error_no_file">Kein Dateiname spezifiziert!</string>
   <string name="msg_export_error_fopen">Fehler beim Öffnen der Datei !</string>
   <string name="msg_export_error_no_uri">Keine URI spezifiziert!</string>
-  <string name="msg_export_error_uri_open">Fehler beim Öffnen des URI-Streams!</string>
+  <string name="msg_backup_error_uri_open">Fehler beim Öffnen des URI-Streams!</string>
   <string name="msg_export_error_storage">Speicher ist nicht Schreibbereit !</string>
-  <string name="msg_export_error_db">Datenbankfehler!</string>
-  <string name="msg_export_error_io">Eingabe/Ausgabe Fehler!</string>
-  <string name="msg_export_error_key">Fehlber bei der Vorverarbeitung der Schlüsseldaten!</string>
-  <string name="msg_export_error_upload">Fehler beim Hochladen des Schlüssels zum Server! Bitte überprüfe deine Internetverbindung</string>
-  <string name="msg_export_success">Exportvorgang erfolgreich!</string>
-  <string name="msg_export_upload_success">Hochladen auf Schlüsselserver erfolgreich</string>
+  <string name="msg_backup_error_db">Datenbankfehler!</string>
+  <string name="msg_backup_error_io">Eingabe/Ausgabe Fehler!</string>
+  <string name="msg_backup_error_key">Fehlber bei der Vorverarbeitung der Schlüsseldaten!</string>
+  <string name="msg_backup_error_upload">Fehler beim Hochladen des Schlüssels zum Server! Bitte überprüfe deine Internetverbindung</string>
+  <string name="msg_backup_success">Exportvorgang erfolgreich!</string>
+  <string name="msg_backup_upload_success">Hochladen auf Schlüsselserver erfolgreich</string>
   <string name="msg_del_error_empty">Nichts zu löschen!</string>
   <string name="msg_del_error_multi_secret">Private Schlüssel können nur einzeln gelöscht werden!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error_io">¡Fallo en la operación de importación debido a un error de e/s!</string>
   <string name="msg_import_partial">¡Operación de importado completada, con errores!</string>
   <string name="msg_import_success">¡Operación de importado exitosa!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Exportando una clave</item>
     <item quantity="other">Exportando %d claves</item>
   </plurals>
   <string name="msg_export_file_name">Nombre de fichero: %s</string>
-  <string name="msg_export_all">Exportando todas las claves</string>
-  <string name="msg_export_public">Exportando clave pública %s</string>
-  <string name="msg_export_upload_public">Subiendo clave pública %s</string>
-  <string name="msg_export_secret">Exportando clave secreta (privada) %s</string>
+  <string name="msg_backup_all">Exportando todas las claves</string>
+  <string name="msg_backup_public">Exportando clave pública %s</string>
+  <string name="msg_backup_upload_public">Subiendo clave pública %s</string>
+  <string name="msg_backup_secret">Exportando clave secreta (privada) %s</string>
   <string name="msg_export_error_no_file">¡No se especificó nombre de fichero!</string>
   <string name="msg_export_error_fopen">¡Error al abrir el fichero!</string>
   <string name="msg_export_error_no_uri">¡No se especificó URI!</string>
-  <string name="msg_export_error_uri_open">¡Error al abrir URI de flujo de datos (stream)!</string>
+  <string name="msg_backup_error_uri_open">¡Error al abrir URI de flujo de datos (stream)!</string>
   <string name="msg_export_error_storage">¡El almacenamiento no está listo para escritura!</string>
-  <string name="msg_export_error_db">¡Error de base de datos!</string>
-  <string name="msg_export_error_io">¡Error de entrada/salida!</string>
-  <string name="msg_export_error_key">¡Error al preprocesar los datos de la clave!</string>
-  <string name="msg_export_error_upload">¡Error al subir clave al servidor! Por favor, compruebe su conexión a Internet</string>
-  <string name="msg_export_success">Operación de exportado exitosa</string>
-  <string name="msg_export_upload_success">Subida al servidor de claves completada</string>
+  <string name="msg_backup_error_db">¡Error de base de datos!</string>
+  <string name="msg_backup_error_io">¡Error de entrada/salida!</string>
+  <string name="msg_backup_error_key">¡Error al preprocesar los datos de la clave!</string>
+  <string name="msg_backup_error_upload">¡Error al subir clave al servidor! Por favor, compruebe su conexión a Internet</string>
+  <string name="msg_backup_success">Operación de exportado exitosa</string>
+  <string name="msg_backup_upload_success">Subida al servidor de claves completada</string>
   <string name="msg_del_error_empty">¡No hay nada que borrar!</string>
   <string name="msg_del_error_multi_secret">¡Las claves secretas (privadas) sólo se pueden borrar individualmente!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error_io">Eragiketa hutsegitea s/i akats bategaitik!</string>
   <string name="msg_import_partial">Inportatze eragiketa ongi burutu da, akatsekin!</string>
   <string name="msg_import_success">Inportatze eragiketa ongi burutu da!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Giltza bat esportatzen</item>
     <item quantity="other">%d giltza esportatzen</item>
   </plurals>
-  <string name="msg_export_all">Giltza guztiak esportatzen</string>
-  <string name="msg_export_public">Giltza publikoa esportatzen %s</string>
-  <string name="msg_export_upload_public">%s giltza publikoa igotzen</string>
-  <string name="msg_export_secret">%s giltza sekretua esportatzen</string>
+  <string name="msg_backup_all">Giltza guztiak esportatzen</string>
+  <string name="msg_backup_public">Giltza publikoa esportatzen %s</string>
+  <string name="msg_backup_upload_public">%s giltza publikoa igotzen</string>
+  <string name="msg_backup_secret">%s giltza sekretua esportatzen</string>
   <string name="msg_export_error_no_file">Ez da agirizenik adierazi!</string>
   <string name="msg_export_error_fopen">Akatsa agiria irekitzen!</string>
   <string name="msg_export_error_no_uri">Ez da URI-rik adierazi!</string>
-  <string name="msg_export_error_uri_open">Akatsa URI jarioa irekitzerakoan!</string>
+  <string name="msg_backup_error_uri_open">Akatsa URI jarioa irekitzerakoan!</string>
   <string name="msg_export_error_storage">Biltegia ez dago gertu idazteko!</string>
-  <string name="msg_export_error_db">Datubase akatsa!</string>
-  <string name="msg_export_error_io">Sarrera/irteera akatsa!</string>
-  <string name="msg_export_error_key">Akatsa giltza datuak aurre-prozesatzerakoan!</string>
-  <string name="msg_export_error_upload">Hutsegitea giltza zerbitzarira igotzean! Mesedez egiaztatu zure internet elkarketa.</string>
-  <string name="msg_export_success">Esportatze eragiketa ongi burutu da!</string>
-  <string name="msg_export_upload_success">Giltza-zerbitzarira igotzea ongi!</string>
+  <string name="msg_backup_error_db">Datubase akatsa!</string>
+  <string name="msg_backup_error_io">Sarrera/irteera akatsa!</string>
+  <string name="msg_backup_error_key">Akatsa giltza datuak aurre-prozesatzerakoan!</string>
+  <string name="msg_backup_error_upload">Hutsegitea giltza zerbitzarira igotzean! Mesedez egiaztatu zure internet elkarketa.</string>
+  <string name="msg_backup_success">Esportatze eragiketa ongi burutu da!</string>
+  <string name="msg_backup_upload_success">Giltza-zerbitzarira igotzea ongi!</string>
   <string name="msg_del_error_empty">Ez dago ezer ezabatzeko!</string>
   <string name="msg_del_error_multi_secret">Giltza sekretuak banaka bakarrik ezabatu daitezke!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error_io">Échec de l\'opération causé par une erreur d\'E/S !</string>
   <string name="msg_import_partial">Opération d\'importation réussie, avec des erreurs !</string>
   <string name="msg_import_success">Opération d\'importation réussie !</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Exportation d\'une clef</item>
     <item quantity="other">Exportation de %d clefs</item>
   </plurals>
   <string name="msg_export_file_name">Nom de fichier : %s</string>
-  <string name="msg_export_all">Exportation de toutes les clefs</string>
-  <string name="msg_export_public">Exportation de la clef publique %s</string>
-  <string name="msg_export_upload_public">Téléversement de la clef publique %s</string>
-  <string name="msg_export_secret">Exportation de la clef secrète %s</string>
+  <string name="msg_backup_all">Exportation de toutes les clefs</string>
+  <string name="msg_backup_public">Exportation de la clef publique %s</string>
+  <string name="msg_backup_upload_public">Téléversement de la clef publique %s</string>
+  <string name="msg_backup_secret">Exportation de la clef secrète %s</string>
   <string name="msg_export_error_no_file">Aucun nom de fichier spécifié !</string>
   <string name="msg_export_error_fopen">Erreur d\'ouverture du fichier !</string>
   <string name="msg_export_error_no_uri">Aucun URI spécifié !</string>
-  <string name="msg_export_error_uri_open">Erreur d\'ouverture du flux de l\'URI !</string>
+  <string name="msg_backup_error_uri_open">Erreur d\'ouverture du flux de l\'URI !</string>
   <string name="msg_export_error_storage">Le stockage n\'est pas prêt pour l\'écriture !</string>
-  <string name="msg_export_error_db">Erreur de base de données !</string>
-  <string name="msg_export_error_io">Erreur d\'entrée/sortie !</string>
-  <string name="msg_export_error_key">Erreur de prétraitement des données de la clef !</string>
-  <string name="msg_export_error_upload">Échec de téléversement de la clef vers le serveur. Veuillez vérifier votre connexion Internet.</string>
-  <string name="msg_export_success">Opération d\'exportation réussie !</string>
-  <string name="msg_export_upload_success">Téléversement vers le serveur de clefs réussi</string>
+  <string name="msg_backup_error_db">Erreur de base de données !</string>
+  <string name="msg_backup_error_io">Erreur d\'entrée/sortie !</string>
+  <string name="msg_backup_error_key">Erreur de prétraitement des données de la clef !</string>
+  <string name="msg_backup_error_upload">Échec de téléversement de la clef vers le serveur. Veuillez vérifier votre connexion Internet.</string>
+  <string name="msg_backup_success">Opération d\'exportation réussie !</string>
+  <string name="msg_backup_upload_success">Téléversement vers le serveur de clefs réussi</string>
   <string name="msg_del_error_empty">Rien à supprimer !</string>
   <string name="msg_del_error_multi_secret">Les clefs secrètes ne peuvent être supprimées qu\'individuellement !</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error_io">I/Oエラーによりインポート操作が失敗しました!</string>
   <string name="msg_import_partial">インポート操作に成功、ただしエラーあり!</string>
   <string name="msg_import_success">インポート操作に成功!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="other">%d 個の鍵のエクスポート</item>
   </plurals>
-  <string name="msg_export_all">すべての鍵のエクスポート</string>
-  <string name="msg_export_public">公開鍵 %s  のエクスポート</string>
-  <string name="msg_export_secret">秘密鍵 %s のエクスポート</string>
+  <string name="msg_backup_all">すべての鍵のエクスポート</string>
+  <string name="msg_backup_public">公開鍵 %s  のエクスポート</string>
+  <string name="msg_backup_secret">秘密鍵 %s のエクスポート</string>
   <string name="msg_export_error_no_file">指定のファイル名のファイルはありません!</string>
   <string name="msg_export_error_fopen">ファイルオープン中のエラー!</string>
   <string name="msg_export_error_no_uri">指定のURIはありません!</string>
-  <string name="msg_export_error_uri_open">URIオープン中のエラー!</string>
+  <string name="msg_backup_error_uri_open">URIオープン中のエラー!</string>
   <string name="msg_export_error_storage">ストレージが書き込み準備できていません!</string>
-  <string name="msg_export_error_db">データベースエラー!</string>
-  <string name="msg_export_error_io">入出力エラー!</string>
-  <string name="msg_export_error_key">鍵データの事前処理のエラー!</string>
-  <string name="msg_export_success">エクスポート操作に成功!</string>
-  <string name="msg_export_upload_success">鍵サーバへアップロードに成功</string>
+  <string name="msg_backup_error_db">データベースエラー!</string>
+  <string name="msg_backup_error_io">入出力エラー!</string>
+  <string name="msg_backup_error_key">鍵データの事前処理のエラー!</string>
+  <string name="msg_backup_success">エクスポート操作に成功!</string>
+  <string name="msg_backup_upload_success">鍵サーバへアップロードに成功</string>
   <string name="msg_del_error_empty">削除するものがありません!</string>
   <string name="msg_del_error_multi_secret">秘密鍵は個別にしか削除できません!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error_io">Importeren mislukt door i/o-fout!</string>
   <string name="msg_import_partial">Importeren geslaagd, met fouten!</string>
   <string name="msg_import_success">Importeren geslaagd!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Bezig met exporteren van een sleutel</item>
     <item quantity="other">Bezig met exporteren van %d sleutels</item>
   </plurals>
-  <string name="msg_export_all">Bezig met exporteren van alle sleutels</string>
-  <string name="msg_export_public">Bezig met exporteren van publieke sleutel %s</string>
-  <string name="msg_export_upload_public">Bezig met uploaden van publieke sleutel %s</string>
-  <string name="msg_export_secret">Bezig met exporteren van geheime sleutel %s</string>
+  <string name="msg_backup_all">Bezig met exporteren van alle sleutels</string>
+  <string name="msg_backup_public">Bezig met exporteren van publieke sleutel %s</string>
+  <string name="msg_backup_upload_public">Bezig met uploaden van publieke sleutel %s</string>
+  <string name="msg_backup_secret">Bezig met exporteren van geheime sleutel %s</string>
   <string name="msg_export_error_no_file">Geen bestandsnaam opgegeven!</string>
   <string name="msg_export_error_fopen">Fout bij openen van bestand!</string>
   <string name="msg_export_error_no_uri">Geen URI opgegeven!</string>
-  <string name="msg_export_error_uri_open">Fout bij openen van URI stream!</string>
+  <string name="msg_backup_error_uri_open">Fout bij openen van URI stream!</string>
   <string name="msg_export_error_storage">Opslag is niet klaar voor schrijven!</string>
-  <string name="msg_export_error_db">Databasefout!</string>
-  <string name="msg_export_error_io">Input/output-fout!</string>
-  <string name="msg_export_error_key">Fout bij voorwerken van sleutelgegevens!</string>
-  <string name="msg_export_error_upload">Fout bij uploaden van sleutel naar server! Controleer je internetverbinding</string>
-  <string name="msg_export_success">Exporteren geslaagd</string>
-  <string name="msg_export_upload_success">Uploaden naar sleutelserver geslaagd</string>
+  <string name="msg_backup_error_db">Databasefout!</string>
+  <string name="msg_backup_error_io">Input/output-fout!</string>
+  <string name="msg_backup_error_key">Fout bij voorwerken van sleutelgegevens!</string>
+  <string name="msg_backup_error_upload">Fout bij uploaden van sleutel naar server! Controleer je internetverbinding</string>
+  <string name="msg_backup_success">Exporteren geslaagd</string>
+  <string name="msg_backup_upload_success">Uploaden naar sleutelserver geslaagd</string>
   <string name="msg_del_error_empty">Niets om te verwijderen!</string>
   <string name="msg_del_error_multi_secret">Geheime sleutels kunnen enkel individueel verwijderd worden!</string>
   <plurals name="msg_del">
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
   </plurals>
   <string name="msg_import_error">Operacja importowania nie udała się!</string>
   <string name="msg_export_error_storage">Dysk nie jest gotowy do zapisu!</string>
-  <string name="msg_export_error_db">Błąd bazy danych!</string>
-  <string name="msg_export_success">Operacja eksportu zakończona pomyślnie</string>
+  <string name="msg_backup_error_db">Błąd bazy danych!</string>
+  <string name="msg_backup_success">Operacja eksportu zakończona pomyślnie</string>
   <string name="msg_del_error_empty">Nie ma nic do usunięcia!</string>
   <string name="msg_del_error_multi_secret">Klucze prywatne mogą być usuwane tylko pojedynczo!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error">Ошибка операции импорта!</string>
   <string name="msg_import_error_io">Операция импорта прервана из-за ошибки ввода/вывода!</string>
   <string name="msg_import_success">Операция импорта успешна!</string>
-  <string name="msg_export_all">Экспорт всех ключей</string>
+  <string name="msg_backup_all">Экспорт всех ключей</string>
   <string name="msg_export_error_no_file">Не выбрано имя файла!</string>
   <string name="msg_export_error_fopen">Ошибка открытия файла!</string>
   <string name="msg_export_error_no_uri">Не выбран URL!</string>
   <string name="msg_export_error_storage">Диск не готов для записи!</string>
-  <string name="msg_export_error_db">Ошибка базы данных!</string>
-  <string name="msg_export_error_io">Ошибка ввода/вывода!</string>
-  <string name="msg_export_success">Операция экспорта успешна</string>
+  <string name="msg_backup_error_db">Ошибка базы данных!</string>
+  <string name="msg_backup_error_io">Ошибка ввода/вывода!</string>
+  <string name="msg_backup_success">Операция экспорта успешна</string>
   <string name="msg_del_error_empty">Нет данных для удаления!</string>
   <string name="msg_del_error_multi_secret">Секретные ключи можно удалять только по одному!</string>
   <string name="msg_acc_saved">Аккаунт сохранен</string>
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 @@
   <string name="msg_import_error_io">Радња увоза није успела због У/И грешке!</string>
   <string name="msg_import_partial">Радња увоза је успела, са грешкама!</string>
   <string name="msg_import_success">Радња увоза је успела!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Извозим један кључ</item>
     <item quantity="few">Извозим %d кључа</item>
     <item quantity="other">Извозим %d кључева</item>
   </plurals>
   <string name="msg_export_file_name">Име фајла: %s</string>
-  <string name="msg_export_all">Извозим све кључеве</string>
-  <string name="msg_export_public">Извозим јавни кључ %s</string>
-  <string name="msg_export_upload_public">Отпремам јавни кључ %s</string>
-  <string name="msg_export_secret">Извозим тајни кључ %s</string>
+  <string name="msg_backup_all">Извозим све кључеве</string>
+  <string name="msg_backup_public">Извозим јавни кључ %s</string>
+  <string name="msg_backup_upload_public">Отпремам јавни кључ %s</string>
+  <string name="msg_backup_secret">Извозим тајни кључ %s</string>
   <string name="msg_export_error_no_file">Није наведено име фајла!</string>
   <string name="msg_export_error_fopen">Грешка отварања фајла!</string>
   <string name="msg_export_error_no_uri">Није наведен УРИ!</string>
-  <string name="msg_export_error_uri_open">Грешка отварања УРИ тока!</string>
+  <string name="msg_backup_error_uri_open">Грешка отварања УРИ тока!</string>
   <string name="msg_export_error_storage">Складиште није спремно за уписивање!</string>
-  <string name="msg_export_error_db">Грешка базе података!</string>
-  <string name="msg_export_error_io">Грешка улаза/излаза!</string>
-  <string name="msg_export_error_key">Грешка предобраде података кључа!</string>
-  <string name="msg_export_error_upload">Грешка отпремања кључа на сервер. Проверите вашу везу са интернетом.</string>
-  <string name="msg_export_success">Радња извоза је успела</string>
-  <string name="msg_export_upload_success">Отпремање на сервер кључева је успело</string>
+  <string name="msg_backup_error_db">Грешка базе података!</string>
+  <string name="msg_backup_error_io">Грешка улаза/излаза!</string>
+  <string name="msg_backup_error_key">Грешка предобраде података кључа!</string>
+  <string name="msg_backup_error_upload">Грешка отпремања кључа на сервер. Проверите вашу везу са интернетом.</string>
+  <string name="msg_backup_success">Радња извоза је успела</string>
+  <string name="msg_backup_upload_success">Отпремање на сервер кључева је успело</string>
   <string name="msg_del_error_empty">Нема ништа за брисање!</string>
   <string name="msg_del_error_multi_secret">Тајне кључеве можете брисати само појединачно!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_import_error">Importoperation misslyckades!</string>
   <string name="msg_import_partial">Importoperation lyckades, med fel!</string>
   <string name="msg_import_success">Importoperation lyckades!</string>
-  <plurals name="msg_export">
+  <plurals name="msg_backup">
     <item quantity="one">Exporterar en nyckel</item>
     <item quantity="other">Exporterar %d nycklar</item>
   </plurals>
-  <string name="msg_export_all">Exporterar alla nycklar</string>
-  <string name="msg_export_public">Exporterar publik nyckel %s</string>
-  <string name="msg_export_secret">Exporterar privat nyckel %s</string>
+  <string name="msg_backup_all">Exporterar alla nycklar</string>
+  <string name="msg_backup_public">Exporterar publik nyckel %s</string>
+  <string name="msg_backup_secret">Exporterar privat nyckel %s</string>
   <string name="msg_export_error_fopen">Fel vid öppning av fil!</string>
   <string name="msg_export_error_no_uri">Ingen URI specifierad!</string>
-  <string name="msg_export_error_db">Databasfel!</string>
-  <string name="msg_export_success">Exportoperation lyckades</string>
+  <string name="msg_backup_error_db">Databasfel!</string>
+  <string name="msg_backup_success">Exportoperation lyckades</string>
   <string name="msg_del_error_empty">Inget att radera!</string>
   <string name="msg_del_error_multi_secret">Privata nycklar kan bara raderas var för sig!</string>
   <plurals name="msg_del">
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 @@
   <string name="msg_crt_warn_not_found">Anahtar bulunamadı!</string>
   <string name="msg_import_keyserver">%s anahtar sunucusu kullanılıyor</string>
   <string name="msg_import_fingerprint_ok">Parmakizi kontrolü TAMAM</string>
-  <string name="msg_export_all">Tüm anahtarları dışa aktarma</string>
-  <string name="msg_export_error_uri_open">URI akışı açılırken hata!</string>
-  <string name="msg_export_error_db">Veritabanı hatası!</string>
-  <string name="msg_export_error_io">Giriş/çıkış hatası!</string>
-  <string name="msg_export_success">Dışa aktarma işlemi başarılı</string>
+  <string name="msg_backup_all">Tüm anahtarları dışa aktarma</string>
+  <string name="msg_backup_error_uri_open">URI akışı açılırken hata!</string>
+  <string name="msg_backup_error_db">Veritabanı hatası!</string>
+  <string name="msg_backup_error_io">Giriş/çıkış hatası!</string>
+  <string name="msg_backup_success">Dışa aktarma işlemi başarılı</string>
   <string name="msg_del_error_empty">Silinecek bir şey yok!</string>
   <string name="msg_acc_saved">Hesap kaydedildi</string>
   <string name="msg_download_success">Başarıyla indirildi!</string>
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 @@
   <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_backup_error_db">資料庫錯誤！</string>
+  <string name="msg_backup_error_io">輸入/輸出錯誤！</string>
+  <string name="msg_backup_success">匯出處理成功</string>
   <string name="msg_del_error_empty">沒有東西可以刪除！</string>
   <string name="msg_del_error_multi_secret">私鑰只能分別刪除！</string>
   <string name="msg_acc_saved">帳戶已儲存</string>
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 @@
     <string name="msg_import_partial">"Import operation successful, with errors!"</string>
     <string name="msg_import_success">"Import operation successful!"</string>
 
-    <plurals name="msg_export">
-        <item quantity="one">"Exporting one key"</item>
-        <item quantity="other">"Exporting %d keys"</item>
+    <plurals name="msg_backup">
+        <item quantity="one">"Backup with one key"</item>
+        <item quantity="other">"Backup with %d keys"</item>
     </plurals>
-    <string name="msg_export_all">"Exporting all keys"</string>
-    <string name="msg_export_public">"Exporting public key %s"</string>
-    <string name="msg_export_upload_public">"Uploading public key %s"</string>
-    <string name="msg_export_secret">"Exporting secret key %s"</string>
-    <string name="msg_export_error_uri_open">"Error opening URI stream!"</string>
-    <string name="msg_export_error_db">"Database error!"</string>
-    <string name="msg_export_error_io">"Input/output error!"</string>
-    <string name="msg_export_error_key">"Error preprocessing key data!"</string>
-    <string name="msg_export_error_upload">"Error uploading key to server! Please check your Internet connection"</string>
-    <string name="msg_export_success">"Export operation successful"</string>
-    <string name="msg_export_upload_success">"Upload to keyserver successful"</string>
+    <string name="msg_backup_all">"Backup with all keys"</string>
+    <string name="msg_backup_public">"Creating backup of public key %s"</string>
+    <string name="msg_backup_upload_public">"Uploading public key %s"</string>
+    <string name="msg_backup_secret">"Creating backup of secret key %s"</string>
+    <string name="msg_backup_error_uri_open">"Error opening URI stream!"</string>
+    <string name="msg_backup_error_db">"Database error!"</string>
+    <string name="msg_backup_error_io">"Input/output error!"</string>
+    <string name="msg_backup_error_key">"Error preprocessing key data!"</string>
+    <string name="msg_backup_error_upload">"Error uploading key to server! Please check your Internet connection"</string>
+    <string name="msg_backup_success">"Backup operation successful"</string>
+    <string name="msg_backup_upload_success">"Upload to keyserver successful"</string>
 
     <string name="msg_del_error_empty">"Nothing to delete!"</string>
     <string name="msg_del_error_multi_secret">"Secret keys can only be deleted individually!"</string>