Skip to content

Commit 2d52ca1

Browse files
committed
Merge branch 'dev' of https://github.com/cake-tech/cake_wallet into fix-monero-swaps-not-showing
2 parents 4a63160 + 2c9d3da commit 2d52ca1

32 files changed

Lines changed: 223 additions & 223 deletions

res/values/strings_ar.arb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -835,12 +835,12 @@
835835
"restore_bitcoin_description_from_keys": "استعادة محفظتك من سلسلة WIF المُولَّدة من مفاتيحك الخاصة",
836836
"restore_bitcoin_description_from_seed": "استعد محفظتك باستخدام رمز مكوّن من 24 كلمة",
837837
"restore_bitcoin_title_from_keys": "الاستعادة من WIF",
838-
"restore_description_from_backup": "يمكنك استعادة تطبيق Cake Wallet بالكامل من ملف النسخة الاحتياطية",
838+
"restore_description_from_backup": "استعد Cake Wallet تمامًا كما كان عن طريق الاستعادة من ملف نسخ احتياطي.",
839839
"restore_description_from_cupcake": "اربط بتطبيقنا المرافق غير المتصل بالإنترنت (Air-gapped)، المثبت على هاتف ثانٍ.",
840840
"restore_description_from_hardware_wallet": "اربط جهاز محفظتك الصلبة من مجموعة متنوعة من الشركات المصنِّعة.",
841841
"restore_description_from_keys": "استعادة محفظتك من ضغطات المفاتيح المُولَّدة والمحفوظة من مفاتيحك الخاصة",
842842
"restore_description_from_seed": "استعادة محفظتك باستخدام رمز الاستعادة المكوّن من 25 كلمة أو 13 كلمة",
843-
"restore_description_from_seed_keys": "استعد محفظتك باستخدام عبارة الاسترداد/المفاتيح التي حفظتها في مكان آمن",
843+
"restore_description_from_seed_keys": "استعد محفظتك من عبارة seed أو المفاتيح التي حفظتها مسبقًا.",
844844
"restore_existing_wallet": "استعادة محفظة موجودة",
845845
"restore_from_date_or_blockheight": "يرجى إدخال تاريخ قبل بضعة أيام من إنشاء هذه المحفظة. أو إذا كنت تعرف ارتفاع الكتلة، فيرجى إدخاله بدلاً من ذلك",
846846
"restore_from_seed_placeholder": "يرجى إدخال أو لصق عبارة الاسترداد الخاصة بك هنا",
@@ -850,12 +850,12 @@
850850
"restore_restore_wallet": "استعادة المحفظة",
851851
"restore_seed_keys_restore": "استعادة البذرة/المفاتيح",
852852
"restore_spend_key_private": "مفتاح الإنفاق (خاص)",
853-
"restore_title_from_backup": "الاستعادة من نسخة احتياطية",
853+
"restore_title_from_backup": "ملف النسخ الاحتياطي",
854854
"restore_title_from_cupcake": "تطبيق Cupcake",
855-
"restore_title_from_hardware_wallet": "الاستعادة من محفظة أجهزة",
855+
"restore_title_from_hardware_wallet": "محفظة الأجهزة ",
856856
"restore_title_from_keys": "الاستعادة باستخدام المفاتيح",
857857
"restore_title_from_seed": "استعادة من عبارة الاسترداد",
858-
"restore_title_from_seed_keys": "استعادة من عبارة الاسترداد/المفاتيح",
858+
"restore_title_from_seed_keys": "Seed أو مفاتيح",
859859
"restore_view_key_private": "مفتاح العرض (خاص)",
860860
"restore_wallet": "استعادة المحفظة",
861861
"restore_wallet_name": "اسم المحفظة",
@@ -873,7 +873,7 @@
873873
"savings": "المدخرات",
874874
"scan": "مسح ضوئي",
875875
"scan_one_block": "فحص كتلة واحدة",
876-
"scan_qr_code": "امسح رمز الاستجابة السريعة",
876+
"scan_qr_code": "رمز QR",
877877
"scan_qr_code_to_get_address": "امسح رمز الاستجابة السريعة للحصول على العنوان",
878878
"scan_qr_on_device": "امسح رمز الاستجابة السريعة هذا على جهاز آخر",
879879
"search": "بحث",
@@ -1371,4 +1371,4 @@
13711371
"zcash_card_missing_funds": "هل أموالك مفقودة؟",
13721372
"zcash_card_scan": "مسح",
13731373
"zcash_card_warning": "لا تُغلق التطبيق حتى يكتمل الإجراء، لأنك إن فعلت ذلك فستحتاج هذه العملية إلى البدء من جديد من البداية."
1374-
}
1374+
}

