Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into fix/lookahead_…
Browse files Browse the repository at this point in the history
…addresses
  • Loading branch information
tony-blockchain committed Jun 29, 2018
2 parents d6cf460 + ce7eae0 commit 63a2a75
Show file tree
Hide file tree
Showing 54 changed files with 319 additions and 79 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "blockchain-wallet-v4",
"version": "4.0.0-alpha16.3",
"version": "4.0.0-alpha17",
"license": "ISC",
"author": {
"name": "Blockchain.info",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Beschreibung ändern",
"modals.edittransactiondesc.description": "Beschreibung",
"modals.edittransactiondesc.title": "Transaktionsbeschreibung bearbeiten",
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": "Unzureichendes Guthaben",
"modals.exchange.invalidamountmessage": "Ungültiges Konto",
"modals.exchange.maximumamountmessage": "Kein ausreichendes Guthaben.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "E-Mail",
"scenes.register.explain": "Registrieren Sie sich im Folgenden für eine kostenlose Wallet",
"scenes.register.login": "melden Sie sich an",
"scenes.register.msiewarning": null,
"scenes.register.or": "oder",
"scenes.register.password": "Passwort",
"scenes.register.registerform.blockchain.read": "Ich habe alles gelesen und akzeptiere die",
Expand Down
Expand Up @@ -5384,6 +5384,10 @@
},
{
"descriptors": [
{
"defaultMessage": "Please enter an amount less than the limit.",
"id": "modals.exchange.abovelimitmessage"
},
{
"defaultMessage": "Not enough funds.",
"id": "modals.exchange.maximumamountmessage"
Expand Down Expand Up @@ -6361,10 +6365,6 @@
"defaultMessage": "Your browser is not supported. Please update to at least Chrome 45, Firefox 45, Safari 8, IE 11, or Opera",
"id": "scenes.register.browserwarning"
},
{
"defaultMessage": "We recommend that you use a more secure browser like Chrome or Firefox.",
"id": "scenes.register.msiewarning"
},
{
"defaultMessage": "Email",
"id": "scenes.register.email"
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Αλλαγή Περιγραφής",
"modals.edittransactiondesc.description": "Περιγραφή",
"modals.edittransactiondesc.title": "Επεξεργασία Περιγραφής Συναλλαγής",
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": "Ανεπαρκή κεφάλαια",
"modals.exchange.invalidamountmessage": "Μη έγκυρο ποσό",
"modals.exchange.maximumamountmessage": "Μη επαρκή κεφάλαια.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Email",
"scenes.register.explain": "Κάντε εγγραφή για δωρεάν πορτοφόλι παρακάτω",
"scenes.register.login": "Σύνδεση",
"scenes.register.msiewarning": null,
"scenes.register.or": "ή",
"scenes.register.password": "Κωδικός Πρόσβασης",
"scenes.register.registerform.blockchain.read": "Διάβασα και συμφωνώ με",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Change Description",
"modals.edittransactiondesc.description": "Description",
"modals.edittransactiondesc.title": "Edit Transaction Description",
"modals.exchange.abovelimitmessage": "Please enter an amount less than the limit.",
"modals.exchange.insufficientamountmessage": "Insufficient funds",
"modals.exchange.invalidamountmessage": "Invalid amount",
"modals.exchange.maximumamountmessage": "Not enough funds.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Email",
"scenes.register.explain": "Sign up for a free wallet below",
"scenes.register.login": "Login",
"scenes.register.msiewarning": "We recommend that you use a more secure browser like Chrome or Firefox.",
"scenes.register.or": "or",
"scenes.register.password": "Password",
"scenes.register.registerform.blockchain.read": "I have read and agreed to the",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Cambiar descripción",
"modals.edittransactiondesc.description": "Descripción",
"modals.edittransactiondesc.title": "Modificar descripción de la transacción",
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": "Fondos insuficientes",
"modals.exchange.invalidamountmessage": "Importe no válido",
"modals.exchange.maximumamountmessage": "No hay fondos suficientes.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Correo electrónico",
"scenes.register.explain": "Regístrese a continuación para crear un monedero gratis",
"scenes.register.login": "Inicie sesión",
"scenes.register.msiewarning": null,
"scenes.register.or": "o",
"scenes.register.password": "Contraseña",
"scenes.register.registerform.blockchain.read": "He leído y acepto los",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Changer la description",
"modals.edittransactiondesc.description": "Description",
"modals.edittransactiondesc.title": "Modifier la description de la transaction",
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": "Fonds insuffisants",
"modals.exchange.invalidamountmessage": "Montant non valide",
"modals.exchange.maximumamountmessage": "Solde insuffisant.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Adresse e-mail",
"scenes.register.explain": "Inscrivez-vous pour un portefeuille gratuit ci-dessous",
"scenes.register.login": "Connectez-vous",
"scenes.register.msiewarning": null,
"scenes.register.or": "ou",
"scenes.register.password": "Mot de passe",
"scenes.register.registerform.blockchain.read": "J'ai lu et j'accepte les",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Deskripsi",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Surel",
"scenes.register.explain": "Mendaftar untuk dompet gratis di bawah",
"scenes.register.login": "Masuk",
"scenes.register.msiewarning": null,
"scenes.register.or": " atau ",
"scenes.register.password": "Kata sandi",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Descrizione",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Email",
"scenes.register.explain": "Si registri in basso per ottenere un portafoglio gratuito",
"scenes.register.login": "Acceda",
"scenes.register.msiewarning": null,
"scenes.register.or": " o ",
"scenes.register.password": "Password",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "説明",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "eメール",
"scenes.register.explain": "以下から無料ウォレットにサインアップ",
"scenes.register.login": "ログイン",
"scenes.register.msiewarning": null,
"scenes.register.or": "もしくは ",
"scenes.register.password": "パスワード",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "설명",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "이메일",
"scenes.register.explain": "아래 무료 지갑에 등록하세요",
"scenes.register.login": "로그인",
"scenes.register.msiewarning": null,
"scenes.register.or": "또는",
"scenes.register.password": "암호",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Beschrijving",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "E-mailadres",
"scenes.register.explain": "Meld u hieronder aan voor een gratis portemonnee",
"scenes.register.login": "Inloggen",
"scenes.register.msiewarning": null,
"scenes.register.or": " of ",
"scenes.register.password": "Wachtwoord",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Opis",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "E-mail",
"scenes.register.explain": "Zarejestruj się do darmowego portfela poniżej",
"scenes.register.login": "Zaloguj",
"scenes.register.msiewarning": null,
"scenes.register.or": " albo ",
"scenes.register.password": "Hasło",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Descrição",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "E-mail",
"scenes.register.explain": "Cadastre-se abaixo para uma carteira grátis",
"scenes.register.login": "Entrar",
"scenes.register.msiewarning": null,
"scenes.register.or": " ou ",
"scenes.register.password": "Senha",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": "Изменить описание",
"modals.edittransactiondesc.description": "Описание",
"modals.edittransactiondesc.title": "Редактировать описание транзакции",
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": "Недостаточно средств",
"modals.exchange.invalidamountmessage": "Недействительная сумма",
"modals.exchange.maximumamountmessage": "Недостаточно средств.",
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "Адрес эл. почты",
"scenes.register.explain": "Зарегистрируйтесь ниже для создания бесплатного кошелька",
"scenes.register.login": "Войти",
"scenes.register.msiewarning": null,
"scenes.register.or": "или",
"scenes.register.password": "Пароль",
"scenes.register.registerform.blockchain.read": "Я прочитал(а) и согласен(на) соблюдать",
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": null,
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": null,
"scenes.register.explain": null,
"scenes.register.login": null,
"scenes.register.msiewarning": null,
"scenes.register.or": null,
"scenes.register.password": null,
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "คำอธิบาย",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "อีเมล",
"scenes.register.explain": "สมัครกระเป๋าเงินฟรีด้านล่าง",
"scenes.register.login": "ล็อกอิน",
"scenes.register.msiewarning": null,
"scenes.register.or": " หรือ ",
"scenes.register.password": "รหัสผ่าน",
"scenes.register.registerform.blockchain.read": null,
Expand Down
Expand Up @@ -380,6 +380,7 @@
"modals.edittransactiondesc.button": null,
"modals.edittransactiondesc.description": "Açıklama",
"modals.edittransactiondesc.title": null,
"modals.exchange.abovelimitmessage": null,
"modals.exchange.insufficientamountmessage": null,
"modals.exchange.invalidamountmessage": null,
"modals.exchange.maximumamountmessage": null,
Expand Down Expand Up @@ -1234,7 +1235,6 @@
"scenes.register.email": "E-posta",
"scenes.register.explain": "Ücretiz bir cüzdan için aşağıda kaydolun",
"scenes.register.login": "Giriş",
"scenes.register.msiewarning": null,
"scenes.register.or": " veya ",
"scenes.register.password": "Şifre",
"scenes.register.registerform.blockchain.read": null,
Expand Down

0 comments on commit 63a2a75

Please sign in to comment.