From 69176680294a557aaf8b3ba19692a3d7cec5d144 Mon Sep 17 00:00:00 2001 From: Rafael Saes <76502841+saltrafael@users.noreply.github.com> Date: Fri, 8 Sep 2023 09:04:28 -0300 Subject: [PATCH] fix: Fixes specific to Linux (#1079) --- build-guide-linux.md | 58 ++++++++++++------- cw_monero/ios/Classes/monero_api.cpp | 3 +- lib/di.dart | 3 +- lib/router.dart | 1 + .../desktop_action_button.dart | 5 +- .../screens/new_wallet/new_wallet_page.dart | 2 +- .../wallet_restore_from_keys_form.dart | 2 +- .../wallet_restore_from_seed_form.dart | 2 +- .../support_chat/support_chat_page.dart | 4 +- .../support_chat/widgets/chatwoot_widget.dart | 4 +- model_generator.sh | 12 ++-- res/values/strings_ar.arb | 11 +++- res/values/strings_bg.arb | 10 +++- res/values/strings_cs.arb | 10 +++- res/values/strings_de.arb | 12 +++- res/values/strings_en.arb | 10 +++- res/values/strings_es.arb | 10 +++- res/values/strings_fr.arb | 10 +++- res/values/strings_ha.arb | 10 +++- res/values/strings_hi.arb | 10 +++- res/values/strings_hr.arb | 10 +++- res/values/strings_id.arb | 10 +++- res/values/strings_it.arb | 10 +++- res/values/strings_ja.arb | 10 +++- res/values/strings_ko.arb | 10 +++- res/values/strings_my.arb | 10 +++- res/values/strings_nl.arb | 10 +++- res/values/strings_pl.arb | 10 +++- res/values/strings_pt.arb | 10 +++- res/values/strings_ru.arb | 10 +++- res/values/strings_th.arb | 10 +++- res/values/strings_tr.arb | 10 +++- res/values/strings_uk.arb | 10 +++- res/values/strings_ur.arb | 10 +++- res/values/strings_yo.arb | 10 +++- res/values/strings_zh.arb | 10 +++- scripts/linux/build_monero.sh | 14 ++--- scripts/linux/gcc10.nix | 12 ++++ 38 files changed, 275 insertions(+), 100 deletions(-) create mode 100644 scripts/linux/gcc10.nix diff --git a/build-guide-linux.md b/build-guide-linux.md index c08d0405b..06089b258 100644 --- a/build-guide-linux.md +++ b/build-guide-linux.md @@ -5,7 +5,7 @@ The following are the system requirements to build CakeWallet for your Linux device. ``` -Ubuntu >= 16.04 +Ubuntu >= 16.04 Flutter 3 or above ``` @@ -19,27 +19,40 @@ CakeWallet requires some packages to be install on your build system. You may ea `$ sudo apt install build-essential cmake pkg-config git curl autoconf libtool` +> [!WARNING] +> > ### Check gcc version -> Need to use gcc 10 or 9 for successfully link dependecnies with flutter.\ -> Check what gcc version is using:\ -> ``` +> +> It is needed to use gcc 10 or 9 to successfully link dependencies with flutter.\ +> To check what gcc version you are using: +> +> ```bash > $ gcc --version > $ g++ --version > ``` -> If you are using gcc version newer than 10, then need to downgrade to version 10.4.0.\ -> ``` +> +> If you are using gcc version newer than 10, then you need to downgrade to version 10.4.0: +> +> ```bash > $ sudo apt install gcc-10 g++-10 > $ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 > $ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 > ``` +> [!NOTE] +> +> Alternatively, you can use the [nix-shell](https://nixos.org/) with the `gcc10.nix` file\ +> present on `scripts/linux` like so: +> ```bash +> $ nix-shell gcc10.nix +> ``` +> This will get you in a nix environment with all the required dependencies that you can use to build the software from,\ +> and it works in any linux distro. + ### 2. Installing Flutter Need to install flutter. For this please check section [How to install flutter on Linux](https://docs.flutter.dev/get-started/install/linux). - - - ### 3. Verify Installations Verify that the Flutter have been correctly installed on your system with the following command: @@ -47,6 +60,7 @@ Verify that the Flutter have been correctly installed on your system with the fo `$ flutter doctor` The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding. + ``` Doctor summary (to see all details, run flutter doctor -v): [✓] Flutter (Channel stable, 3.7.x, on Linux, locale en_US.UTF-8) @@ -82,19 +96,21 @@ Install Flutter package dependencies with this command: `$ flutter pub get` - - > #### If you will get an error like: +> > ``` > The plugin `cw_shared_external` requires your app to be migrated to the Android embedding v2. Follow the steps on the migration doc above and re-run > this command. > ``` +> > Then need to config Android project settings. For this open `scripts/android` (`$ cd scripts/android`) directory and run followed commands: +> > ``` > $ source ./app_env.sh cakewallet > $ ./app_config.sh > $ cd ../.. > ``` +> > Then re-configure Linux project again. For this open `scripts/linux` (`$cd scripts/linux`) directory and run: > `$ ./cakewallet.sh` > and back to project root directory: @@ -102,33 +118,34 @@ Install Flutter package dependencies with this command: > and fetch dependecies again > `$ flutter pub get` - > ### If you get the error like: +> > ``` > The lower bound of "sdk: '>=2.0.0-dev.68.0 <3.0.0'" must be 2.12.0 or higher to enable null safety. > ``` > > #### Downgrade Flutter to version 3.7.x +> > Make sure that Flutter is reverted back to version 3.7.x (which would automatically revert Dart to 2.18 or 2.19) -> +> > In your Linux terminal, find where your Flutter SDK is installed with: -> +> > ``` > $ which flutter > ``` -> +> > Proceed to the Flutter SDK path: -> +> > ``` > $ cd user/snap/flutter/common/flutter > ``` -> +> > In the Flutter SDK directory, revert to a 3.7.x version (I used 3.7.12): -> -> +> > ``` > $ git checkout 3.7.12 > ``` +> > Then re-configure Cake Wallet's Linux project again. For this open `scripts/linux` (`$cd scripts/linux`) directory and run: > `$ ./cakewallet.sh` > and back to project root directory: @@ -181,7 +198,6 @@ And then export bundle: `$ flatpak build-bundle export cake_wallet.flatpak com.cakewallet.CakeWallet` - Result file: `cake_wallet.flatpak` should be generated in current directory. For install generated flatpak file use: @@ -192,4 +208,4 @@ For run the installed application run: `$ flatpak run com.cakewallet.CakeWallet` -Copyright (c) 2023 Cake Technologies LLC. \ No newline at end of file +Copyright (c) 2023 Cake Technologies LLC. diff --git a/cw_monero/ios/Classes/monero_api.cpp b/cw_monero/ios/Classes/monero_api.cpp index e7f63e1de..a454d3189 100644 --- a/cw_monero/ios/Classes/monero_api.cpp +++ b/cw_monero/ios/Classes/monero_api.cpp @@ -29,8 +29,6 @@ using namespace std::chrono_literals; extern "C" { #endif - const uint64_t MONERO_BLOCK_SIZE = 1000; - struct Utf8Box { char *value; @@ -963,6 +961,7 @@ extern "C" } } + FUNCTION_VISABILITY_ATTRIBUTE void refresh_coins(uint32_t accountIndex) { m_coins_info.clear(); diff --git a/lib/di.dart b/lib/di.dart index 44d74922a..c7a9e54e4 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -195,7 +195,6 @@ import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:cake_wallet/core/secure_storage.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:cake_wallet/core/wallet_creation_service.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cw_core/wallet_type.dart'; @@ -875,7 +874,7 @@ Future setup({ getIt.registerFactory(() => SupportChatPage( - getIt.get(), secureStorage: getIt.get())); + getIt.get(), secureStorage: getIt.get())); getIt.registerFactory(() => SupportOtherLinksPage(getIt.get())); diff --git a/lib/router.dart b/lib/router.dart index 997248b1b..225a1ca74 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -469,6 +469,7 @@ Route createRoute(RouteSettings settings) { case Routes.support: return CupertinoPageRoute( + fullscreenDialog: true, builder: (_) => getIt.get()); case Routes.supportLiveChat: diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart index f46ef3711..f49047e0b 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart @@ -2,6 +2,9 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:cake_wallet/themes/extensions/balance_page_theme.dart'; import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart'; import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart'; +import 'package:cake_wallet/themes/extensions/balance_page_theme.dart'; +import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart'; +import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart'; import 'package:flutter/material.dart'; class DesktopActionButton extends StatelessWidget { @@ -35,7 +38,7 @@ class DesktopActionButton extends StatelessWidget { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, + color: Theme.of(context).extension()!.syncedBackgroundColor, ), child: Center( child: Row( diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index 6b1262020..d583f9933 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -233,7 +233,7 @@ class _WalletNameFormState extends State { color: Theme.of(context).extension()!.hintTextColor, ), - hintText: S.of(context).repeate_wallet_password, + hintText: S.of(context).repeat_wallet_password, focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context) diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart index 9db82db0b..6665e8f49 100644 --- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart @@ -153,7 +153,7 @@ class WalletRestoreFromKeysFromState extends State { padding: EdgeInsets.only(top: 20.0), child: BaseTextFormField( controller: repeatedPasswordTextEditingController, - hintText: S.of(context).repeate_wallet_password, + hintText: S.of(context).repeat_wallet_password, obscureText: true))], Container(height: 20), _restoreFromKeysFormFields(), diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart index 9c193daf3..a55fceb0d 100644 --- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart @@ -148,7 +148,7 @@ class WalletRestoreFromSeedFormState extends State { obscureText: true), BaseTextFormField( controller: repeatedPasswordTextEditingController, - hintText: S.of(context).repeate_wallet_password, + hintText: S.of(context).repeat_wallet_password, obscureText: true)], if (widget.displayLanguageSelector) GestureDetector( diff --git a/lib/src/screens/support_chat/support_chat_page.dart b/lib/src/screens/support_chat/support_chat_page.dart index e84965b23..c7aa3a881 100644 --- a/lib/src/screens/support_chat/support_chat_page.dart +++ b/lib/src/screens/support_chat/support_chat_page.dart @@ -3,14 +3,14 @@ import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/support_chat/widgets/chatwoot_widget.dart'; import 'package:cake_wallet/view_model/support_view_model.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:cake_wallet/core/secure_storage.dart'; class SupportChatPage extends BasePage { SupportChatPage(this.supportViewModel, {required this.secureStorage}); final SupportViewModel supportViewModel; - final FlutterSecureStorage secureStorage; + final SecureStorage secureStorage; @override String get title => S.current.settings_support; diff --git a/lib/src/screens/support_chat/widgets/chatwoot_widget.dart b/lib/src/screens/support_chat/widgets/chatwoot_widget.dart index d9a5f9bb8..72e48c3ef 100644 --- a/lib/src/screens/support_chat/widgets/chatwoot_widget.dart +++ b/lib/src/screens/support_chat/widgets/chatwoot_widget.dart @@ -2,14 +2,14 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:cake_wallet/core/secure_storage.dart'; const COOKIE_KEY = 'chatwootCookie'; class ChatwootWidget extends StatefulWidget { ChatwootWidget(this.secureStorage, {required this.supportUrl}); - final FlutterSecureStorage secureStorage; + final SecureStorage secureStorage; final String supportUrl; @override diff --git a/model_generator.sh b/model_generator.sh index f45fe9637..4a20a59be 100755 --- a/model_generator.sh +++ b/model_generator.sh @@ -1,8 +1,8 @@ #!/bin/sh -cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd .. -cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd .. -cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd .. -cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd .. -cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd .. -flutter packages pub run build_runner build --delete-conflicting-outputs \ No newline at end of file +cd cw_core; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd .. +cd cw_monero; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd .. +cd cw_bitcoin; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd .. +cd cw_haven; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd .. +cd cw_ethereum; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd .. +flutter packages pub run build_runner build --delete-conflicting-outputs diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index ae3f669ca..f19836225 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -683,6 +683,11 @@ "support_description_other_links": "انضم إلى مجتمعاتنا أو تصل إلينا شركائنا من خلال أساليب أخرى", "select_destination": ".ﻲﻃﺎﻴﺘﺣﻻﺍ ﺦﺴﻨﻟﺍ ﻒﻠﻣ ﺔﻬﺟﻭ ﺪﻳﺪﺤﺗ ءﺎﺟﺮﻟﺍ", "save_to_downloads": "ﺕﻼﻳﺰﻨﺘﻟﺍ ﻲﻓ ﻆﻔﺣ", - "support_description_other_links": "انضم إلى مجتمعاتنا أو تصل إلينا شركائنا من خلال أساليب أخرى", - "auto_generate_subaddresses": "تلقائي توليد subddresses" -} + "auto_generate_subaddresses": "تلقائي توليد subddresses", + "invalid_password": "رمز مرور خاطئ", + "unlock": "الغاء القفل", + "enter_wallet_password": "أدخل كلمة مرور المحفظة", + "repeat_wallet_password": "كرر كلمة مرور المحفظة", + "wallet_password_is_empty": "كلمة مرور المحفظة فارغة. يجب ألا تكون كلمة مرور المحفظة فارغة", + "repeated_password_is_incorrect": "كلمة المرور المتكررة غير صحيحة. يرجى تكرار كلمة مرور المحفظة مرة أخرى." +} \ No newline at end of file diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index ac2a08088..b4e7ddcf2 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -679,5 +679,11 @@ "support_title_other_links": "Други връзки за поддръжка", "support_description_other_links": "Присъединете се към нашите общности или се свържете с нас нашите партньори чрез други методи", "select_destination": "Моля, изберете дестинация за архивния файл.", - "save_to_downloads": "Запазване в Изтегляния" -} + "save_to_downloads": "Запазване в Изтегляния", + "invalid_password": "Невалидна парола", + "unlock": "Отключване", + "enter_wallet_password": "Въведете паролата за портфейла", + "repeat_wallet_password": "Повторете паролата на портфейла", + "wallet_password_is_empty": "Паролата за портфейл е празна. Паролата за портфейл не трябва да е празна", + "repeated_password_is_incorrect": "Многократната парола е неправилна. Моля, повторете отново паролата за портфейла." +} \ No newline at end of file diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 38e01ca6b..ca95a630d 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -679,5 +679,11 @@ "support_title_other_links": "Další odkazy na podporu", "support_description_other_links": "Připojte se k našim komunitám nebo se k nám oslovte další metody", "select_destination": "Vyberte cíl pro záložní soubor.", - "save_to_downloads": "Uložit do Stažených souborů" -} + "save_to_downloads": "Uložit do Stažených souborů", + "invalid_password": "Neplatné heslo", + "unlock": "Odemknout", + "enter_wallet_password": "Zadejte heslo peněženky", + "repeat_wallet_password": "Opakujte heslo peněženky", + "wallet_password_is_empty": "Heslo peněženky je prázdné. Heslo peněženky by nemělo být prázdné", + "repeated_password_is_incorrect": "Opakované heslo je nesprávné. Znovu opakujte heslo peněženky." +} \ No newline at end of file diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index afc5fba82..8ea91764e 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -641,7 +641,7 @@ "matrix_green_dark_theme": "Matrix Green Dark Theme", "monero_light_theme": "Monero Light-Thema", "auto_generate_subaddresses": "Unteradressen automatisch generieren", - "cake_2fa_preset" : "Cake 2FA-Voreinstellung", + "cake_2fa_preset": "Cake 2FA-Voreinstellung", "narrow": "Eng", "normal": "Normal", "aggressive": "Übereifrig", @@ -687,5 +687,11 @@ "support_title_other_links": "Andere Support-Links", "support_description_other_links": "Treten Sie unseren Communities bei oder erreichen Sie uns oder unsere Partner über andere Methoden", "select_destination": "Bitte wählen Sie das Ziel für die Sicherungsdatei aus.", - "save_to_downloads": "Unter „Downloads“ speichern" -} + "save_to_downloads": "Unter „Downloads“ speichern", + "invalid_password": "Ungültiges Passwort", + "unlock": "Freischalten", + "enter_wallet_password": "Geben Sie das Brieftaschenkennwort ein", + "repeat_wallet_password": "Wiederholen Sie das Brieftaschenkennwort", + "wallet_password_is_empty": "Brieftaschenkennwort ist leer. Brieftaschenkennwort sollte nicht leer sein", + "repeated_password_is_incorrect": "Wiederholtes Passwort ist falsch. Bitte wiederholen Sie das Brieftaschenkennwort erneut." +} \ No newline at end of file diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 4698701de..7ea2c76cf 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Other support links", "support_description_other_links": "Join our communities or reach us our our partners through other methods", "select_destination": "Please select destination for the backup file.", - "save_to_downloads": "Save to Downloads" -} + "save_to_downloads": "Save to Downloads", + "invalid_password": "Invalid password", + "unlock": "Unlock", + "enter_wallet_password": "Enter the wallet password", + "repeat_wallet_password": "Repeat the wallet password", + "wallet_password_is_empty": "Wallet password is empty. Wallet password should not be empty", + "repeated_password_is_incorrect": "Repeated password is incorrect. Please repeat the wallet password again." +} \ No newline at end of file diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 8a4519255..83f1457ba 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Otros enlaces de soporte", "support_description_other_links": "Únase a nuestras comunidades o comuníquese con nosotros nuestros socios a través de otros métodos", "select_destination": "Seleccione el destino del archivo de copia de seguridad.", - "save_to_downloads": "Guardar en Descargas" -} + "save_to_downloads": "Guardar en Descargas", + "invalid_password": "Contraseña invalida", + "unlock": "desbloquear", + "enter_wallet_password": "Ingrese la contraseña de la billetera", + "repeat_wallet_password": "Repita la contraseña de billetera", + "wallet_password_is_empty": "La contraseña de billetera está vacía. La contraseña de la billetera no debe estar vacía", + "repeated_password_is_incorrect": "La contraseña repetida es incorrecta. Repita la contraseña de la billetera nuevamente." +} \ No newline at end of file diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index 357a73110..1aef26efd 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Autres liens d'assistance", "support_description_other_links": "Rejoignez nos communautés ou contactez-nous nos partenaires à travers d'autres méthodes", "select_destination": "Veuillez sélectionner la destination du fichier de sauvegarde.", - "save_to_downloads": "Enregistrer dans les téléchargements" -} + "save_to_downloads": "Enregistrer dans les téléchargements", + "invalid_password": "Mot de passe incorrect", + "unlock": "Ouvrir", + "enter_wallet_password": "Entrez le mot de passe du portefeuille", + "repeat_wallet_password": "Répétez le mot de passe du portefeuille", + "wallet_password_is_empty": "Le mot de passe du portefeuille est vide. Le mot de passe du portefeuille ne doit pas être vide", + "repeated_password_is_incorrect": "Le mot de passe répété est incorrect. Veuillez répéter le mot de passe du portefeuille." +} \ No newline at end of file diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index d344bfb15..67751ac2b 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -665,5 +665,11 @@ "support_title_other_links": "Sauran hanyoyin tallafi", "support_description_other_links": "Kasance tare da al'ummominmu ko kuma ka kai mu abokanmu ta hanyar wasu hanyoyi", "select_destination": "Da fatan za a zaɓi wurin da za a yi wa madadin fayil ɗin.", - "save_to_downloads": "Ajiye zuwa Zazzagewa" -} + "save_to_downloads": "Ajiye zuwa Zazzagewa", + "invalid_password": "Kalmar sirri mara inganci", + "unlock": "Buɗe", + "enter_wallet_password": "Shigar da kalmar sirri ta walat", + "repeat_wallet_password": "Maimaita kalmar sirri", + "wallet_password_is_empty": "Alamar Wallet babu komai. Al'adun Wallet bai zama komai ba", + "repeated_password_is_incorrect": "Maimaita kalmar sirri ba daidai ba ce. Da fatan za a sake maimaita kalmar sirri." +} \ No newline at end of file diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index e9ee219fe..2afb5513b 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -687,5 +687,11 @@ "support_title_other_links": "अन्य समर्थन लिंक", "support_description_other_links": "हमारे समुदायों में शामिल हों या अन्य तरीकों के माध्यम से हमारे साथी तक पहुंचें", "select_destination": "कृपया बैकअप फ़ाइल के लिए गंतव्य का चयन करें।", - "save_to_downloads": "डाउनलोड में सहेजें" -} + "save_to_downloads": "डाउनलोड में सहेजें", + "invalid_password": "अवैध पासवर्ड", + "unlock": "अनलॉक", + "enter_wallet_password": "वॉलेट पासवर्ड दर्ज करें", + "repeat_wallet_password": "वॉलेट पासवर्ड दोहराएं", + "wallet_password_is_empty": "वॉलेट पासवर्ड खाली है। वॉलेट पासवर्ड खाली नहीं होना चाहिए", + "repeated_password_is_incorrect": "बार -बार पासवर्ड गलत है। कृपया फिर से वॉलेट पासवर्ड दोहराएं।" +} \ No newline at end of file diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index 91176248d..ec6ba4792 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Ostale veze za podršku", "support_description_other_links": "Pridružite se našim zajednicama ili nam dosegnu naše partnere drugim metodama", "select_destination": "Odaberite odredište za datoteku sigurnosne kopije.", - "save_to_downloads": "Spremi u Preuzimanja" -} + "save_to_downloads": "Spremi u Preuzimanja", + "invalid_password": "Netočna zaporka", + "unlock": "Otključati", + "enter_wallet_password": "Unesite lozinku za novčanik", + "repeat_wallet_password": "Ponovite lozinku za novčanik", + "wallet_password_is_empty": "Lozinka za novčanik je prazna. Lozinka za novčanik ne bi trebala biti prazna", + "repeated_password_is_incorrect": "Ponovljena lozinka je netočna. Molimo ponovite lozinku za novčanik." +} \ No newline at end of file diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index daebfd579..68e8874b9 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -675,5 +675,11 @@ "support_title_other_links": "Tautan dukungan lainnya", "support_description_other_links": "Bergabunglah dengan komunitas kami atau hubungi kami mitra kami melalui metode lain", "select_destination": "Silakan pilih tujuan untuk file cadangan.", - "save_to_downloads": "Simpan ke Unduhan" -} + "save_to_downloads": "Simpan ke Unduhan", + "invalid_password": "Kata sandi salah", + "unlock": "Membuka kunci", + "enter_wallet_password": "Masukkan Kata Sandi Dompet", + "repeat_wallet_password": "Ulangi Kata Sandi Dompet", + "wallet_password_is_empty": "Kata sandi dompet kosong. Kata sandi dompet tidak boleh kosong", + "repeated_password_is_incorrect": "Kata sandi yang diulang tidak benar. Harap ulangi kata sandi dompet lagi." +} \ No newline at end of file diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 691abd15c..923336968 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Altri collegamenti di supporto", "support_description_other_links": "Unisciti alle nostre comunità o raggiungici i nostri partner attraverso altri metodi", "select_destination": "Seleziona la destinazione per il file di backup.", - "save_to_downloads": "Salva in Download" -} + "save_to_downloads": "Salva in Download", + "invalid_password": "Password non valida", + "unlock": "Sbloccare", + "enter_wallet_password": "Immettere la password del portafoglio", + "repeat_wallet_password": "Ripeti la password del portafoglio", + "wallet_password_is_empty": "La password del portafoglio è vuota. La password del portafoglio non dovrebbe essere vuota", + "repeated_password_is_incorrect": "La password ripetuta non è corretta. Si prega di ripetere di nuovo la password del portafoglio." +} \ No newline at end of file diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 254d7bbba..67b7b278c 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -687,5 +687,11 @@ "support_description_other_links": "私たちのコミュニティに参加するか、他の方法を通して私たちのパートナーに連絡してください", "select_destination": "バックアップファイルの保存先を選択してください。", "save_to_downloads": "ダウンロードに保存", - "auto_generate_subaddresses": "Autoはサブアドレスを生成します" -} + "auto_generate_subaddresses": "Autoはサブアドレスを生成します", + "invalid_password": "無効なパスワード", + "unlock": "ロックを解除します", + "enter_wallet_password": "ウォレットパスワードを入力します", + "repeat_wallet_password": "ウォレットパスワードを繰り返します", + "wallet_password_is_empty": "ウォレットパスワードは空です。ウォレットのパスワードは空にしてはいけません", + "repeated_password_is_incorrect": "繰り返しパスワードが正しくありません。ウォレットのパスワードをもう一度繰り返してください。" +} \ No newline at end of file diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 63a446fa3..d76f11fdd 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -687,5 +687,11 @@ "support_description_other_links": "다른 방법을 통해 커뮤니티에 가입하거나 파트너에게 연락하십시오.", "select_destination": "백업 파일의 대상을 선택하십시오.", "save_to_downloads": "다운로드에 저장", - "auto_generate_subaddresses": "자동 생성 서브 아드 드레스" -} + "auto_generate_subaddresses": "자동 생성 서브 아드 드레스", + "invalid_password": "유효하지 않은 비밀번호", + "unlock": "터놓다", + "enter_wallet_password": "지갑 암호를 입력하십시오", + "repeat_wallet_password": "지갑 암호를 반복하십시오", + "wallet_password_is_empty": "지갑 암호는 비어 있습니다. 지갑 암호는 비어 있지 않아야합니다", + "repeated_password_is_incorrect": "반복 된 비밀번호가 올바르지 않습니다. 지갑 암호를 다시 반복하십시오." +} \ No newline at end of file diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index b131e66d8..4745fa243 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -685,5 +685,11 @@ "support_description_other_links": "ကျွန်ုပ်တို့၏လူမှုအသိုင်းအဝိုင်းများသို့ 0 င်ရောက်ပါ", "select_destination": "အရန်ဖိုင်အတွက် ဦးတည်ရာကို ရွေးပါ။", "save_to_downloads": "ဒေါင်းလုဒ်များထံ သိမ်းဆည်းပါ။", - "auto_generate_subaddresses": "အော်တို Generate Subaddresses" -} + "auto_generate_subaddresses": "အော်တို Generate Subaddresses", + "invalid_password": "မမှန်ကန်သောစကားဝှက်", + "unlock": "သော့ဖွင့်", + "enter_wallet_password": "ပိုက်ဆံအိတ်စကားဝှက်ကိုရိုက်ထည့်ပါ", + "repeat_wallet_password": "ပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ", + "wallet_password_is_empty": "ပိုက်ဆံအိတ်စကားဝှက်သည်ဗလာဖြစ်သည်။ ပိုက်ဆံအိတ်စကားဝှက်သည်အချည်းနှီးဖြစ်သင့်သည်", + "repeated_password_is_incorrect": "ထပ်ခါတလဲလဲစကားဝှက်မမှန်ကန်ပါ ကျေးဇူးပြုပြီးပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ။" +} \ No newline at end of file diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index fcd683fd1..a68935e4c 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Andere ondersteuningslinks", "support_description_other_links": "Word lid van onze gemeenschappen of bereik ons ​​onze partners via andere methoden", "select_destination": "Selecteer de bestemming voor het back-upbestand.", - "save_to_downloads": "Opslaan in downloads" -} + "save_to_downloads": "Opslaan in downloads", + "invalid_password": "Ongeldig wachtwoord", + "unlock": "Ontgrendelen", + "enter_wallet_password": "Voer het Wallet -wachtwoord in", + "repeat_wallet_password": "Herhaal het Wallet -wachtwoord", + "wallet_password_is_empty": "Wallet -wachtwoord is leeg. Wallet -wachtwoord mag niet leeg zijn", + "repeated_password_is_incorrect": "Herhaald wachtwoord is onjuist. Herhaal het Wallet -wachtwoord opnieuw." +} \ No newline at end of file diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 17745ccb8..076973c23 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Inne linki wsparcia", "support_description_other_links": "Dołącz do naszych społeczności lub skontaktuj się z nami naszymi partnerami za pomocą innych metod", "select_destination": "Wybierz miejsce docelowe dla pliku kopii zapasowej.", - "save_to_downloads": "Zapisz w Pobranych" -} + "save_to_downloads": "Zapisz w Pobranych", + "invalid_password": "Nieprawidłowe hasło", + "unlock": "Odblokować", + "enter_wallet_password": "Wprowadź hasło portfela", + "repeat_wallet_password": "Powtórz hasło portfela", + "wallet_password_is_empty": "Hasło portfela jest puste. Hasło portfela nie powinno być puste", + "repeated_password_is_incorrect": "Powtarzane hasło jest nieprawidłowe. Powtórz ponownie hasło portfela." +} \ No newline at end of file diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 2148e6905..ed01f6e69 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -686,5 +686,11 @@ "support_title_other_links": "Outros links de suporte", "support_description_other_links": "Junte -se às nossas comunidades ou chegue a nós nossos parceiros por meio de outros métodos", "select_destination": "Selecione o destino para o arquivo de backup.", - "save_to_downloads": "Salvar em Downloads" -} + "save_to_downloads": "Salvar em Downloads", + "invalid_password": "Senha inválida", + "unlock": "Desbloquear", + "enter_wallet_password": "Digite a senha da carteira", + "repeat_wallet_password": "Repita a senha da carteira", + "wallet_password_is_empty": "A senha da carteira está vazia. A senha da carteira não deve estar vazia", + "repeated_password_is_incorrect": "A senha repetida está incorreta. Repita a senha da carteira novamente." +} \ No newline at end of file diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index e229ddee9..f11545111 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -687,5 +687,11 @@ "support_description_other_links": "Присоединяйтесь к нашим сообществам или охватите нас наших партнеров с помощью других методов", "select_destination": "Пожалуйста, выберите место для файла резервной копии.", "save_to_downloads": "Сохранить в загрузках", - "auto_generate_subaddresses": "Авто генерируйте Subaddresses" -} + "auto_generate_subaddresses": "Авто генерируйте Subaddresses", + "invalid_password": "Неверный пароль", + "unlock": "Разблокировать", + "enter_wallet_password": "Введите пароль кошелька", + "repeat_wallet_password": "Повторите пароль кошелька", + "wallet_password_is_empty": "Пароль кошелька пуст. Пароль кошелька не должен быть пустым", + "repeated_password_is_incorrect": "Повторный пароль неверен. Пожалуйста, повторите пароль кошелька снова." +} \ No newline at end of file diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 100929da2..de6cf3bee 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -685,5 +685,11 @@ "support_description_other_links": "เข้าร่วมชุมชนของเราหรือเข้าถึงเราพันธมิตรของเราผ่านวิธีการอื่น ๆ", "select_destination": "โปรดเลือกปลายทางสำหรับไฟล์สำรอง", "save_to_downloads": "บันทึกลงดาวน์โหลด", - "auto_generate_subaddresses": "Auto สร้าง subaddresses" -} + "auto_generate_subaddresses": "Auto สร้าง subaddresses", + "invalid_password": "รหัสผ่านไม่ถูกต้อง", + "unlock": "ปลดล็อค", + "enter_wallet_password": "ป้อนรหัสผ่านกระเป๋าเงิน", + "repeat_wallet_password": "ทำซ้ำรหัสผ่านกระเป๋าเงิน", + "wallet_password_is_empty": "รหัสผ่านกระเป๋าเงินว่างเปล่า รหัสผ่านกระเป๋าเงินไม่ควรว่างเปล่า", + "repeated_password_is_incorrect": "รหัสผ่านซ้ำไม่ถูกต้อง โปรดทำซ้ำรหัสผ่านกระเป๋าเงินอีกครั้ง" +} \ No newline at end of file diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index e74d1a281..7819cfff1 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -685,5 +685,11 @@ "support_title_other_links": "Diğer destek bağlantıları", "support_description_other_links": "Topluluklarımıza katılın veya ortaklarımıza diğer yöntemlerle bize ulaşın", "select_destination": "Lütfen yedekleme dosyası için hedef seçin.", - "save_to_downloads": "İndirilenlere Kaydet" -} + "save_to_downloads": "İndirilenlere Kaydet", + "invalid_password": "Geçersiz şifre", + "unlock": "Kilidini aç", + "enter_wallet_password": "Cüzdan şifresini girin", + "repeat_wallet_password": "Cüzdan şifresini tekrarlayın", + "wallet_password_is_empty": "Cüzdan şifresi boş. Cüzdan şifresi boş olmamalı", + "repeated_password_is_incorrect": "Tekrarlanan şifre yanlış. Lütfen cüzdan şifresini tekrarlayın." +} \ No newline at end of file diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 313f6aeb0..a3c547829 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -687,5 +687,11 @@ "support_title_other_links": "Інші посилання на підтримку", "support_description_other_links": "Приєднуйтесь до наших спільнот або досягайте нас нашими партнерами іншими методами", "select_destination": "Виберіть місце призначення для файлу резервної копії.", - "save_to_downloads": "Зберегти до завантажень" -} + "save_to_downloads": "Зберегти до завантажень", + "invalid_password": "Недійсний пароль", + "unlock": "Розблокувати", + "enter_wallet_password": "Введіть пароль гаманця", + "repeat_wallet_password": "Повторіть пароль гаманця", + "wallet_password_is_empty": "Пароль гаманця порожній. Пароль гаманця не повинен бути порожнім", + "repeated_password_is_incorrect": "Повторний пароль невірний. Будь ласка, повторіть пароль гаманця ще раз." +} \ No newline at end of file diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index b8e0c0a00..71b43ab3d 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -679,5 +679,11 @@ "support_description_other_links": "ہماری برادریوں میں شامل ہوں یا دوسرے طریقوں سے ہمارے شراکت داروں تک پہنچیں", "select_destination": "۔ﮟﯾﺮﮐ ﺏﺎﺨﺘﻧﺍ ﺎﮐ ﻝﺰﻨﻣ ﮯﯿﻟ ﮯﮐ ﻞﺋﺎﻓ ﭖﺍ ﮏﯿﺑ ﻡﺮﮐ ﮦﺍﺮﺑ", "save_to_downloads": "۔ﮟﯾﺮﮐ ﻅﻮﻔﺤﻣ ﮟﯿﻣ ﺯﮈﻮﻟ ﻥﺅﺍﮈ", - "auto_generate_subaddresses": "آٹو سب ایڈریس تیار کرتا ہے" -} + "auto_generate_subaddresses": "آٹو سب ایڈریس تیار کرتا ہے", + "invalid_password": "غلط پاسورڈ", + "unlock": "غیر مقفل", + "enter_wallet_password": "پرس کا پاس ورڈ درج کریں", + "repeat_wallet_password": "بٹوے کا پاس ورڈ دہرائیں", + "wallet_password_is_empty": "پرس کا پاس ورڈ خالی ہے۔ پرس کا پاس ورڈ خالی نہیں ہونا چاہئے", + "repeated_password_is_incorrect": "بار بار پاس ورڈ غلط ہے۔ براہ کرم دوبارہ پرس کا پاس ورڈ دہرائیں۔" +} \ No newline at end of file diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 143fd0ccd..a70dbf554 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -681,5 +681,11 @@ "monero_light_theme": "Monero Light Akori", "select_destination": "Jọwọ yan ibi ti o nlo fun faili afẹyinti.", "save_to_downloads": "Fipamọ si Awọn igbasilẹ", - "auto_generate_subaddresses": "Aṣiṣe Ibi-Afọwọkọ" -} + "auto_generate_subaddresses": "Aṣiṣe Ibi-Afọwọkọ", + "invalid_password": "Ọrọ igbaniwọle ti ko wulo", + "unlock": "Sisalẹ", + "enter_wallet_password": "Tẹ ọrọ igbaniwọle apamọwọ", + "repeat_wallet_password": "Tun ọrọ igbaniwọle apamọwọ naa", + "wallet_password_is_empty": "Ọrọ igbaniwọle apamọwọ ti ṣofo. Ọrọ igbaniwọle apamọwọ ko yẹ ki o ṣofo", + "repeated_password_is_incorrect": "Ọrọ igbaniwọle tun jẹ aṣiṣe. Jọwọ tun ọrọigbaniwọle apamọwọ lẹẹkansi." +} \ No newline at end of file diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 7e3ceae31..c7c438ae4 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -686,5 +686,11 @@ "monero_light_theme": "门罗币浅色主题", "select_destination": "请选择备份文件的目的地。", "save_to_downloads": "保存到下载", - "auto_generate_subaddresses": "自动生成子辅助" -} + "auto_generate_subaddresses": "自动生成子辅助", + "invalid_password": "无效的密码", + "unlock": "开锁", + "enter_wallet_password": "输入钱包密码", + "repeat_wallet_password": "重复钱包密码", + "wallet_password_is_empty": "钱包密码为空。钱包密码不应为空", + "repeated_password_is_incorrect": "重复密码不正确。请再次重复钱包密码。" +} \ No newline at end of file diff --git a/scripts/linux/build_monero.sh b/scripts/linux/build_monero.sh index 559b424fb..fbef130ea 100755 --- a/scripts/linux/build_monero.sh +++ b/scripts/linux/build_monero.sh @@ -2,16 +2,14 @@ . ./config.sh - MONERO_URL="https://github.com/cake-tech/monero.git" MONERO_DIR_PATH="${EXTERNAL_LINUX_SOURCE_DIR}/monero" MONERO_VERSION=release-v0.18.2.2 -BUILD_TYPE=release PREFIX=${EXTERNAL_LINUX_DIR} DEST_LIB_DIR=${EXTERNAL_LINUX_LIB_DIR}/monero DEST_INCLUDE_DIR=${EXTERNAL_LINUX_INCLUDE_DIR}/monero -echo "Cloning monero from - $MONERO_URL to - $MONERO_DIR_PATH" +echo "Cloning monero from - $MONERO_URL to - $MONERO_DIR_PATH" git clone $MONERO_URL $MONERO_DIR_PATH cd $MONERO_DIR_PATH git checkout $MONERO_VERSION @@ -30,14 +28,12 @@ export CMAKE_LIBRARY_PATH="${PREFIX}/lib" cmake -DSTATIC=ON \ -DBUILD_GUI_DEPS=ON \ -DUNBOUND_INCLUDE_DIR=${EXTERNAL_LINUX_INCLUDE_DIR} \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DUSE_DEVICE_TREZOR=OFF \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DUSE_DEVICE_TREZOR=OFF \ ../.. -make wallet_api -j4 +make wallet_api -j$(($(nproc) / 2)) find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \; cp -r ./lib/* $DEST_LIB_DIR -cp ../../src/wallet/api/wallet2_api.h $DEST_INCLUDE_DIR - - +cp ../../src/wallet/api/wallet2_api.h $DEST_INCLUDE_DIR diff --git a/scripts/linux/gcc10.nix b/scripts/linux/gcc10.nix new file mode 100644 index 000000000..bb68b00af --- /dev/null +++ b/scripts/linux/gcc10.nix @@ -0,0 +1,12 @@ +with import {}; +gcc10Stdenv.mkDerivation { + name="gcc10-stdenv"; + buildInputs = [ + pkgs.cmake + pkgs.pkgconfig + pkgs.autoconf + pkgs.libtool + pkgs.expat + ]; +} +