res/values/strings_bg.arb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -835,12 +835,12 @@
835835
"restore_bitcoin_description_from_keys": "Възстановете портфейла си от генериран WIF низ от вашите частни ключове",
836836
"restore_bitcoin_description_from_seed": "Възстановете портфейла си от 24‑словен код",
837837
"restore_bitcoin_title_from_keys": "Възстановяване от WIF",
838-
"restore_description_from_backup": "Можете да възстановите цялото приложение Cake Wallet от своя резервен файл",
838+
"restore_description_from_backup": "Върнете Cake Wallet точно такъв, какъвто е бил, като го възстановите от резервен файл.",
839839
"restore_description_from_cupcake": "Свържете се с нашето съпътстващо air-gapped приложение, инсталирано на втори телефон.",
840840
"restore_description_from_hardware_wallet": "Свържете устройството на вашия хардуерен портфейл от различни производители.",
841841
"restore_description_from_keys": "Възстановете портфейла си от генерираните натискания на клавиши, запазени от вашите частни ключове",
842842
"restore_description_from_seed": "Възстановете портфейла си с 25- или 13‑думен код",
843-
"restore_description_from_seed_keys": "Възстановете портфейла си от seed/keys, които сте запазили на сигурно място",
843+
"restore_description_from_seed_keys": "Възстановете портфейла си от seed фраза или ключове, които сте запазили преди това.",
844844
"restore_existing_wallet": "Възстановяване на съществуващ портфейл",
845845
"restore_from_date_or_blockheight": "Моля, въведете дата няколко дни преди да създадете този портфейл. Или, ако знаете височината на блока, въведете я вместо това",
846846
"restore_from_seed_placeholder": "Моля, въведете или поставете вашата seed фраза тук",
@@ -850,12 +850,12 @@
850850
"restore_restore_wallet": "Възстановяване на портфейл",
851851
"restore_seed_keys_restore": "Възстановяване чрез Seed/Keys",
852852
"restore_spend_key_private": "Ключ за разход (частен)",
853-
"restore_title_from_backup": "Възстановяване от резервно копие",
853+
"restore_title_from_backup": "Резервен файл",
854854
"restore_title_from_cupcake": "Приложението Cupcake",
855-
"restore_title_from_hardware_wallet": "Възстановяване от хардуерен портфейл",
855+
"restore_title_from_hardware_wallet": "Хардуерен портфейл ",
856856
"restore_title_from_keys": "Възстановяване от ключове",
857857
"restore_title_from_seed": "Възстановяване от seed фраза",
858-
"restore_title_from_seed_keys": "Възстановяване от seed/ключове",
858+
"restore_title_from_seed_keys": "Seed или ключове",
859859
"restore_view_key_private": "Ключ за преглед (частен)",
860860
"restore_wallet": "Възстановяване на портфейл",
861861
"restore_wallet_name": "Име на портфейла",
@@ -873,7 +873,7 @@
873873
"savings": "Спестявания",
874874
"scan": "Сканиране",
875875
"scan_one_block": "Сканиране на един блок",
876-
"scan_qr_code": "Сканирайте QR код",
876+
"scan_qr_code": "QR код",
877877
"scan_qr_code_to_get_address": "Сканирайте QR кода, за да получите адреса",
878878
"scan_qr_on_device": "Сканирайте този QR код на друго устройство",
879879
"search": "Търсене",
@@ -1371,4 +1371,4 @@
13711371
"zcash_card_missing_funds": "Липсват средства?",
13721372
"zcash_card_scan": "Сканирай",
13731373
"zcash_card_warning": "Не затваряйте приложението, докато процедурата не приключи. Ако го направите, процесът ще трябва да започне отначало."
1374-
}
1374+
}

