From d670a47d5cd770edd99396567eafbc4c1dc1172c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 1 Sep 2020 15:30:15 +1000
Subject: [PATCH] remove duplicated key translation

---
 _locales/en/messages.json                  | 13 -------------
 _locales/fr/messages.json                  |  2 +-
 _locales/ru/messages.json                  | 12 ------------
 ts/components/session/RegistrationTabs.tsx |  6 +++---
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index f0b0a54fd..3dfdd9c35 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -532,7 +532,6 @@
     "androidKey": "BucketedThreadMedia_This_month",
     "ignoreCase": true,
     "sentenceCase": true
-
   },
   "voiceMessage": {
     "message": "Voice Message",
@@ -1893,12 +1892,6 @@
     "message": "Password must only contain letters, numbers and symbols",
     "description": "Error string shown to the user when password contains an invalid character"
   },
-  "change": {
-    "message": "Change"
-  },
-  "set": {
-    "message": "Set"
-  },
   "remove": {
     "message": "Remove",
     "androidKey": "ClearProfileActivity_remove"
@@ -2007,15 +2000,9 @@
     "message": "Enter a display name",
     "androidKey": "activity_display_name_edit_text_hint"
   },
-  "optionalPassword": {
-    "message": "Verify Password"
-  },
   "enterOptionalPassword": {
     "message": "Enter password (optional)"
   },
-  "verifyPassword": {
-    "message": "Verify Password"
-  },
   "devicePairingHeaderReassure": {
     "message": "Linking may take up to one minute to register on your primary device. Please be patient."
   },
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index d77090bc0..116d5380a 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -752,7 +752,7 @@
         "description": "Used in alt tag of image attachment"
     },
     "videoAttachmentAlt": {
-        "message": "Capture d.écran de la vidéo jointe au message",
+        "message": "Capture d'écran de la vidéo jointe au message",
         "description": "Used in alt tag of video attachment preview"
     },
     "lightboxImageAlt": {
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 1f9ba2393..64252ccd1 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -1715,12 +1715,6 @@
         "message": "Password must only contain letters, numbers and symbols",
         "description": "Error string shown to the user when password contains an invalid character"
     },
-    "change": {
-        "message": "Change"
-    },
-    "set": {
-        "message": "Set"
-    },
     "invalidPubkeyFormat": {
         "message": "Invalid Pubkey Format",
         "description": "Error string shown when user types an invalid pubkey format"
@@ -1774,15 +1768,9 @@
         "message": "Anonymous",
         "description": "The name of currently unidentified users"
     },
-    "optionalPassword": {
-        "message": "Verify Password"
-    },
     "enterOptionalPassword": {
         "message": "Введите пароль (если используется)"
     },
-    "verifyPassword": {
-        "message": "Verify Password"
-    },
     "devicePairingHeaderReassure": {
         "message": "Linking may take up to one minute to register on your primary device. Please be patient."
     },
diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx
index 91c9cd3ce..ec81b6605 100644
--- a/ts/components/session/RegistrationTabs.tsx
+++ b/ts/components/session/RegistrationTabs.tsx
@@ -494,7 +494,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
         />
 
         <SessionInput
-          label={window.i18n('optionalPassword')}
+          label={window.i18n('confirmPassword')}
           error={this.state.passwordErrorString}
           type="password"
           placeholder={window.i18n('enterOptionalPassword')}
@@ -509,10 +509,10 @@ export class RegistrationTabs extends React.Component<{}, State> {
 
         {!!password && (
           <SessionInput
-            label={window.i18n('verifyPassword')}
+            label={window.i18n('confirmPassword')}
             error={passwordsDoNotMatch}
             type="password"
-            placeholder={window.i18n('verifyPassword')}
+            placeholder={window.i18n('confirmPassword')}
             maxLength={window.CONSTANTS.MAX_PASSWORD_LENGTH}
             onValueChanged={(val: string) => {
               this.onPasswordVerifyChanged(val);