From b4c016c9d45686e80ce6521d95f06fc6609b8afb Mon Sep 17 00:00:00 2001
From: Jonathan Browne <12983479+JBYoshi@users.noreply.github.com>
Date: Tue, 27 Jul 2021 08:25:42 -0500
Subject: [PATCH] Change Close to Cancel in editing prompts. (#1480)

---
 src/App/Pages/Accounts/EnvironmentPage.xaml   | 2 +-
 src/App/Pages/Accounts/HintPage.xaml          | 2 +-
 src/App/Pages/Accounts/LoginSsoPage.xaml      | 2 +-
 src/App/Pages/Accounts/RegisterPage.xaml      | 2 +-
 src/App/Pages/Generator/GeneratorPage.xaml    | 2 +-
 src/App/Pages/Send/SendAddEditPage.xaml       | 2 +-
 src/App/Pages/Settings/ExportVaultPage.xaml   | 2 +-
 src/App/Pages/Settings/FolderAddEditPage.xaml | 2 +-
 src/App/Pages/Vault/AddEditPage.xaml          | 2 +-
 src/App/Pages/Vault/CollectionsPage.xaml      | 2 +-
 src/App/Pages/Vault/ScanPage.xaml             | 2 +-
 src/App/Pages/Vault/SharePage.xaml            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/App/Pages/Accounts/EnvironmentPage.xaml b/src/App/Pages/Accounts/EnvironmentPage.xaml
index 2f9312675..5a7abb783 100644
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 
diff --git a/src/App/Pages/Accounts/HintPage.xaml b/src/App/Pages/Accounts/HintPage.xaml
index 64b73e1b4..1514acfbc 100644
--- a/src/App/Pages/Accounts/HintPage.xaml
+++ b/src/App/Pages/Accounts/HintPage.xaml
@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 
diff --git a/src/App/Pages/Accounts/LoginSsoPage.xaml b/src/App/Pages/Accounts/LoginSsoPage.xaml
index e0839497f..1c54eb1ec 100644
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml
@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>
diff --git a/src/App/Pages/Accounts/RegisterPage.xaml b/src/App/Pages/Accounts/RegisterPage.xaml
index 75b8822f5..19d2a30fc 100644
--- a/src/App/Pages/Accounts/RegisterPage.xaml
+++ b/src/App/Pages/Accounts/RegisterPage.xaml
@@ -20,7 +20,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index 38cc84af4..6824140b3 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -15,7 +15,7 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
-            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Select}"
                      Clicked="Select_Clicked"
diff --git a/src/App/Pages/Send/SendAddEditPage.xaml b/src/App/Pages/Send/SendAddEditPage.xaml
index bad2b86a8..5ab0fc4a2 100644
--- a/src/App/Pages/Send/SendAddEditPage.xaml
+++ b/src/App/Pages/Send/SendAddEditPage.xaml
@@ -23,7 +23,7 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:IsNullConverter x:Key="null" />
             <u:IsNotNullConverter x:Key="notNull" />
-            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Key="closeItem" x:Name="_closeItem" />
             <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
                          x:Key="moreItem"
diff --git a/src/App/Pages/Settings/ExportVaultPage.xaml b/src/App/Pages/Settings/ExportVaultPage.xaml
index a7e0810ac..68b5a5221 100644
--- a/src/App/Pages/Settings/ExportVaultPage.xaml
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml
@@ -21,7 +21,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>
diff --git a/src/App/Pages/Settings/FolderAddEditPage.xaml b/src/App/Pages/Settings/FolderAddEditPage.xaml
index 3def4df89..2aa3efb86 100644
--- a/src/App/Pages/Settings/FolderAddEditPage.xaml
+++ b/src/App/Pages/Settings/FolderAddEditPage.xaml
@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
         <ToolbarItem Text="{u:I18n Delete}"
                      Clicked="Delete_Clicked"
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 0c6858a65..2b890a958 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -23,7 +23,7 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:StringHasValueConverter x:Key="stringHasValue" />
             <u:IsNotNullConverter x:Key="notNull" />
-            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Key="closeItem" x:Name="_closeItem" />
             <ToolbarItem Text="{u:I18n Collections}"
                          x:Key="collectionsItem"
diff --git a/src/App/Pages/Vault/CollectionsPage.xaml b/src/App/Pages/Vault/CollectionsPage.xaml
index 0f9f12905..86980c45d 100644
--- a/src/App/Pages/Vault/CollectionsPage.xaml
+++ b/src/App/Pages/Vault/CollectionsPage.xaml
@@ -14,7 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 
diff --git a/src/App/Pages/Vault/ScanPage.xaml b/src/App/Pages/Vault/ScanPage.xaml
index 91a96a545..d90c5a2b7 100644
--- a/src/App/Pages/Vault/ScanPage.xaml
+++ b/src/App/Pages/Vault/ScanPage.xaml
@@ -10,7 +10,7 @@
     Title="{u:I18n ScanQrTitle}">
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
 
     <Grid
diff --git a/src/App/Pages/Vault/SharePage.xaml b/src/App/Pages/Vault/SharePage.xaml
index ad84a2a7b..073adf2f3 100644
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -14,7 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>