diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 5408734ae..a14182527 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -144,6 +144,9 @@ class S implements WidgetsLocalizations { String get reset => "Reset"; String get restore_active_seed => "Active seed"; String get restore_address => "Address"; + String get restore_bitcoin_description_from_keys => "Restore your wallet from generated WIF string from your private keys"; + String get restore_bitcoin_description_from_seed => "Restore your wallet from 12 word combination code"; + String get restore_bitcoin_title_from_keys => "Restore from WIF"; String get restore_description_from_backup => "You can restore the whole Cake Wallet app from your back-up file"; String get restore_description_from_keys => "Restore your wallet from generated keystrokes saved from your private keys"; String get restore_description_from_seed => "Restore your wallet from either the 25 word or 13 word combination code"; @@ -496,6 +499,8 @@ class $de extends S { @override String get settings_title => "die Einstellungen"; @override + String get restore_bitcoin_description_from_seed => "Stellen Sie Ihre Brieftasche aus dem 12-Wort-Kombinationscode wieder her"; + @override String get address_book_menu => "Adressbuch"; @override String get wallet_restoration_store_incorrect_seed_length => "Falsche Samenlänge"; @@ -630,6 +635,10 @@ class $de extends S { @override String get xmr_available_balance => "XMR verfügbares Guthaben"; @override + String get restore_bitcoin_description_from_keys => "Stellen Sie Ihre Brieftasche aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her"; + @override + String get restore_bitcoin_title_from_keys => "Aus WIF wiederherstellen"; + @override String get scan_qr_code => "Scannen Sie den QR-Code, um die Adresse zu erhalten"; @override String get trade_state_paid => "Bezahlt"; @@ -1128,6 +1137,8 @@ class $hi extends S { @override String get settings_title => "सेटिंग्स"; @override + String get restore_bitcoin_description_from_seed => "12 शब्द संयोजन कोड से अपने वॉलेट को पुनर्स्थापित करें"; + @override String get address_book_menu => "पता पुस्तिका"; @override String get wallet_restoration_store_incorrect_seed_length => "गलत बीज की लंबाई"; @@ -1262,6 +1273,10 @@ class $hi extends S { @override String get xmr_available_balance => "XMR उपलब्ध शेष राशि"; @override + String get restore_bitcoin_description_from_keys => "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें"; + @override + String get restore_bitcoin_title_from_keys => "WIF से पुनर्स्थापित करें"; + @override String get scan_qr_code => "पता प्राप्त करने के लिए QR कोड स्कैन करें"; @override String get trade_state_paid => "भुगतान किया है"; @@ -1760,6 +1775,8 @@ class $ru extends S { @override String get settings_title => "Настройки"; @override + String get restore_bitcoin_description_from_seed => "Вы можете восстановить кошелёк используя 12-ти значную мнемоническую фразу"; + @override String get address_book_menu => "Адресная книга"; @override String get wallet_restoration_store_incorrect_seed_length => "Неверная длина мнемонической фразы"; @@ -1894,6 +1911,10 @@ class $ru extends S { @override String get xmr_available_balance => "Доступный XMR баланс"; @override + String get restore_bitcoin_description_from_keys => "Вы можете восстановить кошелёк с помощью WIF"; + @override + String get restore_bitcoin_title_from_keys => "Восстановить с помощью WIF"; + @override String get scan_qr_code => "Отсканируйте QR-код для получения адреса"; @override String get trade_state_paid => "Оплаченная"; @@ -2392,6 +2413,8 @@ class $ko extends S { @override String get settings_title => "설정"; @override + String get restore_bitcoin_description_from_seed => "12 단어 조합 코드에서 지갑 복원"; + @override String get address_book_menu => "주소록"; @override String get wallet_restoration_store_incorrect_seed_length => "시드 길이가 잘못되었습니다"; @@ -2526,6 +2549,10 @@ class $ko extends S { @override String get xmr_available_balance => "XMR 사용 가능한 잔액"; @override + String get restore_bitcoin_description_from_keys => "개인 키에서 생성 된 WIF 문자열에서 지갑 복원"; + @override + String get restore_bitcoin_title_from_keys => "WIF에서 복원"; + @override String get scan_qr_code => "QR 코드를 스캔하여 주소를 얻습니다."; @override String get trade_state_paid => "유료"; @@ -3024,6 +3051,8 @@ class $pt extends S { @override String get settings_title => "Configurações"; @override + String get restore_bitcoin_description_from_seed => "Restaure sua carteira a partir de um código de combinação de 12 palavras"; + @override String get address_book_menu => "Livro de endereços"; @override String get wallet_restoration_store_incorrect_seed_length => "Comprimento de semente incorreto"; @@ -3158,6 +3187,10 @@ class $pt extends S { @override String get xmr_available_balance => "Saldo XMR disponível"; @override + String get restore_bitcoin_description_from_keys => "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas"; + @override + String get restore_bitcoin_title_from_keys => "Restaurar de WIF"; + @override String get scan_qr_code => "Digitalize o código QR para obter o endereço"; @override String get trade_state_paid => "Paga"; @@ -3656,6 +3689,8 @@ class $uk extends S { @override String get settings_title => "Налаштування"; @override + String get restore_bitcoin_description_from_seed => "Ви можете відновити гаманець використовуючи 12-ти слівну мнемонічну фразу"; + @override String get address_book_menu => "Адресна книга"; @override String get wallet_restoration_store_incorrect_seed_length => "Невірна довжина мнемонічної фрази"; @@ -3790,6 +3825,10 @@ class $uk extends S { @override String get xmr_available_balance => "Доступний XMR баланс"; @override + String get restore_bitcoin_description_from_keys => "Ви можете відновити гаманець за допомогою WIF"; + @override + String get restore_bitcoin_title_from_keys => "Відновити за допомогою WIF"; + @override String get scan_qr_code => "Скануйте QR-код для одержання адреси"; @override String get trade_state_paid => "Оплачена"; @@ -4288,6 +4327,8 @@ class $ja extends S { @override String get settings_title => "設定"; @override + String get restore_bitcoin_description_from_seed => "12ワードの組み合わせコードからウォレットを復元する"; + @override String get address_book_menu => "住所録"; @override String get wallet_restoration_store_incorrect_seed_length => "誤ったシード長s"; @@ -4422,6 +4463,10 @@ class $ja extends S { @override String get xmr_available_balance => "XMR利用可能残高"; @override + String get restore_bitcoin_description_from_keys => "秘密鍵から生成されたWIF文字列からウォレットを復元します"; + @override + String get restore_bitcoin_title_from_keys => "WIFから復元"; + @override String get scan_qr_code => "QRコードをスキャンして住所を取得します"; @override String get trade_state_paid => "有料"; @@ -4924,6 +4969,8 @@ class $pl extends S { @override String get settings_title => "Ustawienia"; @override + String get restore_bitcoin_description_from_seed => "Przywróć swój portfel z kodu złożonego z 12 słów"; + @override String get address_book_menu => "Książka adresowa"; @override String get wallet_restoration_store_incorrect_seed_length => "Nieprawidłowa długość nasion"; @@ -5058,6 +5105,10 @@ class $pl extends S { @override String get xmr_available_balance => "XMR Dostępne saldo"; @override + String get restore_bitcoin_description_from_keys => "Przywróć swój portfel z wygenerowanego ciągu WIF z kluczy prywatnych"; + @override + String get restore_bitcoin_title_from_keys => "Przywróć z WIF"; + @override String get scan_qr_code => "Zeskanuj kod QR, aby uzyskać adres"; @override String get trade_state_paid => "Płatny"; @@ -5556,6 +5607,8 @@ class $es extends S { @override String get settings_title => "Configuraciones"; @override + String get restore_bitcoin_description_from_seed => "Restaure su billetera a partir del código de combinación de 12 palabras"; + @override String get address_book_menu => "Libreta de direcciones"; @override String get wallet_restoration_store_incorrect_seed_length => "Longitud de semilla incorrecta"; @@ -5690,6 +5743,10 @@ class $es extends S { @override String get xmr_available_balance => "XMR Available Balance"; @override + String get restore_bitcoin_description_from_keys => "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas"; + @override + String get restore_bitcoin_title_from_keys => "Restaurar desde WIF"; + @override String get scan_qr_code => "Escanee el código QR para obtener la dirección"; @override String get trade_state_paid => "Pagado"; @@ -6188,6 +6245,8 @@ class $nl extends S { @override String get settings_title => "Instellingen"; @override + String get restore_bitcoin_description_from_seed => "Herstel uw portemonnee met een combinatiecode van 12 woorden"; + @override String get address_book_menu => "Adresboek"; @override String get wallet_restoration_store_incorrect_seed_length => "Onjuiste zaadlengte"; @@ -6322,6 +6381,10 @@ class $nl extends S { @override String get xmr_available_balance => "XMR Beschikbaar saldo"; @override + String get restore_bitcoin_description_from_keys => "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels"; + @override + String get restore_bitcoin_title_from_keys => "Herstel van WIF"; + @override String get scan_qr_code => "Scan de QR-code om het adres te krijgen"; @override String get trade_state_paid => "Betaald"; @@ -6820,6 +6883,8 @@ class $zh extends S { @override String get settings_title => "设定值"; @override + String get restore_bitcoin_description_from_seed => "從12個單詞的組合碼恢復您的錢包"; + @override String get address_book_menu => "地址簿"; @override String get wallet_restoration_store_incorrect_seed_length => "种子长度错误"; @@ -6954,6 +7019,10 @@ class $zh extends S { @override String get xmr_available_balance => "XMR 可用余额 "; @override + String get restore_bitcoin_description_from_keys => "從私鑰中生成的WIF字符串還原您的錢包"; + @override + String get restore_bitcoin_title_from_keys => "從WIF還原"; + @override String get scan_qr_code => "掃描二維碼獲取地址"; @override String get trade_state_paid => "已付费"; diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index 473d2d6ce..60d780d2d 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -153,7 +153,8 @@ class _WalletNameFormState extends State { builder: (context) { return LoadingPrimaryButton( onPressed: _confirmForm, - text: S.of(context).continue_text, + //text: S.of(context).continue_text, + text: S.of(context).seed_language_next, color: Colors.green, textColor: Colors.white, isLoading: _walletNewVM.state is WalletCreatedSuccessfully, diff --git a/lib/src/screens/restore/restore_wallet_options_page.dart b/lib/src/screens/restore/restore_wallet_options_page.dart index bb805e7c0..57bf6642a 100644 --- a/lib/src/screens/restore/restore_wallet_options_page.dart +++ b/lib/src/screens/restore/restore_wallet_options_page.dart @@ -1,11 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/restore/widgets/restore_button.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/domain/common/wallet_type.dart'; import 'package:cake_wallet/generated/i18n.dart'; -import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; class RestoreWalletOptionsPage extends BasePage { RestoreWalletOptionsPage( @@ -56,7 +53,7 @@ class RestoreWalletOptionsPage extends BasePage { return S.of(context).restore_description_from_seed; case WalletType.bitcoin: // TODO: Add transaction for bitcoin description. - return 'Restore your wallet from 12 word combination code'; + return S.of(context).restore_bitcoin_description_from_seed; default: return ''; } @@ -68,7 +65,7 @@ class RestoreWalletOptionsPage extends BasePage { return S.of(context).restore_description_from_keys; case WalletType.bitcoin: // TODO: Add transaction for bitcoin description. - return 'Restore your wallet from generated WIF string from your private keys'; + return S.of(context).restore_bitcoin_description_from_keys; default: return ''; } @@ -80,7 +77,7 @@ class RestoreWalletOptionsPage extends BasePage { return S.of(context).restore_title_from_keys; case WalletType.bitcoin: // TODO: Add transaction for bitcoin description. - return 'Restore from WIF'; + return S.of(context).restore_bitcoin_title_from_keys; default: return ''; } diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart index 72630492f..8945d51c4 100644 --- a/lib/src/screens/restore/widgets/restore_button.dart +++ b/lib/src/screens/restore/widgets/restore_button.dart @@ -19,7 +19,7 @@ class RestoreButton extends StatelessWidget { onTap: onPressed, child: Container( width: double.infinity, - height: 160, + height: 170, padding: EdgeInsets.all(24), alignment: Alignment.topLeft, decoration: BoxDecoration( diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 68095ca01..219e17320 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Beschreibung zur Wiederherstellung der Brieftasche", "restore_new_seed" : "Neuer Seed", "restore_active_seed" : "Aktives Seed", + "restore_bitcoin_description_from_seed" : "Stellen Sie Ihre Brieftasche aus dem 12-Wort-Kombinationscode wieder her", + "restore_bitcoin_description_from_keys" : "Stellen Sie Ihre Brieftasche aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her", + "restore_bitcoin_title_from_keys" : "Aus WIF wiederherstellen", "seed_title" : "Seed", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 277ce28ba..82afbe400 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Wallet restore description", "restore_new_seed" : "New seed", "restore_active_seed" : "Active seed", + "restore_bitcoin_description_from_seed" : "Restore your wallet from 12 word combination code", + "restore_bitcoin_description_from_keys" : "Restore your wallet from generated WIF string from your private keys", + "restore_bitcoin_title_from_keys" : "Restore from WIF", "seed_title" : "Seed", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index f6cc257f6..f01e9002b 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Restaurar billetera", "restore_new_seed" : "Nueva semilla", "restore_active_seed" : "Semilla activa", + "restore_bitcoin_description_from_seed" : "Restaure su billetera a partir del código de combinación de 12 palabras", + "restore_bitcoin_description_from_keys" : "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas", + "restore_bitcoin_title_from_keys" : "Restaurar desde WIF", "seed_title" : "Semilla", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 9e0e1a032..7b0d95adf 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "बटुआ विवरण पुनर्स्थापित करें", "restore_new_seed" : "नया बीज", "restore_active_seed" : "सक्रिय बीज", + "restore_bitcoin_description_from_seed" : "12 शब्द संयोजन कोड से अपने वॉलेट को पुनर्स्थापित करें", + "restore_bitcoin_description_from_keys" : "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें", + "restore_bitcoin_title_from_keys" : "WIF से पुनर्स्थापित करें", "seed_title" : "बीज", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index a1822f806..000475bd8 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "ウォレットの復元", "restore_new_seed" : "新しい種", "restore_active_seed" : "アクティブシード", + "restore_bitcoin_description_from_seed" : "12ワードの組み合わせコードからウォレットを復元する", + "restore_bitcoin_description_from_keys" : "秘密鍵から生成されたWIF文字列からウォレットを復元します", + "restore_bitcoin_title_from_keys" : "WIFから復元", "seed_title" : "シード", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 31d7f6cfd..c33dded12 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "월렛 복원 설명", "restore_new_seed" : "새로운 씨앗", "restore_active_seed" : "활성 종자", + "restore_bitcoin_description_from_seed" : "12 단어 조합 코드에서 지갑 복원", + "restore_bitcoin_description_from_keys" : "개인 키에서 생성 된 WIF 문자열에서 지갑 복원", + "restore_bitcoin_title_from_keys" : "WIF에서 복원", "seed_title" : "씨", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 542be0271..2fc68aef3 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Portemonnee-herstelbeschrijving", "restore_new_seed" : "Nieuw zaad", "restore_active_seed" : "Actief zaad", + "restore_bitcoin_description_from_seed" : "Herstel uw portemonnee met een combinatiecode van 12 woorden", + "restore_bitcoin_description_from_keys" : "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels", + "restore_bitcoin_title_from_keys" : "Herstel van WIF", "seed_title" : "Zaad", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index da2bd6f2e..5970fadb8 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Opis przywracania portfela", "restore_new_seed" : "Nowe nasienie", "restore_active_seed" : "Aktywne nasiona", + "restore_bitcoin_description_from_seed" : "Przywróć swój portfel z kodu złożonego z 12 słów", + "restore_bitcoin_description_from_keys" : "Przywróć swój portfel z wygenerowanego ciągu WIF z kluczy prywatnych", + "restore_bitcoin_title_from_keys" : "Przywróć z WIF", "seed_title" : "Ziarno", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 7f4df2a4a..f085280bf 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Restauração da carteira", "restore_new_seed" : "Nova semente", "restore_active_seed" : "Semente ativa", + "restore_bitcoin_description_from_seed" : "Restaure sua carteira a partir de um código de combinação de 12 palavras", + "restore_bitcoin_description_from_keys" : "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas", + "restore_bitcoin_title_from_keys" : "Restaurar de WIF", "seed_title" : "Semente", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index b5f82e379..68c1453b3 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Описание восстановления кошелька", "restore_new_seed" : "Новая мнемоническая фраза", "restore_active_seed" : "Активная мнемоническая фраза", + "restore_bitcoin_description_from_seed" : "Вы можете восстановить кошелёк используя 12-ти значную мнемоническую фразу", + "restore_bitcoin_description_from_keys" : "Вы можете восстановить кошелёк с помощью WIF", + "restore_bitcoin_title_from_keys" : "Восстановить с помощью WIF", "seed_title" : "Мнемоническая фраза", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index bcfc96688..2cf2119b2 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "Опис відновлюваного гаманця", "restore_new_seed" : "Нова мнемонічна фраза", "restore_active_seed" : "Активна мнемонічна фраза", + "restore_bitcoin_description_from_seed" : "Ви можете відновити гаманець використовуючи 12-ти слівну мнемонічну фразу", + "restore_bitcoin_description_from_keys" : "Ви можете відновити гаманець за допомогою WIF", + "restore_bitcoin_title_from_keys" : "Відновити за допомогою WIF", "seed_title" : "Мнемонічна фраза", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 0f5794a10..8fcce5de1 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -165,6 +165,9 @@ "restore_wallet_restore_description" : "钱包还原说明", "restore_new_seed" : "新種子", "restore_active_seed" : "活性種子", + "restore_bitcoin_description_from_seed" : "從12個單詞的組合碼恢復您的錢包", + "restore_bitcoin_description_from_keys" : "從私鑰中生成的WIF字符串還原您的錢包", + "restore_bitcoin_title_from_keys" : "從WIF還原", "seed_title" : "种子",