Remove some unused keys, change incorrect keys to use variables

common/components/AddressBookTableRow.tsx

@@ -77,7 +77,9 @@ class AddressBookTableRow extends React.Component<Props> {
               </label>
               <Input
                 name={labelName}
-                title={`${translateRaw('EDIT_LABEL_FOR')} ${address}`}
+                title={translateRaw('EDIT_LABEL_FOR', {
+                  $address: address
+                })}
                 value={temporaryLabel}
                 onChange={this.handleLabelChange}
                 onKeyDown={this.handleKeyDown}

common/components/AddressFieldFactory/AddressInputFactory.tsx

@@ -74,7 +74,11 @@ class AddressInputFactoryClass extends Component<Props> {
     const { value } = currentTo;
     const addr = addHexPrefix(value ? value.toString('hex') : '0');
     const inputClassName = `AddressInput-input ${label ? 'AddressInput-input-with-label' : ''}`;
-    const sendingTo = `${translateRaw('SENDING_TO')} ${label}`;
+    const sendingTo = label
+      ? translateRaw('SENDING_TO', {
+          $label: label
+        })
+      : '';
     const isENSAddress = currentTo.raw.includes('.eth');
 
     return (

common/components/ConfirmationModal/components/Body/components/Details.tsx

@@ -25,9 +25,9 @@ class DetailsClass extends Component<StateProps> {
             isValid={true}
             showValidAsPlain={true}
             readOnly={true}
-            value={`${network} ${translateRaw('NETWORK_2')} - ${translateRaw(
+            value={`${translateRaw('NETWORK_2', {
-              'PROVIDED_BY'
+              $network: network
-            )} ${service}`}
+            })} - ${translateRaw('PROVIDED_BY', { $service: service })}`}
           />
         </label>
 

common/components/ConfirmationModal/components/Body/components/Node.tsx

@@ -14,8 +14,10 @@ class NodeClass extends Component<StateProps, {}> {
   public render() {
     return (
       <li className="ConfModal-details-detail">
-        {translate('YOU_ARE_INTERACTING')} <strong>{this.props.node.network}</strong>
+        {translate('YOU_ARE_INTERACTING', {
-        {translate('NETWORK')} {translate('PROVIDED_BY')} <strong>{this.props.node.service}</strong>
+          $network: this.props.node.network
+        })}
+        {translate('PROVIDED_BY', { $service: this.props.node.service })}
       </li>
     );
   }

common/components/WalletDecrypt/WalletDecrypt.tsx

@@ -250,8 +250,10 @@ const WalletDecrypt = withRouter<Props>(
             <i className="fa fa-arrow-left" /> {translate('CHANGE_WALLET')}
           </button>
           <h2 className="WalletDecrypt-decrypt-title">
-            {!selectedWallet.isReadOnly && translate('UNLOCK_WALLET')}{' '}
+            {!selectedWallet.isReadOnly &&
-            {translate(selectedWallet.lid)}
+              translate('UNLOCK_WALLET', {
+                $wallet: translateRaw(selectedWallet.lid)
+              })}
           </h2>
           <section className="WalletDecrypt-decrypt-form">
             <Errorable

common/translations/lang/en.json

@@ -10,7 +10,7 @@
     "NO_LABEL_FOUND_CONTAINING": "No labels found containing",
     "LABEL_CANNOT_BEGIN_WITH_0X": "Address labels may not begin with 0x.",
     "LABEL_CANNOT_CONTAIN_ENS_SUFFIX": "Address labels may not contain \".eth\", \".test\" or \".reverse\".",
-    "SENDING_TO": "Sending to",
+    "SENDING_TO": "Sending to $label",
     "NEW_ADDRESS": "New address",
     "NEW_LABEL": "New label",
     "X_TXHASH": "TX Hash",
@@ -81,7 +81,7 @@
     "ORDER_TREZOR": "Don’t have a TREZOR? Order one now!",
     "HOWTO_TREZOR": "How to use TREZOR with MyCrypto",
     "X_KEEPKEY": "KeepKey",
-    "UNLOCK_WALLET": "Unlock your",
+    "UNLOCK_WALLET": "Unlock your $wallet",
     "X_PARITYSIGNER": "Parity Signer ",
     "ADD_PARITY_DESC": "Connect & sign via your Parity Signer mobile app ",
     "ADD_PARITY_1": "Transaction canceled ",
@@ -108,20 +108,8 @@
     "MYWAL_NICK": "Wallet Nickname ",
     "MYWAL_ADDRESS": "Wallet Address ",
     "EDIT_LABEL": "edit label",
-    "EDIT_LABEL_FOR": "Edit label for",
+    "EDIT_LABEL_FOR": "Edit label for $address",
     "SAVE_LABEL": "save label",
-    "MYWAL_BAL": "Balance ",
-    "MYWAL_EDIT": "Edit ",
-    "MYWAL_VIEW": "View ",
-    "MYWAL_REMOVE": "Remove ",
-    "MYWAL_REMOVEWAL": "Remove Wallet ",
-    "MYWAL_WATCHONLY": "Your Watch-Only Accounts ",
-    "MYWAL_VIEWING": "Viewing Wallet ",
-    "MYWAL_HIDE": "Hide Wallet Info ",
-    "MYWAL_EDIT_2": "Edit Wallet ",
-    "MYWAL_NAME": "Wallet Name ",
-    "MYWAL_CONTENT_1": "Warning! You are about to remove your wallet ",
-    "MYWAL_CONTENT_3": "If you want to use this wallet with your MyCrypto CX in the future, you will need to manually re-add it using the private key/JSON and password. ",
     "GEN_DESC": "If you want to generate multiple wallets, you can do so here ",
     "GEN_LABEL_1": "Enter a password",
     "GEN_PLACEHOLDER_1": "Do NOT forget to save this! ",
@@ -170,11 +158,6 @@
     "SEND_SIGNED": "Signed Transaction ",
     "SEND_TRANS": "Send Transaction ",
     "SEND_TO": "Send to ",
-    "SENDMODAL_TITLE": "Warning! ",
-    "SENDMODAL_CONTENT_1": "You are about to send ",
-    "SENDMODAL_CONTENT_2": "to address ",
-    "SENDMODAL_CONTENT_3": "Are you sure you want to do this? ",
-    "SENDMODAL_CONTENT_4": "NOTE: If you encounter an error, you most likely need to add ether to your account to cover the gas cost of sending tokens. Gas is paid in ether. ",
     "TOKEN_ADDR": "Address ",
     "TOKEN_SYMBOL": "Token Symbol ",
     "TOKEN_DEC": "Decimals ",
@@ -225,11 +208,8 @@
     "NODE_CTA": "Save & Use Custom Node",
     "NODE_ADD": "Add Custom Node",
     "SWAP_RATES": "Current Rates ",
-    "SWAP_INIT_1": "I want to swap my ",
-    "SWAP_INIT_2": " for ",
     "SWAP_INIT_CTA": "Let's do this! ",
     "SWAP_INFORMATION": "Your Information ",
-    "SWAP_SEND_AMT": "Amount to send ",
     "SWAP_REC_AMT": "Amount to receive ",
     "SWAP_YOUR_RATE": "Your rate ",
     "SWAP_REC_ADD": "Your Receiving Address ",
@@ -655,11 +635,10 @@
     "COPIED": "copied!",
     "COPY_ADDRESS": "copy address",
     "EDIT_LABEL_2": "Edit label",
-    "CONFIRM_ADDRESS_ON": "Confirm address on",
     "NETWORK": "Network",
-    "NETWORK_2": "network",
+    "NETWORK_2": "$network network",
-    "PROVIDED_BY": "provided by",
+    "PROVIDED_BY": "Network provided by $service",
-    "YOU_ARE_INTERACTING": "You are interacting with the",
+    "YOU_ARE_INTERACTING": "You are interacting with the $network network.",
     "USING_PAYMENT_ID": "Using the required Payment ID of:",
     "PAYMENT_ID_WARNING": "Don't forget to send your XMR with the payment ID [[?]](https://getmonero.org/resources/moneropedia/paymentid.html) above, or you WILL lose your funds.",
     "WHAT_IS_PAYMENT_ID": "what's a payment ID?",