Merge branch 'newdesign' into CWA-205-update-restore-wallet-screens

# Conflicts:
#	lib/src/screens/exchange/exchange_page.dart
#	lib/src/screens/new_wallet/new_wallet_page.dart
#	lib/src/screens/new_wallet/widgets/select_button.dart
#	lib/src/screens/rescan/rescan_page.dart
#	lib/src/screens/restore/restore_wallet_from_keys_page.dart
#	lib/src/screens/restore/restore_wallet_from_seed_details.dart
#	lib/src/screens/seed_language/widgets/seed_language_picker.dart
#	lib/src/widgets/primary_button.dart
This commit is contained in:
Oleksandr Sobol
2020-05-01 22:51:27 +03:00
74 changed files with 864 additions and 465 deletions
+94 -48
View File
@@ -40,12 +40,14 @@ class S implements WidgetsLocalizations {
String get available_balance => "Available Balance";
String get biometric_auth_reason => "Scan your fingerprint to authenticate";
String get buy => "Buy";
String get cake_wallet => "Cake Wallet";
String get cancel => "Cancel";
String get card_address => "Address:";
String get change => "Change";
String get change_currency => "Change Currency";
String get change_exchange_provider => "Change Exchange Provider";
String get change_language => "Change language";
String get choose_wallet_currency => "Please choose wallet currency:";
String get clear => "Clear";
String get confirm => "Confirm";
String get confirm_sending => "Confirm sending";
@@ -56,7 +58,7 @@ class S implements WidgetsLocalizations {
String get copy => "Copy";
String get copy_address => "Copy Address";
String get copy_id => "Copy ID";
String get create_new => "Create new";
String get create_new => "Create New Wallet";
String get delete => "Delete";
String get digit_pin => "-digit PIN";
String get edit => "Edit";
@@ -84,7 +86,7 @@ class S implements WidgetsLocalizations {
String get faq => "FAQ";
String get fetching => "Fetching";
String get filters => "Filters";
String get first_wallet_text => "Awesome wallet\nfor Monero";
String get first_wallet_text => "Awesome wallet for Monero";
String get full_balance => "Full Balance";
String get hidden_balance => "Hidden Balance";
String get id => "ID: ";
@@ -111,7 +113,7 @@ class S implements WidgetsLocalizations {
String get payment_id => "Payment ID: ";
String get pending => " (pending)";
String get pin_is_incorrect => "PIN is incorrect";
String get please_make_selection => "Please make selection below to\ncreate or recover your wallet.";
String get please_make_selection => "Please make selection below to create or recover your wallet.";
String get please_select => "Please select:";
String get please_try_to_connect_to_another_node => "Please try to connect to another node";
String get receive => "Receive";
@@ -143,7 +145,7 @@ class S implements WidgetsLocalizations {
String get restore_title_from_seed => "Restore from seed";
String get restore_title_from_seed_keys => "Restore from seed/keys";
String get restore_view_key_private => "View key (private)";
String get restore_wallet => "Restore wallet";
String get restore_wallet => "Restore Wallet";
String get restore_wallet_name => "Wallet name";
String get restore_wallet_restore_description => "Wallet restore description";
String get save => "Save";
@@ -265,7 +267,7 @@ class S implements WidgetsLocalizations {
String get wallet_restoration_store_incorrect_seed_length => "Incorrect seed length";
String get wallet_store_monero_wallet => "Monero Wallet";
String get wallets => "Wallets";
String get welcome => "WELCOME\nTO CAKE WALLET";
String get welcome => "Welcome to";
String get widgets_address => "Address";
String get widgets_or => "or";
String get widgets_restore_from_blockheight => "Restore from blockheight";
@@ -343,7 +345,7 @@ class $de extends S {
@override
String get trade_state_underpaid => "Unterbezahlt";
@override
String get welcome => "Willkommen\nzu CAKE WALLET";
String get welcome => "Willkommen zu";
@override
String get share_address => "Adresse teilen ";
@override
@@ -427,6 +429,8 @@ class $de extends S {
@override
String get trade_details_pair => "Paar";
@override
String get choose_wallet_currency => "Bitte wählen Sie die Brieftaschenwährung:";
@override
String get confirm => "Bestätigen";
@override
String get settings_display_balance_as => "Kontostand anzeigen als";
@@ -439,7 +443,7 @@ class $de extends S {
@override
String get seed_language_german => "Deutsche";
@override
String get create_new => "Erstelle neu";
String get create_new => "Neue Wallet erstellen";
@override
String get trade_details_fetching => "Holen";
@override
@@ -535,7 +539,7 @@ class $de extends S {
@override
String get copy_id => "ID kopieren";
@override
String get please_make_selection => "Bitte treffen Sie unten eine Auswahl zu\nErstellen oder Wiederherstellen Ihrer Brieftasche.";
String get please_make_selection => "Bitte treffen Sie unten eine Auswahl zu Erstellen oder Wiederherstellen Ihrer Brieftasche.";
@override
String get loading_your_wallet => "Laden Sie Ihre Brieftasche";
@override
@@ -585,6 +589,8 @@ class $de extends S {
@override
String get saved_the_trade_id => "Ich habe die Geschäfts-ID gespeichert";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Währung";
@override
String get change_language => "Sprache ändern";
@@ -821,7 +827,7 @@ class $de extends S {
@override
String get digit_pin => "-stelliger PIN";
@override
String get first_wallet_text => "tolle Brieftasche\nzum Monero";
String get first_wallet_text => "tolle Brieftasche zum Monero";
@override
String get settings_trades => "Handel";
@override
@@ -921,7 +927,7 @@ class $hi extends S {
@override
String get trade_state_underpaid => "के तहत भुगतान किया";
@override
String get welcome => "स्वागत हे\nसेवा मेरे CAKE WALLET";
String get welcome => "स्वागत हे सेवा मेरे";
@override
String get share_address => "पता साझा करें";
@override
@@ -1005,6 +1011,8 @@ class $hi extends S {
@override
String get trade_details_pair => "जोड़ा";
@override
String get choose_wallet_currency => "कृपया बटुआ मुद्रा चुनें:";
@override
String get confirm => "की पुष्टि करें";
@override
String get settings_display_balance_as => "के रूप में संतुलन प्रदर्शित करें";
@@ -1017,7 +1025,7 @@ class $hi extends S {
@override
String get seed_language_german => "जर्मन";
@override
String get create_new => "नया बनाओ";
String get create_new => "नया बटुआ बनाएँ";
@override
String get trade_details_fetching => "ला रहा है";
@override
@@ -1113,7 +1121,7 @@ class $hi extends S {
@override
String get copy_id => "प्रतिलिपि ID";
@override
String get please_make_selection => "कृपया नीचे चयन करें\nअपना बटुआ बनाएं या पुनर्प्राप्त करें.";
String get please_make_selection => "कृपया नीचे चयन करें अपना बटुआ बनाएं या पुनर्प्राप्त करें.";
@override
String get loading_your_wallet => "अपना बटुआ लोड कर रहा है";
@override
@@ -1163,6 +1171,8 @@ class $hi extends S {
@override
String get saved_the_trade_id => "मैंने व्यापार बचा लिया है ID";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "मुद्रा";
@override
String get change_language => "भाषा बदलो";
@@ -1399,7 +1409,7 @@ class $hi extends S {
@override
String get digit_pin => "-अंक पिन";
@override
String get first_wallet_text => "बहुत बढ़िया बटुआ\nके लिये Monero";
String get first_wallet_text => "बहुत बढ़िया बटुआ के लिये Monero";
@override
String get settings_trades => "ट्रेडों";
@override
@@ -1499,7 +1509,7 @@ class $ru extends S {
@override
String get trade_state_underpaid => "Недоплаченная";
@override
String get welcome => "Приветствуем в CAKE WALLET";
String get welcome => "Приветствуем в";
@override
String get share_address => "Поделиться адресом";
@override
@@ -1583,6 +1593,8 @@ class $ru extends S {
@override
String get trade_details_pair => "Пара";
@override
String get choose_wallet_currency => "Пожалуйста, выберите валюту кошелька:";
@override
String get confirm => "Подтвердить";
@override
String get settings_display_balance_as => "Отображать баланс как";
@@ -1595,7 +1607,7 @@ class $ru extends S {
@override
String get seed_language_german => "Немецкий";
@override
String get create_new => "Создать новый";
String get create_new => "Создать новый кошелёк";
@override
String get trade_details_fetching => "Получение";
@override
@@ -1741,6 +1753,8 @@ class $ru extends S {
@override
String get saved_the_trade_id => "Я сохранил ID сделки";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Валюта";
@override
String get change_language => "Изменить язык";
@@ -2077,7 +2091,7 @@ class $ko extends S {
@override
String get trade_state_underpaid => "미지급";
@override
String get welcome => "환영\n에 CAKE WALLET";
String get welcome => "환영 에";
@override
String get share_address => "주소 공유";
@override
@@ -2161,6 +2175,8 @@ class $ko extends S {
@override
String get trade_details_pair => "쌍";
@override
String get choose_wallet_currency => "지갑 통화를 선택하십시오:";
@override
String get confirm => "확인";
@override
String get settings_display_balance_as => "잔액 표시";
@@ -2173,7 +2189,7 @@ class $ko extends S {
@override
String get seed_language_german => "독일 사람";
@override
String get create_new => "새로 만들기";
String get create_new => "새 월렛 만들기";
@override
String get trade_details_fetching => "가져 오는 중";
@override
@@ -2269,7 +2285,7 @@ class $ko extends S {
@override
String get copy_id => "부 ID";
@override
String get please_make_selection => "아래에서 선택하십시오\n지갑 만들기 또는 복구.";
String get please_make_selection => "아래에서 선택하십시오 지갑 만들기 또는 복구.";
@override
String get loading_your_wallet => "지갑 넣기";
@override
@@ -2319,6 +2335,8 @@ class $ko extends S {
@override
String get saved_the_trade_id => "거래 ID를 저장했습니다";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "통화";
@override
String get change_language => "언어 변경";
@@ -2515,7 +2533,7 @@ class $ko extends S {
@override
String get settings_support => "지원하다";
@override
String get restore_wallet => "지갑 복원";
String get restore_wallet => "월렛 복원";
@override
String get ok => "승인";
@override
@@ -2555,7 +2573,7 @@ class $ko extends S {
@override
String get digit_pin => "숫자 PIN";
@override
String get first_wallet_text => "멋진 지갑\n에 대한 Monero";
String get first_wallet_text => "멋진 지갑 에 대한 Monero";
@override
String get settings_trades => "거래";
@override
@@ -2655,7 +2673,7 @@ class $pt extends S {
@override
String get trade_state_underpaid => "Parcialmente paga";
@override
String get welcome => "BEM-VINDO(A)\nÀ CAKE WALLET";
String get welcome => "Bem-vindo ao";
@override
String get share_address => "Compartilhar endereço";
@override
@@ -2739,6 +2757,8 @@ class $pt extends S {
@override
String get trade_details_pair => "Par";
@override
String get choose_wallet_currency => "Escolha a moeda da carteira:";
@override
String get confirm => "Confirmar";
@override
String get settings_display_balance_as => "Saldo a exibir";
@@ -2751,7 +2771,7 @@ class $pt extends S {
@override
String get seed_language_german => "Alemã";
@override
String get create_new => "Criar carteira";
String get create_new => "Criar nova carteira";
@override
String get trade_details_fetching => "Buscando";
@override
@@ -2847,7 +2867,7 @@ class $pt extends S {
@override
String get copy_id => "Copiar ID";
@override
String get please_make_selection => "Escolha se quer criar uma carteira nova\nou restaurar uma antiga.";
String get please_make_selection => "Escolha se quer criar uma carteira nova ou restaurar uma antiga.";
@override
String get loading_your_wallet => "Abrindo sua carteira";
@override
@@ -2897,6 +2917,8 @@ class $pt extends S {
@override
String get saved_the_trade_id => "ID da troca salvo";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Moeda";
@override
String get change_language => "Mudar idioma";
@@ -3133,7 +3155,7 @@ class $pt extends S {
@override
String get digit_pin => "dígitos";
@override
String get first_wallet_text => "Uma fantástica carteira\npara Monero";
String get first_wallet_text => "Uma fantástica carteira para Monero";
@override
String get settings_trades => "Trocas";
@override
@@ -3233,7 +3255,7 @@ class $uk extends S {
@override
String get trade_state_underpaid => "Недоплачена";
@override
String get welcome => "Вітаємо в CAKE WALLET";
String get welcome => "Вітаємо в";
@override
String get share_address => "Поділитися адресою";
@override
@@ -3317,6 +3339,8 @@ class $uk extends S {
@override
String get trade_details_pair => "Пара";
@override
String get choose_wallet_currency => "Будь ласка, виберіть валюту гаманця:";
@override
String get confirm => "Підтвердити";
@override
String get settings_display_balance_as => "Відображати баланс як";
@@ -3329,7 +3353,7 @@ class $uk extends S {
@override
String get seed_language_german => "Німецька";
@override
String get create_new => "Створити новий";
String get create_new => "Створити новий гаманець";
@override
String get trade_details_fetching => "Отримання";
@override
@@ -3425,7 +3449,7 @@ class $uk extends S {
@override
String get copy_id => "Скопіювати ID";
@override
String get please_make_selection => "Виберіть спосіб створення гаманця: створити новий чи відновити ваш існуючий.";
String get please_make_selection => "Оберіть спосіб створення гаманця: створити новий чи відновити ваш існуючий.";
@override
String get loading_your_wallet => "Завантаження гаманця";
@override
@@ -3475,6 +3499,8 @@ class $uk extends S {
@override
String get saved_the_trade_id => "Я зберіг ID операції";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Валюта";
@override
String get change_language => "Змінити мову";
@@ -3811,7 +3837,7 @@ class $ja extends S {
@override
String get trade_state_underpaid => "支払不足";
@override
String get welcome => "ようこそ\nに CAKE WALLET";
String get welcome => "ようこそ に";
@override
String get share_address => "住所を共有する";
@override
@@ -3895,6 +3921,8 @@ class $ja extends S {
@override
String get trade_details_pair => "ペア";
@override
String get choose_wallet_currency => "ウォレット通貨を選択してください:";
@override
String get confirm => "確認する";
@override
String get settings_display_balance_as => "残高を表示";
@@ -3907,7 +3935,7 @@ class $ja extends S {
@override
String get seed_language_german => "ドイツ人";
@override
String get create_new => "新しく作る";
String get create_new => "新しいウォレットを作成";
@override
String get trade_details_fetching => "フェッチング";
@override
@@ -4003,7 +4031,7 @@ class $ja extends S {
@override
String get copy_id => "IDをコピー";
@override
String get please_make_selection => "以下を選択してください\nウォレットを作成または回復する.";
String get please_make_selection => "以下を選択してください ウォレットを作成または回復する.";
@override
String get loading_your_wallet => "ウォレットをロードしています";
@override
@@ -4053,6 +4081,8 @@ class $ja extends S {
@override
String get saved_the_trade_id => "取引IDを保存しました";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "通貨";
@override
String get change_language => "言語を変えてください";
@@ -4249,7 +4279,7 @@ class $ja extends S {
@override
String get settings_support => "サポート";
@override
String get restore_wallet => "ウォレットを復元する";
String get restore_wallet => "ウォレットを復元";
@override
String get ok => "OK";
@override
@@ -4289,7 +4319,7 @@ class $ja extends S {
@override
String get digit_pin => "桁ピン";
@override
String get first_wallet_text => "素晴らしい財布\nために Monero";
String get first_wallet_text => "素晴らしい財布 ために Monero";
@override
String get settings_trades => "取引";
@override
@@ -4393,7 +4423,7 @@ class $pl extends S {
@override
String get trade_state_underpaid => "Niedopłacone";
@override
String get welcome => "WITAMY\nW CAKE WALLET";
String get welcome => "Witamy w";
@override
String get share_address => "Udostępnij adres";
@override
@@ -4477,6 +4507,8 @@ class $pl extends S {
@override
String get trade_details_pair => "Para";
@override
String get choose_wallet_currency => "Wybierz walutę portfela:";
@override
String get confirm => "Potwierdzać";
@override
String get settings_display_balance_as => "Wyświetl saldo jako";
@@ -4489,7 +4521,7 @@ class $pl extends S {
@override
String get seed_language_german => "Niemiecki";
@override
String get create_new => "Tworzyć nowe";
String get create_new => "Utwórz nowy portfel";
@override
String get trade_details_fetching => "Ujmujący";
@override
@@ -4585,7 +4617,7 @@ class $pl extends S {
@override
String get copy_id => "ID kopii";
@override
String get please_make_selection => "Wybierz poniżej, aby\ncutwórz lub odzyskaj swój portfel.";
String get please_make_selection => "Wybierz poniżej, aby cutwórz lub odzyskaj swój portfel.";
@override
String get loading_your_wallet => "Ładowanie portfela";
@override
@@ -4635,6 +4667,8 @@ class $pl extends S {
@override
String get saved_the_trade_id => "Zapisałem ID";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Waluta";
@override
String get change_language => "Zmień język";
@@ -4871,7 +4905,7 @@ class $pl extends S {
@override
String get digit_pin => "-znak PIN";
@override
String get first_wallet_text => "Niesamowity portfel\nfdla Monero";
String get first_wallet_text => "Niesamowity portfel dla Monero";
@override
String get settings_trades => "Transakcje";
@override
@@ -4971,7 +5005,7 @@ class $es extends S {
@override
String get trade_state_underpaid => "Poco pagado";
@override
String get welcome => "Bienvenido\n CAKE WALLET";
String get welcome => "Bienvenido";
@override
String get share_address => "Compartir dirección";
@override
@@ -5055,6 +5089,8 @@ class $es extends S {
@override
String get trade_details_pair => "Par";
@override
String get choose_wallet_currency => "Por favor, elija la moneda de la billetera:";
@override
String get confirm => "Confirmar";
@override
String get settings_display_balance_as => "Mostrar saldo como";
@@ -5067,7 +5103,7 @@ class $es extends S {
@override
String get seed_language_german => "Alemán";
@override
String get create_new => "Crear nuevo";
String get create_new => "Crear nueva billetera";
@override
String get trade_details_fetching => "Cargando";
@override
@@ -5163,7 +5199,7 @@ class $es extends S {
@override
String get copy_id => "Copiar ID";
@override
String get please_make_selection => "Seleccione a continuación para\ncrear o recuperar su billetera.";
String get please_make_selection => "Seleccione a continuación para crear o recuperar su billetera.";
@override
String get loading_your_wallet => "Cargando tu billetera";
@override
@@ -5213,6 +5249,8 @@ class $es extends S {
@override
String get saved_the_trade_id => "He salvado comercial ID";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Moneda";
@override
String get change_language => "Cambiar idioma";
@@ -5449,7 +5487,7 @@ class $es extends S {
@override
String get digit_pin => "-dígito PIN";
@override
String get first_wallet_text => "Impresionante billetera\npara Monero";
String get first_wallet_text => "Impresionante billetera para Monero";
@override
String get settings_trades => "Comercia";
@override
@@ -5549,7 +5587,7 @@ class $nl extends S {
@override
String get trade_state_underpaid => "Slecht betaald";
@override
String get welcome => "WELKOM\nBIJ CAKE WALLET";
String get welcome => "Welkom bij";
@override
String get share_address => "Deel adres";
@override
@@ -5633,6 +5671,8 @@ class $nl extends S {
@override
String get trade_details_pair => "Paar";
@override
String get choose_wallet_currency => "Kies een portemonnee-valuta:";
@override
String get confirm => "Bevestigen";
@override
String get settings_display_balance_as => "Toon saldo als";
@@ -5645,7 +5685,7 @@ class $nl extends S {
@override
String get seed_language_german => "Duitse";
@override
String get create_new => "Maak nieuw";
String get create_new => "Maak een nieuwe portemonnee";
@override
String get trade_details_fetching => "Ophalen";
@override
@@ -5741,7 +5781,7 @@ class $nl extends S {
@override
String get copy_id => "ID kopiëren";
@override
String get please_make_selection => "Maak hieronder uw keuze tot\nmaak of herstel je portemonnee.";
String get please_make_selection => "Maak hieronder uw keuze tot maak of herstel je portemonnee.";
@override
String get loading_your_wallet => "Uw portemonnee laden";
@override
@@ -5791,6 +5831,8 @@ class $nl extends S {
@override
String get saved_the_trade_id => "Ik heb de ruil-ID opgeslagen";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "Valuta";
@override
String get change_language => "Verander de taal";
@@ -6027,7 +6069,7 @@ class $nl extends S {
@override
String get digit_pin => "-cijferige PIN";
@override
String get first_wallet_text => "Geweldige portemonnee\nfvoor Monero";
String get first_wallet_text => "Geweldige portemonnee fvoor Monero";
@override
String get settings_trades => "Trades";
@override
@@ -6127,7 +6169,7 @@ class $zh extends S {
@override
String get trade_state_underpaid => "支付不足";
@override
String get welcome => "欢迎\nTO CAKE WALLET";
String get welcome => "歡迎來到";
@override
String get share_address => "分享地址";
@override
@@ -6211,6 +6253,8 @@ class $zh extends S {
@override
String get trade_details_pair => "对";
@override
String get choose_wallet_currency => "請選擇錢包貨幣:";
@override
String get confirm => "确认";
@override
String get settings_display_balance_as => "将余额显示为";
@@ -6223,7 +6267,7 @@ class $zh extends S {
@override
String get seed_language_german => "德語";
@override
String get create_new => "创建新的";
String get create_new => "创建新钱包";
@override
String get trade_details_fetching => "正在取得";
@override
@@ -6319,7 +6363,7 @@ class $zh extends S {
@override
String get copy_id => "复印ID";
@override
String get please_make_selection => "请在下面进行选择\nc创建或恢复您的钱包.";
String get please_make_selection => "请在下面进行选择 创建或恢复您的钱包.";
@override
String get loading_your_wallet => "装钱包";
@override
@@ -6369,6 +6413,8 @@ class $zh extends S {
@override
String get saved_the_trade_id => "我已经保存了交易ID";
@override
String get cake_wallet => "Cake Wallet";
@override
String get settings_currency => "货币";
@override
String get change_language => "改變語言";
@@ -6605,7 +6651,7 @@ class $zh extends S {
@override
String get digit_pin => "数字别针";
@override
String get first_wallet_text => "很棒的钱包\n对于 Monero";
String get first_wallet_text => "很棒的钱包 对于 Monero";
@override
String get settings_trades => "交易";
@override