res/values/strings_cs.arb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -835,12 +835,12 @@
835835
"restore_bitcoin_description_from_keys": "Obnovte svou peněženku z vygenerovaného WIF řetězce z vašich soukromých klíčů",
836836
"restore_bitcoin_description_from_seed": "Obnovte svou peněženku z 24slovné seed fráze",
837837
"restore_bitcoin_title_from_keys": "Obnovit z WIF",
838-
"restore_description_from_backup": "Celou aplikaci Cake Wallet můžete obnovit ze souboru se zálohou",
838+
"restore_description_from_backup": "Obnovte Cake Wallet přesně tak, jak jste ho měli, obnovením ze záložního souboru.",
839839
"restore_description_from_cupcake": "Propojte s naší doprovodnou air-gapped aplikací nainstalovanou na druhém telefonu.",
840840
"restore_description_from_hardware_wallet": "Propojte své zařízení hardwarové peněženky od různých výrobců.",
841841
"restore_description_from_keys": "Obnovte svou peněženku z vygenerovaných stisků kláves uložených z vašich soukromých klíčů",
842842
"restore_description_from_seed": "Obnovte svou peněženku pomocí kombinace kódu o 25 nebo 13 slovech",
843-
"restore_description_from_seed_keys": "Obnovte svou peněženku ze seedu/klíčů, které jste si uložili na bezpečném místě",
843+
"restore_description_from_seed_keys": "Obnovte svou peněženku ze seed fráze nebo klíčů, které jste dříve uložili.",
844844
"restore_existing_wallet": "Obnovit stávající peněženku",
845845
"restore_from_date_or_blockheight": "Zadejte prosím datum několik dní před tím, než jste tuto peněženku vytvořili. Nebo pokud znáte výšku bloku, zadejte ji místo toho.",
846846
"restore_from_seed_placeholder": "Zadejte nebo vložte sem svůj seed",
@@ -850,12 +850,12 @@
850850
"restore_restore_wallet": "Obnovit peněženku",
851851
"restore_seed_keys_restore": "Obnova seedu/klíčů",
852852
"restore_spend_key_private": "Klíč pro utrácení (soukromý)",
853-
"restore_title_from_backup": "Obnovit ze zálohy",
853+
"restore_title_from_backup": "Záložní soubor",
854854
"restore_title_from_cupcake": "Aplikace Cupcake",
855-
"restore_title_from_hardware_wallet": "Obnovit z hardwarové peněženky",
855+
"restore_title_from_hardware_wallet": "Hardwarová peněženka ",
856856
"restore_title_from_keys": "Obnovit z klíčů",
857857
"restore_title_from_seed": "Obnovit ze seedu",
858-
"restore_title_from_seed_keys": "Obnovit ze seedu/klíčů",
858+
"restore_title_from_seed_keys": "Seed nebo klíče",
859859
"restore_view_key_private": "Zobrazovací klíč (soukromý)",
860860
"restore_wallet": "Obnovit peněženku",
861861
"restore_wallet_name": "Název peněženky",
@@ -873,7 +873,7 @@
873873
"savings": "Úspory",
874874
"scan": "Skenovat",
875875
"scan_one_block": "Naskenovat jeden blok",
876-
"scan_qr_code": "Naskenujte QR kód",
876+
"scan_qr_code": "QR kód",
877877
"scan_qr_code_to_get_address": "Naskenujte QR kód a získejte adresu",
878878
"scan_qr_on_device": "Naskenujte tento QR kód na jiném zařízení",
879879
"search": "Hledat",
@@ -1371,4 +1371,4 @@
13711371
"zcash_card_missing_funds": "Chybějící prostředky?",
13721372
"zcash_card_scan": "Skenovat",
13731373
"zcash_card_warning": "Nezavírejte aplikaci, dokud se postup nedokončí. Pokud tak učiníte, bude nutné tento proces spustit znovu od začátku."
1374-
}
1374+
}

