Update translations

12 files changed, 22 insertions, 18 deletions

diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js
index 06376e48..d93a1d71 100644
--- a/ui/app/components/account-dropdowns.js
+++ b/ui/app/components/account-dropdowns.js
@@ -193,7 +193,7 @@ class AccountDropdowns extends Component {
               global.platform.openWindow({ url })
             },
           },
-          this.context.t('etherscanView'),
+          this.context.t('dexscanView'),
         ),
         h(
           DropdownMenuItem,
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index e6b3e0c0..8febe985 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -303,7 +303,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          this.context.t('etherscanView'),
+          this.context.t('dexscanView'),
         ),
         h(
           DropdownMenuItem,
diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js
index 248ffe00..2e75c169 100644
--- a/ui/app/components/modals/account-details-modal.js
+++ b/ui/app/components/modals/account-details-modal.js
@@ -86,7 +86,7 @@ AccountDetailsModal.prototype.render = function () {
         type: 'primary',
         className: 'account-modal__button',
         onClick: () => global.platform.openWindow({ url: genAccountLink(address, network) }),
-      }, this.context.t('etherscanView')),
+      }, this.context.t('dexscanView')),
 
       // Holding on redesign for Export Private Key functionality
 
diff --git a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js
index 195c5542..6e305069 100644
--- a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js
+++ b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js
@@ -49,7 +49,7 @@ export default class ConfirmRemoveAccount extends Component {
             className=""
             href={genAccountLink(identity.address, this.props.network)}
             target={'_blank'}
-            title={this.context.t('etherscanView')}
+            title={this.context.t('dexscanView')}
           >
             <img src="images/popout.svg" />
           </a>
diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js
index 68dcae10..bfa334d5 100644
--- a/ui/app/components/modals/deposit-ether-modal.js
+++ b/ui/app/components/modals/deposit-ether-modal.js
@@ -42,8 +42,8 @@ function DepositEtherModal (props, context) {
   Component.call(this)
 
   // need to set after i18n locale has loaded
-  DIRECT_DEPOSIT_ROW_TITLE = context.t('directDepositEther')
-  DIRECT_DEPOSIT_ROW_TEXT = context.t('directDepositEtherExplainer')
+  DIRECT_DEPOSIT_ROW_TITLE = context.t('directDepositDex')
+  DIRECT_DEPOSIT_ROW_TEXT = context.t('directDepositDexExplainer')
   FAUCET_ROW_TITLE = context.t('testFaucet')
 
   this.state = {
@@ -59,7 +59,7 @@ module.exports = connect(mapStateToProps, mapDispatchToProps)(DepositEtherModal)
 
 
 DepositEtherModal.prototype.facuetRowText = function (networkName) {
-  return this.context.t('getEtherFromFaucet', [networkName])
+  return this.context.t('getDexFromFaucet', [networkName])
 }
 
 DepositEtherModal.prototype.renderRow = function ({
@@ -124,10 +124,10 @@ DepositEtherModal.prototype.render = function () {
 
     h('div.page-container__header', [
 
-      h('div.page-container__title', [this.context.t('depositDex')]),
+      h('div.page-container__title', [this.context.t('depositDEX')]),
 
       h('div.page-container__subtitle', [
-        this.context.t('needEtherInWallet'),
+        this.context.t('needDexInWallet'),
       ]),
 
       h('div.page-container__header-close', {
@@ -159,7 +159,7 @@ DepositEtherModal.prototype.render = function () {
           logo: h('i.fa.fa-tint.fa-2x'),
           title: FAUCET_ROW_TITLE,
           text: this.facuetRowText(networkName),
-          buttonLabel: this.context.t('getEther'),
+          buttonLabel: this.context.t('getDex'),
           onButtonClick: () => toFaucet(network),
           hide: !isTestNetwork || buyingWithShapeshift,
         }),
diff --git a/ui/app/components/pages/create-account/connect-hardware/account-list.js b/ui/app/components/pages/create-account/connect-hardware/account-list.js
index c63de234..8c187604 100644
--- a/ui/app/components/pages/create-account/connect-hardware/account-list.js
+++ b/ui/app/components/pages/create-account/connect-hardware/account-list.js
@@ -107,7 +107,7 @@ class AccountList extends Component {
                     {
                     href: genAccountLink(a.address, this.props.network),
                     target: '_blank',
-                    title: this.context.t('etherscanView'),
+                    title: this.context.t('dexscanView'),
                     },
                     h('img', { src: 'images/popout.svg' })
                 ),
diff --git a/ui/app/components/pages/keychains/reveal-seed.js b/ui/app/components/pages/keychains/reveal-seed.js
index 32557066..279411fd 100644
--- a/ui/app/components/pages/keychains/reveal-seed.js
+++ b/ui/app/components/pages/keychains/reveal-seed.js
@@ -93,7 +93,7 @@ class RevealSeedPage extends Component {
         h('label.reveal-seed__label', t('yourPrivateSeedPhrase')),
         h(ExportTextContainer, {
           text: this.state.seedWords,
-          filename: t('metamaskSeedWords'),
+          filename: t('dekusanSeedWords'),
         }),
       ])
     )
diff --git a/ui/app/components/pages/settings/info-tab/info-tab.component.js b/ui/app/components/pages/settings/info-tab/info-tab.component.js
index f598fff7..ac6705d5 100644
--- a/ui/app/components/pages/settings/info-tab/info-tab.component.js
+++ b/ui/app/components/pages/settings/info-tab/info-tab.component.js
@@ -117,7 +117,7 @@ export default class InfoTab extends PureComponent {
             </div>
             <div className="info-tab__item">
               <div className="info-tab__version-header">
-                { t('metamaskVersion') }
+                { t('dekusanVersion') }
               </div>
               <div className="info-tab__version-number">
                 { this.state.version }
diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
index 457d87ec..761c32a8 100644
--- a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
@@ -442,7 +442,11 @@ export default class SettingsTab extends PureComponent {
                   htmlFor="native-primary-currency"
                   className="settings-tab__radio-label"
                 >
+<<<<<<< HEAD
                   { nativeCurrency }
+=======
+                  { t('dex') }
+>>>>>>> Update translations
                 </label>
               </div>
               <div className="settings-tab__radio-button">
diff --git a/ui/app/components/send/send.constants.js b/ui/app/components/send/send.constants.js
index 8acdf064..f175aaa3 100644
--- a/ui/app/components/send/send.constants.js
+++ b/ui/app/components/send/send.constants.js
@@ -24,7 +24,7 @@ const TOKEN_TRANSFER_FUNCTION_SIGNATURE = '0xa9059cbb'
 
 const INSUFFICIENT_FUNDS_ERROR = 'insufficientFunds'
 const INSUFFICIENT_TOKENS_ERROR = 'insufficientTokens'
-const NEGATIVE_ETH_ERROR = 'negativeETH'
+const NEGATIVE_ETH_ERROR = 'negativeDex'
 const INVALID_RECIPIENT_ADDRESS_ERROR = 'invalidAddressRecipient'
 const REQUIRED_ERROR = 'required'
 
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index 412931bf..c0bffb82 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -141,7 +141,7 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, this.context.t('toETHviaShapeShift', [props.depositType])),
+        }, this.context.t('toDEXviaShapeShift', [props.depositType])),
         h('div', this.context.t('noDeposits')),
         h('div', {
           style: {
@@ -164,7 +164,7 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, this.context.t('toETHviaShapeShift', [props.depositType])),
+        }, this.context.t('toDEXviaShapeShift', [props.depositType])),
         h('div', this.context.t('conversionProgress')),
         h('div', {
           style: {
diff --git a/ui/app/welcome-screen.js b/ui/app/welcome-screen.js
index ecd50ae7..0477053b 100644
--- a/ui/app/welcome-screen.js
+++ b/ui/app/welcome-screen.js
@@ -52,9 +52,9 @@ class WelcomeScreen extends Component {
 
           h('div.welcome-screen__info__header', this.context.t('welcome')),
 
-          h('div.welcome-screen__info__copy', this.context.t('metamaskDescription')),
+          h('div.welcome-screen__info__copy', this.context.t('dekusanDescription')),
 
-          h('div.welcome-screen__info__copy', this.context.t('holdEther')),
+          h('div.welcome-screen__info__copy', this.context.t('holdDex')),
 
           h('button.welcome-screen__button', {
             onClick: this.initiateAccountCreation,