@samitouri / QOSAMI-cakewallet / commits / a76266ef4

CAKE-31 | changed height of restore button; changed button title in the new wallet page; localized string resources from restore wallet options page

Oleksandr Sobol committed Sep 4, 2020 at 14:36 UTC a76266ef40680f544ac0e9654fba65d212815d06

16 files changed +111 -8

lib/generated/i18n.dart

+69

@@ -144,6 +144,9 @@ class S implements WidgetsLocalizations {

144 String get reset => "Reset";

145 String get restore_active_seed => "Active seed";

146 String get restore_address => "Address";

147 + String get restore_bitcoin_description_from_keys => "Restore your wallet from generated WIF string from your private keys";

148 + String get restore_bitcoin_description_from_seed => "Restore your wallet from 12 word combination code";

149 + String get restore_bitcoin_title_from_keys => "Restore from WIF";

150 String get restore_description_from_backup => "You can restore the whole Cake Wallet app from your back-up file";

151 String get restore_description_from_keys => "Restore your wallet from generated keystrokes saved from your private keys";

152 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 {

499 @override

500 String get settings_title => "die Einstellungen";

501 @override

502 + String get restore_bitcoin_description_from_seed => "Stellen Sie Ihre Brieftasche aus dem 12-Wort-Kombinationscode wieder her";

503 + @override

504 String get address_book_menu => "Adressbuch";

505 @override

506 String get wallet_restoration_store_incorrect_seed_length => "Falsche Samenlänge";

@@ -630,6 +635,10 @@ class $de extends S {

635 @override

636 String get xmr_available_balance => "XMR verfügbares Guthaben";

637 @override

638 + String get restore_bitcoin_description_from_keys => "Stellen Sie Ihre Brieftasche aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her";

639 + @override

640 + String get restore_bitcoin_title_from_keys => "Aus WIF wiederherstellen";

641 + @override

642 String get scan_qr_code => "Scannen Sie den QR-Code, um die Adresse zu erhalten";

643 @override

644 String get trade_state_paid => "Bezahlt";

@@ -1128,6 +1137,8 @@ class $hi extends S {

1137 @override

1138 String get settings_title => "सेटिंग्स";

1139 @override

1140 + String get restore_bitcoin_description_from_seed => "12 शब्द संयोजन कोड से अपने वॉलेट को पुनर्स्थापित करें";

1141 + @override

1142 String get address_book_menu => "पता पुस्तिका";

1143 @override

1144 String get wallet_restoration_store_incorrect_seed_length => "गलत बीज की लंबाई";

@@ -1262,6 +1273,10 @@ class $hi extends S {

1273 @override

1274 String get xmr_available_balance => "XMR उपलब्ध शेष राशि";

1275 @override

1276 + String get restore_bitcoin_description_from_keys => "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें";

1277 + @override

1278 + String get restore_bitcoin_title_from_keys => "WIF से पुनर्स्थापित करें";

1279 + @override

1280 String get scan_qr_code => "पता प्राप्त करने के लिए QR कोड स्कैन करें";

1281 @override

1282 String get trade_state_paid => "भुगतान किया है";

@@ -1760,6 +1775,8 @@ class $ru extends S {

1775 @override

1776 String get settings_title => "Настройки";

1777 @override

1778 + String get restore_bitcoin_description_from_seed => "Вы можете восстановить кошелёк используя 12-ти значную мнемоническую фразу";

1779 + @override

1780 String get address_book_menu => "Адресная книга";

1781 @override

1782 String get wallet_restoration_store_incorrect_seed_length => "Неверная длина мнемонической фразы";

@@ -1894,6 +1911,10 @@ class $ru extends S {

1911 @override

1912 String get xmr_available_balance => "Доступный XMR баланс";

1913 @override

1914 + String get restore_bitcoin_description_from_keys => "Вы можете восстановить кошелёк с помощью WIF";

1915 + @override

1916 + String get restore_bitcoin_title_from_keys => "Восстановить с помощью WIF";

1917 + @override

1918 String get scan_qr_code => "Отсканируйте QR-код для получения адреса";

1919 @override

1920 String get trade_state_paid => "Оплаченная";

@@ -2392,6 +2413,8 @@ class $ko extends S {

2413 @override

2414 String get settings_title => "설정";

2415 @override

2416 + String get restore_bitcoin_description_from_seed => "12 단어 조합 코드에서 지갑 복원";

2417 + @override

2418 String get address_book_menu => "주소록";

2419 @override

2420 String get wallet_restoration_store_incorrect_seed_length => "시드 길이가 잘못되었습니다";

@@ -2526,6 +2549,10 @@ class $ko extends S {

2549 @override

2550 String get xmr_available_balance => "XMR 사용 가능한 잔액";

2551 @override

2552 + String get restore_bitcoin_description_from_keys => "개인 키에서 생성 된 WIF 문자열에서 지갑 복원";

2553 + @override

2554 + String get restore_bitcoin_title_from_keys => "WIF에서 복원";

2555 + @override

2556 String get scan_qr_code => "QR 코드를 스캔하여 주소를 얻습니다.";

2557 @override

2558 String get trade_state_paid => "유료";

@@ -3024,6 +3051,8 @@ class $pt extends S {

3051 @override

3052 String get settings_title => "Configurações";

3053 @override

3054 + String get restore_bitcoin_description_from_seed => "Restaure sua carteira a partir de um código de combinação de 12 palavras";

3055 + @override

3056 String get address_book_menu => "Livro de endereços";

3057 @override

3058 String get wallet_restoration_store_incorrect_seed_length => "Comprimento de semente incorreto";

@@ -3158,6 +3187,10 @@ class $pt extends S {

3187 @override

3188 String get xmr_available_balance => "Saldo XMR disponível";

3189 @override

3190 + String get restore_bitcoin_description_from_keys => "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas";

3191 + @override

3192 + String get restore_bitcoin_title_from_keys => "Restaurar de WIF";

3193 + @override

3194 String get scan_qr_code => "Digitalize o código QR para obter o endereço";

3195 @override

3196 String get trade_state_paid => "Paga";

@@ -3656,6 +3689,8 @@ class $uk extends S {

3689 @override

3690 String get settings_title => "Налаштування";

3691 @override

3692 + String get restore_bitcoin_description_from_seed => "Ви можете відновити гаманець використовуючи 12-ти слівну мнемонічну фразу";

3693 + @override

3694 String get address_book_menu => "Адресна книга";

3695 @override

3696 String get wallet_restoration_store_incorrect_seed_length => "Невірна довжина мнемонічної фрази";

@@ -3790,6 +3825,10 @@ class $uk extends S {

3825 @override

3826 String get xmr_available_balance => "Доступний XMR баланс";

3827 @override

3828 + String get restore_bitcoin_description_from_keys => "Ви можете відновити гаманець за допомогою WIF";

3829 + @override

3830 + String get restore_bitcoin_title_from_keys => "Відновити за допомогою WIF";

3831 + @override

3832 String get scan_qr_code => "Скануйте QR-код для одержання адреси";

3833 @override

3834 String get trade_state_paid => "Оплачена";

@@ -4288,6 +4327,8 @@ class $ja extends S {

4327 @override

4328 String get settings_title => "設定";

4329 @override

4330 + String get restore_bitcoin_description_from_seed => "12ワードの組み合わせコードからウォレットを復元する";

4331 + @override

4332 String get address_book_menu => "住所録";

4333 @override

4334 String get wallet_restoration_store_incorrect_seed_length => "誤ったシード長s";

@@ -4422,6 +4463,10 @@ class $ja extends S {

4463 @override

4464 String get xmr_available_balance => "XMR利用可能残高";

4465 @override

4466 + String get restore_bitcoin_description_from_keys => "秘密鍵から生成されたWIF文字列からウォレットを復元します";

4467 + @override

4468 + String get restore_bitcoin_title_from_keys => "WIFから復元";

4469 + @override

4470 String get scan_qr_code => "QRコードをスキャンして住所を取得します";

4471 @override

4472 String get trade_state_paid => "有料";

@@ -4924,6 +4969,8 @@ class $pl extends S {

4969 @override

4970 String get settings_title => "Ustawienia";

4971 @override

4972 + String get restore_bitcoin_description_from_seed => "Przywróć swój portfel z kodu złożonego z 12 słów";

4973 + @override

4974 String get address_book_menu => "Książka adresowa";

4975 @override

4976 String get wallet_restoration_store_incorrect_seed_length => "Nieprawidłowa długość nasion";

@@ -5058,6 +5105,10 @@ class $pl extends S {

5105 @override

5106 String get xmr_available_balance => "XMR Dostępne saldo";

5107 @override

5108 + String get restore_bitcoin_description_from_keys => "Przywróć swój portfel z wygenerowanego ciągu WIF z kluczy prywatnych";

5109 + @override

5110 + String get restore_bitcoin_title_from_keys => "Przywróć z WIF";

5111 + @override

5112 String get scan_qr_code => "Zeskanuj kod QR, aby uzyskać adres";

5113 @override

5114 String get trade_state_paid => "Płatny";

@@ -5556,6 +5607,8 @@ class $es extends S {

5607 @override

5608 String get settings_title => "Configuraciones";

5609 @override

5610 + String get restore_bitcoin_description_from_seed => "Restaure su billetera a partir del código de combinación de 12 palabras";

5611 + @override

5612 String get address_book_menu => "Libreta de direcciones";

5613 @override

5614 String get wallet_restoration_store_incorrect_seed_length => "Longitud de semilla incorrecta";

@@ -5690,6 +5743,10 @@ class $es extends S {

5743 @override

5744 String get xmr_available_balance => "XMR Available Balance";

5745 @override

5746 + String get restore_bitcoin_description_from_keys => "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas";

5747 + @override

5748 + String get restore_bitcoin_title_from_keys => "Restaurar desde WIF";

5749 + @override

5750 String get scan_qr_code => "Escanee el código QR para obtener la dirección";

5751 @override

5752 String get trade_state_paid => "Pagado";

@@ -6188,6 +6245,8 @@ class $nl extends S {

6245 @override

6246 String get settings_title => "Instellingen";

6247 @override

6248 + String get restore_bitcoin_description_from_seed => "Herstel uw portemonnee met een combinatiecode van 12 woorden";

6249 + @override

6250 String get address_book_menu => "Adresboek";

6251 @override

6252 String get wallet_restoration_store_incorrect_seed_length => "Onjuiste zaadlengte";

@@ -6322,6 +6381,10 @@ class $nl extends S {

6381 @override

6382 String get xmr_available_balance => "XMR Beschikbaar saldo";

6383 @override

6384 + String get restore_bitcoin_description_from_keys => "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels";

6385 + @override

6386 + String get restore_bitcoin_title_from_keys => "Herstel van WIF";

6387 + @override

6388 String get scan_qr_code => "Scan de QR-code om het adres te krijgen";

6389 @override

6390 String get trade_state_paid => "Betaald";

@@ -6820,6 +6883,8 @@ class $zh extends S {

6883 @override

6884 String get settings_title => "设定值";

6885 @override

6886 + String get restore_bitcoin_description_from_seed => "從12個單詞的組合碼恢復您的錢包";

6887 + @override

6888 String get address_book_menu => "地址簿";

6889 @override

6890 String get wallet_restoration_store_incorrect_seed_length => "种子长度错误";

@@ -6954,6 +7019,10 @@ class $zh extends S {

7019 @override

7020 String get xmr_available_balance => "XMR 可用余额 ";

7021 @override

7022 + String get restore_bitcoin_description_from_keys => "從私鑰中生成的WIF字符串還原您的錢包";

7023 + @override

7024 + String get restore_bitcoin_title_from_keys => "從WIF還原";

7025 + @override

7026 String get scan_qr_code => "掃描二維碼獲取地址";

7027 @override

7028 String get trade_state_paid => "已付费";

lib/src/screens/new_wallet/new_wallet_page.dart

+2 -1

@@ -153,7 +153,8 @@ class _WalletNameFormState extends State<WalletNameForm> {

153 builder: (context) {

154 return LoadingPrimaryButton(

155 onPressed: _confirmForm,

156 - text: S.of(context).continue_text,

156 + //text: S.of(context).continue_text,

157 + text: S.of(context).seed_language_next,

158 color: Colors.green,

159 textColor: Colors.white,

160 isLoading: _walletNewVM.state is WalletCreatedSuccessfully,

lib/src/screens/restore/restore_wallet_options_page.dart

+3 -6

@@ -1,11 +1,8 @@

1 import 'package:flutter/material.dart';

2 -import 'package:provider/provider.dart';

3 -import 'package:cake_wallet/routes.dart';

2 import 'package:cake_wallet/src/screens/restore/widgets/restore_button.dart';

3 import 'package:cake_wallet/src/screens/base_page.dart';

4 import 'package:cake_wallet/src/domain/common/wallet_type.dart';

5 import 'package:cake_wallet/generated/i18n.dart';

8 -import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';

7 class RestoreWalletOptionsPage extends BasePage {

8 RestoreWalletOptionsPage(

@@ -56,7 +53,7 @@ class RestoreWalletOptionsPage extends BasePage {

53 return S.of(context).restore_description_from_seed;

54 case WalletType.bitcoin:

55 // TODO: Add transaction for bitcoin description.

59 - return 'Restore your wallet from 12 word combination code';

56 + return S.of(context).restore_bitcoin_description_from_seed;

57 default:

58 return '';

59 }

@@ -68,7 +65,7 @@ class RestoreWalletOptionsPage extends BasePage {

65 return S.of(context).restore_description_from_keys;

66 case WalletType.bitcoin:

67 // TODO: Add transaction for bitcoin description.

71 - return 'Restore your wallet from generated WIF string from your private keys';

68 + return S.of(context).restore_bitcoin_description_from_keys;

69 default:

70 return '';

71 }

@@ -80,7 +77,7 @@ class RestoreWalletOptionsPage extends BasePage {

77 return S.of(context).restore_title_from_keys;

78 case WalletType.bitcoin:

79 // TODO: Add transaction for bitcoin description.

83 - return 'Restore from WIF';

80 + return S.of(context).restore_bitcoin_title_from_keys;

81 default:

82 return '';

83 }

lib/src/screens/restore/widgets/restore_button.dart

+1 -1

@@ -19,7 +19,7 @@ class RestoreButton extends StatelessWidget {

19 onTap: onPressed,

20 child: Container(

21 width: double.infinity,

22 - height: 160,

22 + height: 170,

23 padding: EdgeInsets.all(24),

24 alignment: Alignment.topLeft,

25 decoration: BoxDecoration(

res/values/strings_de.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Beschreibung zur Wiederherstellung der Brieftasche",

166 "restore_new_seed" : "Neuer Seed",

167 "restore_active_seed" : "Aktives Seed",

168 + "restore_bitcoin_description_from_seed" : "Stellen Sie Ihre Brieftasche aus dem 12-Wort-Kombinationscode wieder her",

169 + "restore_bitcoin_description_from_keys" : "Stellen Sie Ihre Brieftasche aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her",

170 + "restore_bitcoin_title_from_keys" : "Aus WIF wiederherstellen",

171

172

173 "seed_title" : "Seed",

res/values/strings_en.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Wallet restore description",

166 "restore_new_seed" : "New seed",

167 "restore_active_seed" : "Active seed",

168 + "restore_bitcoin_description_from_seed" : "Restore your wallet from 12 word combination code",

169 + "restore_bitcoin_description_from_keys" : "Restore your wallet from generated WIF string from your private keys",

170 + "restore_bitcoin_title_from_keys" : "Restore from WIF",

171

172

173 "seed_title" : "Seed",

res/values/strings_es.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Restaurar billetera",

166 "restore_new_seed" : "Nueva semilla",

167 "restore_active_seed" : "Semilla activa",

168 + "restore_bitcoin_description_from_seed" : "Restaure su billetera a partir del código de combinación de 12 palabras",

169 + "restore_bitcoin_description_from_keys" : "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas",

170 + "restore_bitcoin_title_from_keys" : "Restaurar desde WIF",

171

172

173 "seed_title" : "Semilla",

res/values/strings_hi.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "बटुआ विवरण पुनर्स्थापित करें",

166 "restore_new_seed" : "नया बीज",

167 "restore_active_seed" : "सक्रिय बीज",

168 + "restore_bitcoin_description_from_seed" : "12 शब्द संयोजन कोड से अपने वॉलेट को पुनर्स्थापित करें",

169 + "restore_bitcoin_description_from_keys" : "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें",

170 + "restore_bitcoin_title_from_keys" : "WIF से पुनर्स्थापित करें",

171

172

173 "seed_title" : "बीज",

res/values/strings_ja.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "ウォレットの復元",

166 "restore_new_seed" : "新しい種",

167 "restore_active_seed" : "アクティブシード",

168 + "restore_bitcoin_description_from_seed" : "12ワードの組み合わせコードからウォレットを復元する",

169 + "restore_bitcoin_description_from_keys" : "秘密鍵から生成されたWIF文字列からウォレットを復元します",

170 + "restore_bitcoin_title_from_keys" : "WIFから復元",

171

172

173 "seed_title" : "シード",

res/values/strings_ko.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "월렛 복원 설명",

166 "restore_new_seed" : "새로운 씨앗",

167 "restore_active_seed" : "활성 종자",

168 + "restore_bitcoin_description_from_seed" : "12 단어 조합 코드에서 지갑 복원",

169 + "restore_bitcoin_description_from_keys" : "개인 키에서 생성 된 WIF 문자열에서 지갑 복원",

170 + "restore_bitcoin_title_from_keys" : "WIF에서 복원",

171

172

173 "seed_title" : "씨",

res/values/strings_nl.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Portemonnee-herstelbeschrijving",

166 "restore_new_seed" : "Nieuw zaad",

167 "restore_active_seed" : "Actief zaad",

168 + "restore_bitcoin_description_from_seed" : "Herstel uw portemonnee met een combinatiecode van 12 woorden",

169 + "restore_bitcoin_description_from_keys" : "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels",

170 + "restore_bitcoin_title_from_keys" : "Herstel van WIF",

171

172

173 "seed_title" : "Zaad",

res/values/strings_pl.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Opis przywracania portfela",

166 "restore_new_seed" : "Nowe nasienie",

167 "restore_active_seed" : "Aktywne nasiona",

168 + "restore_bitcoin_description_from_seed" : "Przywróć swój portfel z kodu złożonego z 12 słów",

169 + "restore_bitcoin_description_from_keys" : "Przywróć swój portfel z wygenerowanego ciągu WIF z kluczy prywatnych",

170 + "restore_bitcoin_title_from_keys" : "Przywróć z WIF",

171

172

173 "seed_title" : "Ziarno",

res/values/strings_pt.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Restauração da carteira",

166 "restore_new_seed" : "Nova semente",

167 "restore_active_seed" : "Semente ativa",

168 + "restore_bitcoin_description_from_seed" : "Restaure sua carteira a partir de um código de combinação de 12 palavras",

169 + "restore_bitcoin_description_from_keys" : "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas",

170 + "restore_bitcoin_title_from_keys" : "Restaurar de WIF",

171

172

173 "seed_title" : "Semente",

res/values/strings_ru.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Описание восстановления кошелька",

166 "restore_new_seed" : "Новая мнемоническая фраза",

167 "restore_active_seed" : "Активная мнемоническая фраза",

168 + "restore_bitcoin_description_from_seed" : "Вы можете восстановить кошелёк используя 12-ти значную мнемоническую фразу",

169 + "restore_bitcoin_description_from_keys" : "Вы можете восстановить кошелёк с помощью WIF",

170 + "restore_bitcoin_title_from_keys" : "Восстановить с помощью WIF",

171

172

173 "seed_title" : "Мнемоническая фраза",

res/values/strings_uk.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "Опис відновлюваного гаманця",

166 "restore_new_seed" : "Нова мнемонічна фраза",

167 "restore_active_seed" : "Активна мнемонічна фраза",

168 + "restore_bitcoin_description_from_seed" : "Ви можете відновити гаманець використовуючи 12-ти слівну мнемонічну фразу",

169 + "restore_bitcoin_description_from_keys" : "Ви можете відновити гаманець за допомогою WIF",

170 + "restore_bitcoin_title_from_keys" : "Відновити за допомогою WIF",

171

172

173 "seed_title" : "Мнемонічна фраза",

res/values/strings_zh.arb

@@ -165,6 +165,9 @@

165 "restore_wallet_restore_description" : "钱包还原说明",

166 "restore_new_seed" : "新種子",

167 "restore_active_seed" : "活性種子",

168 + "restore_bitcoin_description_from_seed" : "從12個單詞的組合碼恢復您的錢包",

169 + "restore_bitcoin_description_from_keys" : "從私鑰中生成的WIF字符串還原您的錢包",

170 + "restore_bitcoin_title_from_keys" : "從WIF還原",

171

172

173 "seed_title" : "种子",