res/values/strings_de.arb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -836,12 +836,12 @@
836836
"restore_bitcoin_description_from_keys": "Stellen Sie Ihre Wallet aus der aus Ihren privaten Schlüsseln generierten WIF-Zeichenfolge wieder her",
837837
"restore_bitcoin_description_from_seed": "Stellen Sie Ihre Wallet mit dem 24-Wort-Wiederherstellungscode wieder her",
838838
"restore_bitcoin_title_from_keys": "Aus WIF wiederherstellen",
839-
"restore_description_from_backup": "Sie können die gesamte Cake Wallet-App aus Ihrer Backup-Datei wiederherstellen",
839+
"restore_description_from_backup": "Stellen Sie Cake Wallet genau so wieder her, wie Sie es hatten, indem Sie es aus einer Backup-Datei wiederherstellen.",
840840
"restore_description_from_cupcake": "Verknüpfen Sie die App mit unserer air-gapped Begleit-App, die auf einem zweiten Telefon installiert ist.",
841841
"restore_description_from_hardware_wallet": "Verknüpfen Sie Ihr Hardware-Wallet-Gerät von verschiedenen Herstellern.",
842842
"restore_description_from_keys": "Stellen Sie Ihre Wallet mithilfe der aus Ihren privaten Schlüsseln generierten Schlüssel wieder her",
843843
"restore_description_from_seed": "Stellen Sie Ihre Wallet entweder mit der 25-Wort- oder der 13-Wort-Wiederherstellungsphrase wieder her",
844-
"restore_description_from_seed_keys": "Stellen Sie Ihr Wallet aus Seed/Schlüsseln wieder her, die Sie an einem sicheren Ort aufbewahrt haben",
844+
"restore_description_from_seed_keys": "Stellen Sie Ihre Wallet aus einer Seed-Phrase oder Schlüsseln wieder her, die Sie zuvor gespeichert haben.",
845845
"restore_existing_wallet": "Vorhandene Wallet wiederherstellen",
846846
"restore_from_date_or_blockheight": "Bitte geben Sie ein Datum ein, das einige Tage vor der Erstellung dieser Wallet liegt. Oder, wenn Sie die Blockhöhe kennen, geben Sie stattdessen diese ein.",
847847
"restore_from_seed_placeholder": "Bitte geben Sie Ihren Seed hier ein oder fügen Sie ihn ein",
@@ -851,12 +851,12 @@
851851
"restore_restore_wallet": "Wallet wiederherstellen",
852852
"restore_seed_keys_restore": "Seed/Schlüssel-Wiederherstellung",
853853
"restore_spend_key_private": "Spend-Key (privat)",
854-
"restore_title_from_backup": "Aus einem Backup wiederherstellen",
854+
"restore_title_from_backup": "Backup-Datei",
855855
"restore_title_from_cupcake": "Cupcake App",
856-
"restore_title_from_hardware_wallet": "Aus Hardware-Wallet wiederherstellen",
856+
"restore_title_from_hardware_wallet": "Hardware-Wallet ",
857857
"restore_title_from_keys": "Aus Schlüsseln wiederherstellen",
858858
"restore_title_from_seed": "Aus Seed wiederherstellen",
859-
"restore_title_from_seed_keys": "Aus Seed/Schlüsseln wiederherstellen",
859+
"restore_title_from_seed_keys": "Seed oder Schlüssel",
860860
"restore_view_key_private": "View-Key (privat)",
861861
"restore_wallet": "Wallet wiederherstellen",
862862
"restore_wallet_name": "Wallet-Name",
@@ -874,7 +874,7 @@
874874
"savings": "Ersparnisse",
875875
"scan": "Scannen",
876876
"scan_one_block": "Einen Block scannen",
877-
"scan_qr_code": "QR-Code scannen",
877+
"scan_qr_code": "QR-Code",
878878
"scan_qr_code_to_get_address": "Scannen Sie den QR-Code, um die Adresse zu erhalten",
879879
"scan_qr_on_device": "Scannen Sie diesen QR-Code auf einem anderen Gerät",
880880
"search": "Suche",
@@ -1375,4 +1375,4 @@
13751375
"zcash_card_missing_funds": "Fehlende Gelder?",
13761376
"zcash_card_scan": "Scannen",
13771377
"zcash_card_warning": "Schließen Sie die App nicht, bis der Vorgang abgeschlossen ist. Andernfalls muss der Vorgang von Grund auf neu gestartet werden."
1378-
}
1378+
}

