From 10830b964a4339c402e0e0eac5f656020cb7576c Mon Sep 17 00:00:00 2001
From: dtvv <coritocorito@hotmail.com>
Date: Tue, 18 Sep 2018 12:40:49 -0500
Subject: [PATCH] The modal says creating backup, when actually you are
 restoring from a backup. that must be reworded

---
 .../crystalwallet/fragments/ImportAccountOptionsFragment.java | 4 +---
 app/src/main/res/values/strings.xml                           | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
index 6d3fe60..749a359 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
@@ -27,9 +27,7 @@ import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
 import cy.agorise.crystalwallet.activities.BoardActivity;
 import cy.agorise.crystalwallet.activities.ImportSeedActivity;
-import cy.agorise.crystalwallet.activities.IntroActivity;
 import cy.agorise.crystalwallet.dialogs.material.CrystalDialog;
-import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
 import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener;
 import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
 import cy.agorise.crystalwallet.requestmanagers.ImportBackupRequest;
@@ -202,7 +200,7 @@ public class ImportAccountOptionsFragment extends DialogFragment {
                                     * Show loading dialog
                                     * */
                                     crystalDialog = new CrystalDialog((Activity) getContext());
-                                    crystalDialog.setText(getContext().getString(R.string.Creating_backup_from_file));
+                                    crystalDialog.setText(getContext().getString(R.string.Restoring_backup_from_file));
                                     crystalDialog.progress();
                                     crystalDialog.show();
                                 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2aabac..bfbdbee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -279,7 +279,7 @@
     <string name="head_block_number">head_block_number</string>
     <string name="e_receipt">e_receipt</string>
 
-    <string name="Creating_backup_from_file">Creating backup from file</string>
+    <string name="Restoring_backup_from_file">Restoring backup from file</string>
 
     <string name="folder_name">SmartcoinsWallet</string>
     <string name="login_api">{\"id\":1,\"method\":\"call\",\"params\":[1,\"login\",[\"\",\"\"]]}</string>
@@ -445,6 +445,8 @@
     <string name="please_import_the_correct_file">Please import the correct file</string>
     <string name="merchant_email_has_been_imported_successfully">Merchant email has been imported successfully</string>
 
+    <string name="Merchants">Merchants</string>
+
     <!-- Errors -->
     <string name="error_with_message">Error: %s</string>
     <string name="error_no_message">An error prevented this operation to succeed</string>