From 4339f04e80be74dd318e03f75fcf3410e923d30d Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 30 Jul 2018 17:50:05 -0400 Subject: use existing modals --- app/_locales/en/messages.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8d65bc596..8edf37235 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2,6 +2,9 @@ "accept": { "message": "Accept" }, + "accessingYourCamera": { + "message": "Accesing your camera..." + }, "account": { "message": "Account" }, @@ -937,6 +940,12 @@ "info": { "message": "Info" }, + "scanInstructions": { + "message": "Place the QR code in front of your camera so we can read it..." + }, + "scanQrCode": { + "message": "Scan QR Code" + }, "shapeshiftBuy": { "message": "Buy with Shapeshift" }, @@ -1086,6 +1095,9 @@ "unknownNetworkId": { "message": "Unknown network ID" }, + "unknownQrCode": { + "message": "Error: We couldn't identify that QR code" + }, "unlock": { "message": "Unlock" }, -- cgit From 34617a21c30afcca54a5ac884e361d41d39a4699 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 30 Jul 2018 18:36:37 -0400 Subject: copy --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8edf37235..286e32194 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -941,7 +941,7 @@ "message": "Info" }, "scanInstructions": { - "message": "Place the QR code in front of your camera so we can read it..." + "message": "Place the QR code in front of your camera" }, "scanQrCode": { "message": "Scan QR Code" -- cgit From edb154749d468299166e41e56d23beb781817cbc Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 30 Jul 2018 22:57:05 -0400 Subject: send to fullscreen if no permission from popup --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 286e32194..60e873371 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1144,6 +1144,9 @@ "whatsThis": { "message": "What's this?" }, + "youNeedToAllowCameraAccess": { + "message": "You need to allow camera access to use this feature." + }, "yourSigRequested": { "message": "Your signature is being requested" }, -- cgit From 710b4e294f66fe6e623fa145cc99be5b79c8210e Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 31 Jul 2018 18:30:40 -0400 Subject: added crossbrowser support and error handling --- app/_locales/en/messages.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 60e873371..ec96f5b08 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -656,6 +656,9 @@ "notStarted": { "message": "Not Started" }, + "noWebcamFound": { + "message": "We couldn't find any webcam available on your computer. Make sure the device is connected and configured correctly." + }, "oldUI": { "message": "Old UI" }, @@ -1098,6 +1101,9 @@ "unknownQrCode": { "message": "Error: We couldn't identify that QR code" }, + "unknownCameraError": { + "message": "Ooops! Something went wrong while trying to access you camera. Please try again..." + }, "unlock": { "message": "Unlock" }, -- cgit From 71ef4d85da50c50f767e20623fd30c014ba16ecf Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 3 Aug 2018 18:57:23 -0400 Subject: design complete --- app/_locales/en/messages.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ec96f5b08..db050e766 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -656,8 +656,11 @@ "notStarted": { "message": "Not Started" }, + "noWebcamFoundTitle": { + "message": "Webcam not found" + }, "noWebcamFound": { - "message": "We couldn't find any webcam available on your computer. Make sure the device is connected and configured correctly." + "message": "Your computer's webcam was not found. Please try again." }, "oldUI": { "message": "Old UI" @@ -1101,8 +1104,11 @@ "unknownQrCode": { "message": "Error: We couldn't identify that QR code" }, + "unknownCameraErrorTitle": { + "message": "Ooops! Something went wrong...." + }, "unknownCameraError": { - "message": "Ooops! Something went wrong while trying to access you camera. Please try again..." + "message": "There was an error while trying to access you camera. Please try again..." }, "unlock": { "message": "Unlock" -- cgit From c6b7e460b536a6fcff4e4328b1007f677720b585 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Wed, 8 Aug 2018 03:00:39 -0400 Subject: code review changes --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 4ffa66fc0..62ec4ce37 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1074,6 +1074,9 @@ "message": "We had trouble loading your token balances. You can view them ", "description": "Followed by a link (here) to view token balances" }, + "tryAgain": { + "message": "Try again" + }, "twelveWords": { "message": "These 12 words are the only way to restore your MetaMask accounts.\nSave them somewhere safe and secret." }, -- cgit From 6c11ae44bfb6e9f81aa8c8345a8558267a2ed6fb Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Wed, 8 Aug 2018 19:19:00 -0230 Subject: Fix casing of MetaMask in all localized messages Using the following: sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete --- app/_locales/de/messages.json | 2 +- app/_locales/en/messages.json | 6 +++--- app/_locales/es/messages.json | 4 ++-- app/_locales/fr/messages.json | 2 +- app/_locales/it/messages.json | 4 ++-- app/_locales/nl/messages.json | 2 +- app/_locales/th/messages.json | 2 +- app/_locales/tr/messages.json | 4 ++-- app/_locales/vi/messages.json | 2 +- app/_locales/zh_CN/messages.json | 2 +- app/_locales/zh_TW/messages.json | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'app/_locales') diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 1d2619672..88b0f397f 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -828,7 +828,7 @@ "message": "Willkommen zur neuen Oberfläche (Beta)" }, "uiWelcomeMessage": { - "message": "Du verwendest nun die neue Metamask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast." + "message": "Du verwendest nun die neue MetaMask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast." }, "unapproved": { "message": "Nicht genehmigt" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 62ec4ce37..1c42e865f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -120,7 +120,7 @@ "message": "Close" }, "chromeRequiredForTrezor":{ - "message": "You need to use Metamask on Google Chrome in order to connect to your TREZOR device." + "message": "You need to use MetaMask on Google Chrome in order to connect to your TREZOR device." }, "confirm": { "message": "Confirm" @@ -150,7 +150,7 @@ "message": "Connect to Trezor" }, "connectToTrezorHelp": { - "message": "Metamask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked." + "message": "MetaMask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked." }, "connectToTrezorTrouble": { "message": "If you are having trouble, please make sure you are using the latest version of the TREZOR firmware." @@ -1087,7 +1087,7 @@ "message": "Welcome to the New UI (Beta)" }, "uiWelcomeMessage": { - "message": "You are now using the new Metamask UI." + "message": "You are now using the new MetaMask UI." }, "unapproved": { "message": "Unapproved" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index f287674f1..ed7f8f681 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -75,7 +75,7 @@ "message": "Pedir prestado con Dharma (Beta)" }, "builtInCalifornia": { - "message": "Metamask fue diseñado y construido en California" + "message": "MetaMask fue diseñado y construido en California" }, "buy": { "message": "Comprar" @@ -874,7 +874,7 @@ "message": "Advertencia" }, "welcomeBeta": { - "message": "Bienvenido a Metamask Beta" + "message": "Bienvenido a MetaMask Beta" }, "whatsThis": { "message": "¿Qué es esto?" diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index da2cfe4f8..0a9cb516a 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -570,7 +570,7 @@ "message": "Bienvenue dans la nouvelle interface utilisateur (Beta)" }, "uiWelcomeMessage": { - "message": "Vous utilisez maintenant la nouvelle interface utilisateur Metamask. Jetez un coup d'oeil, essayez de nouvelles fonctionnalités comme l'envoi de jetons, et faites-nous savoir si vous avez des problèmes." + "message": "Vous utilisez maintenant la nouvelle interface utilisateur MetaMask. Jetez un coup d'oeil, essayez de nouvelles fonctionnalités comme l'envoi de jetons, et faites-nous savoir si vous avez des problèmes." }, "unavailable": { "message": "Indisponible" diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index ef3ed4025..1fd6a9d38 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -178,7 +178,7 @@ "message": "La rete predefinita per transazioni in Ether è la Rete Ethereum Principale." }, "denExplainer": { - "message": "Il DEN è il tuo archivio crittato con password dentro Metamask." + "message": "Il DEN è il tuo archivio crittato con password dentro MetaMask." }, "deposit": { "message": "Deposita" @@ -816,4 +816,4 @@ "youSign": { "message": "Ti stai connettendo" } -} \ No newline at end of file +} diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 38289f602..c1f3ef094 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -762,7 +762,7 @@ "message": "Welkom bij de nieuwe gebruikersinterface (bèta)" }, "uiWelcomeMessage": { - "message": "U gebruikt nu de nieuwe gebruikersinterface van Metamask. Kijk rond, probeer nieuwe functies uit zoals het verzenden van tokens en laat ons weten of u problemen ondervindt." + "message": "U gebruikt nu de nieuwe gebruikersinterface van MetaMask. Kijk rond, probeer nieuwe functies uit zoals het verzenden van tokens en laat ons weten of u problemen ondervindt." }, "unavailable": { "message": "Niet beschikbaar" diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 3d7dec226..c9aaa0394 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -762,7 +762,7 @@ "message": "ยินดีต้อนรับสู่หน้าตาใหม่ (เบต้า)" }, "uiWelcomeMessage": { - "message": "ขณะนี้คุณใช้งาน Metamask หน้าตาใหม่แล้ว ลองใช้ความสามรถใหม่ ๆ เช่นการส่งโทเค็นและหากพบปัญหากรุณาแจ้งให้เราทราบ" + "message": "ขณะนี้คุณใช้งาน MetaMask หน้าตาใหม่แล้ว ลองใช้ความสามรถใหม่ ๆ เช่นการส่งโทเค็นและหากพบปัญหากรุณาแจ้งให้เราทราบ" }, "unavailable": { "message": "ใช้งานไม่ได้" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index c2c09bc91..da35e4f96 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -852,7 +852,7 @@ "message": "Yeni UI (Beta)'ya hoşgeldiniz" }, "uiWelcomeMessage": { - "message": "Şu anda yeni Metamask UI kullanmaktasınız. Gözatın, jeton gönderme gibi yeni özellikleri deneyin ve herhangi bir sorunlar karşılaşırsanız bize haber verin" + "message": "Şu anda yeni MetaMask UI kullanmaktasınız. Gözatın, jeton gönderme gibi yeni özellikleri deneyin ve herhangi bir sorunlar karşılaşırsanız bize haber verin" }, "unapproved": { "message": "Onaylanmadı" @@ -909,4 +909,4 @@ "youSign": { "message": "İmzalıyorsunuz" } -} \ No newline at end of file +} diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index cd30de4de..782dfd119 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -570,7 +570,7 @@ "message": "Chào mừng bạn đến với giao diện mới (Beta)" }, "uiWelcomeMessage": { - "message": "Bạn đang sử dụng giao diện mới của Metamask. Chúng tôi khuyến khích bạn thử nghiệm và khám phá các tính năng mới như gửi token, và nếu bạn có gặp phải vấn đề gì khó khăn, xin hãy liên hệ ngay để chúng tôi có thể giúp đỡ bạn." + "message": "Bạn đang sử dụng giao diện mới của MetaMask. Chúng tôi khuyến khích bạn thử nghiệm và khám phá các tính năng mới như gửi token, và nếu bạn có gặp phải vấn đề gì khó khăn, xin hãy liên hệ ngay để chúng tôi có thể giúp đỡ bạn." }, "unavailable": { "message": "Không có sẵn" diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 241ea948d..a39bba9da 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -879,7 +879,7 @@ "message": "欢迎使用新版界面 (Beta)" }, "uiWelcomeMessage": { - "message": "你现在正在使用新的 Metamask 界面。 尝试发送代币等新功能,有任何问题请告知我们。" + "message": "你现在正在使用新的 MetaMask 界面。 尝试发送代币等新功能,有任何问题请告知我们。" }, "unapproved": { "message": "未批准" diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 9aaee0e16..200c75c3c 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -362,7 +362,7 @@ "message": "你想怎麼存入 Ether?" }, "holdEther": { - "message": "Metamask 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑." + "message": "MetaMask 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑." }, "import": { "message": "導入", -- cgit From 6e6a4825acc2ea19253d2a662ec5625333464dec Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Wed, 8 Aug 2018 19:23:27 -0230 Subject: Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages Using the following commands: sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete --- app/_locales/de/messages.json | 2 +- app/_locales/en/messages.json | 4 ++-- app/_locales/fr/messages.json | 2 +- app/_locales/it/messages.json | 2 +- app/_locales/nl/messages.json | 4 ++-- app/_locales/ph/messages.json | 2 +- app/_locales/pt/messages.json | 2 +- app/_locales/ru/messages.json | 2 +- app/_locales/tr/messages.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app/_locales') diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 88b0f397f..c06a99250 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -84,7 +84,7 @@ "message": "Auf Coinbase kaufen" }, "buyCoinbaseExplainer": { - "message": "Coinbase ist die weltweit bekannteste Art und Weise um bitcoin, ethereum und litecoin zu kaufen und verkaufen." + "message": "Coinbase ist die weltweit bekannteste Art und Weise um Bitcoin, Ethereum und Litecoin zu kaufen und verkaufen." }, "ok": { "message": "Ok" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 1c42e865f..ddfcf6f12 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -99,7 +99,7 @@ "message": "Buy on Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin." + "message": "Coinbase is the world’s most popular way to buy and sell Bitcoin, Ethereum, and Litecoin." }, "bytes": { "message": "Bytes" @@ -150,7 +150,7 @@ "message": "Connect to Trezor" }, "connectToTrezorHelp": { - "message": "MetaMask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked." + "message": "MetaMask is able to access your TREZOR Ethereum accounts. First make sure your device is connected and unlocked." }, "connectToTrezorTrouble": { "message": "If you are having trouble, please make sure you are using the latest version of the TREZOR firmware." diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 0a9cb516a..1463e2b5f 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -63,7 +63,7 @@ "message": "Acheter sur Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase est le moyen le plus populaire au monde d'acheter et de vendre du bitcoin, de l'ethereum et du litecoin." + "message": "Coinbase est le moyen le plus populaire au monde d'acheter et de vendre du Bitcoin, de l'Ethereum et du Litecoin." }, "cancel": { "message": "Annuler" diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 1fd6a9d38..2ae5fae72 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -81,7 +81,7 @@ "message": "Compra su Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase è il servizio più popolare al mondo per comprare e vendere bitcoin, ethereum e litecoin." + "message": "Coinbase è il servizio più popolare al mondo per comprare e vendere Bitcoin, Ethereum e Litecoin." }, "cancel": { "message": "Cancella" diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index c1f3ef094..46847f1bf 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -81,7 +81,7 @@ "message": "Koop op Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase is 's werelds populairste manier om bitcoin, ethereum en litecoin te kopen en verkopen." + "message": "Coinbase is 's werelds populairste manier om Bitcoin, Ethereum en Litecoin te kopen en verkopen." }, "cancel": { "message": "Annuleer" @@ -435,7 +435,7 @@ "message": "back-up woorden hebben alleen kleine letters" }, "mainnet": { - "message": "belangrijkste ethereum-netwerk" + "message": "belangrijkste Ethereum-netwerk" }, "message": { "message": "Bericht" diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 29d63be02..9a243447a 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -63,7 +63,7 @@ "message": "Bumili sa Coinbase" }, "buyCoinbaseExplainer": { - "message": "Ang Coinbase ang pinakasikat na paraan upang bumili at magbenta ng bitcoin, ethereum, at litecoin sa buong mundo." + "message": "Ang Coinbase ang pinakasikat na paraan upang bumili at magbenta ng Bitcoin, Ethereum, at Litecoin sa buong mundo." }, "cancel": { "message": "Kanselahin" diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index e770392d0..6f0bb1584 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -81,7 +81,7 @@ "message": "Comprar no Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase é a forma mais conhecida para comprar e vender bitcoin, ethereum, e litecoin." + "message": "Coinbase é a forma mais conhecida para comprar e vender Bitcoin, Ethereum, e Litecoin." }, "cancel": { "message": "Cancelar" diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index b43251064..bb722735d 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -84,7 +84,7 @@ "message": "Купить на Coinbase" }, "buyCoinbaseExplainer": { - "message": "Биржа Coinbase – это наиболее популярный способ купить или продать bitcoin, ethereum и litecoin." + "message": "Биржа Coinbase – это наиболее популярный способ купить или продать Bitcoin, Ethereum и Litecoin." }, "ok": { "message": "ОК" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index da35e4f96..08ba6cde8 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -84,7 +84,7 @@ "message": "Coinbase'de satın al" }, "buyCoinbaseExplainer": { - "message": "Coinbase bitcoin, ethereum, and litecoin alıp satmanın dünyadaki en popüler yolu" + "message": "Coinbase Bitcoin, Ethereum, and Litecoin alıp satmanın dünyadaki en popüler yolu" }, "ok": { "message": "Tamam" -- cgit