res/values/strings_en.arb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,12 +840,12 @@
840840
"restore_bitcoin_description_from_keys": "Restore your wallet from generated WIF string from your private keys",
841841
"restore_bitcoin_description_from_seed": "Restore your wallet from 24 word combination code",
842842
"restore_bitcoin_title_from_keys": "Restore from WIF",
843-
"restore_description_from_backup": "You can restore the whole Cake Wallet app from your back-up file",
843+
"restore_description_from_backup": "Get Cake Wallet back exactly as you had it by restoring from a backup file.",
844844
"restore_description_from_cupcake": "Link with our companion air-gapped app, installed on a second phone.",
845845
"restore_description_from_hardware_wallet": "Link your hardware wallet device from a variety of manufacturers.",
846846
"restore_description_from_keys": "Restore your wallet from generated keystrokes saved from your private keys",
847847
"restore_description_from_seed": "Restore your wallet from either the 25 word or 13 word combination code",
848-
"restore_description_from_seed_keys": "Get back your wallet from seed/keys that you've saved to secure place",
848+
"restore_description_from_seed_keys": "Restore your wallet from a seed phrase or keys that youve previously saved.",
849849
"restore_existing_wallet": "Restore Existing Wallet",
850850
"restore_from_date_or_blockheight": "Please enter a date a few days before you created this wallet. Or if you know the blockheight, please enter it instead",
851851
"restore_from_seed_placeholder": "Please enter or paste your seed here",
@@ -855,12 +855,12 @@
855855
"restore_restore_wallet": "Restore Wallet",
856856
"restore_seed_keys_restore": "Seed/Keys Restore",
857857
"restore_spend_key_private": "Spend key (private)",
858-
"restore_title_from_backup": "Restore from backup",
858+
"restore_title_from_backup": "Backup file",
859859
"restore_title_from_cupcake": "Cupcake App",
860-
"restore_title_from_hardware_wallet": "Restore from hardware wallet",
860+
"restore_title_from_hardware_wallet": "Hardware wallet ",
861861
"restore_title_from_keys": "Restore from keys",
862862
"restore_title_from_seed": "Restore from seed",
863-
"restore_title_from_seed_keys": "Restore from seed/keys",
863+
"restore_title_from_seed_keys": "Seed or Keys",
864864
"restore_view_key_private": "View key (private)",
865865
"restore_wallet": "Restore Wallet",
866866
"restore_wallet_name": "Wallet name",
@@ -878,7 +878,7 @@
878878
"savings": "Savings",
879879
"scan": "Scan",
880880
"scan_one_block": "Scan one block",
881-
"scan_qr_code": "Scan QR code",
881+
"scan_qr_code": "QR code",
882882
"scan_qr_code_to_get_address": "Scan the QR code to get the address",
883883
"scan_qr_on_device": "Scan this QR code on another device",
884884
"search": "Search",

0 commit comments

Comments
 (0)