bump version

Changed the translations accordingly

app/CMakeLists.txt

@@ -121,7 +121,7 @@ set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
 
 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libunbound.a)
 
 add_library(epee STATIC IMPORTED)
 set_target_properties(epee PROPERTIES IMPORTED_LOCATION

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 1401
-        versionName "2.4.1 'Baldaŭ'"
+        versionCode 3003
+        versionName "3.0.3 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -72,7 +72,7 @@ android {
         abi {
             enable true
             reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
@@ -111,6 +111,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.m2049r.xmrwallet'
 }
 
 static def getId(name) {
@@ -129,7 +130,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.preference:preference:1.2.0'
 
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
 
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation "com.squareup.okhttp3:okhttp:4.9.3"

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.m2049r.xmrwallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java

@@ -78,7 +78,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
     }
 
     private static final int VID = 0x2C97;
-    private static final int[] PID_HIDS = {0x0001, 0x0004};
+    private static final int[] PID_HIDS = {0x0001, 0x0004, 0x0005};
 
     private UsbDeviceConnection connection;
     private UsbInterface dongleInterface;

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -916,9 +916,9 @@ public class LoginActivity extends BaseActivity
                     @Override
                     public boolean createWallet(File aFile, String password) {
                         NodeInfo currentNode = getNode();
-                        // get it from the connected node if we have one, and go back ca. 4 days
+                        // get it from the connected node if we have one
                         final long restoreHeight =
-                                (currentNode != null) ? currentNode.getHeight() - 2000 : -1;
+                                (currentNode != null) ? currentNode.getHeight() : -1;
                         Wallet newWallet = WalletManager.getInstance()
                                 .createWallet(aFile, password, MNEMONIC_LANGUAGE, restoreHeight);
                         return checkAndCloseWallet(newWallet);

app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java

@@ -415,7 +415,14 @@ public class NodeFragment extends Fragment
             }
             etNodeHost.setError(null);
             nodeInfo.setRpcPort(port);
-            nodeInfo.setName(etNodeName.getEditText().getText().toString().trim());
+            // setName() may trigger reverse DNS
+            Helper.runWithNetwork(new Helper.Action() {
+                @Override
+                public boolean run() {
+                    nodeInfo.setName(etNodeName.getEditText().getText().toString().trim());
+                    return true;
+                }
+            });
             nodeInfo.setUsername(etNodeUser.getEditText().getText().toString().trim());
             nodeInfo.setPassword(etNodePass.getEditText().getText().toString()); // no trim for pw
             return true;

app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java

@@ -118,9 +118,9 @@ public class WalletFragment extends Fragment
         tvProgress = view.findViewById(R.id.tvProgress);
         pbProgress = view.findViewById(R.id.pbProgress);
         tvBalance = view.findViewById(R.id.tvBalance);
-        showBalance(Helper.getDisplayAmount(0));
+        showBalance();
         tvUnconfirmedAmount = view.findViewById(R.id.tvUnconfirmedAmount);
-        showUnconfirmed(0);
+        showUnconfirmed();
         ivSynced = view.findViewById(R.id.ivSynced);
 
         sCurrency = view.findViewById(R.id.sCurrency);
@@ -205,7 +205,18 @@ public class WalletFragment extends Fragment
         super.onViewCreated(view, savedInstanceState);
     }
 
-    void showBalance(String balance) {
+    String amountToString(double amount) {
+        if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR
+            double amountB = amount * balanceRate;
+            return Helper.getFormattedAmount(amountB, false);
+        } else { // XMR
+            return Helper.getFormattedAmount(amount, true);
+        }
+    }
+
+    void showBalance() {
+        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
+        String balance = amountToString(amountA);
         tvBalance.setText(balance);
         final boolean streetMode = activityCallback.isStreetMode();
         if (!streetMode) {
@@ -218,13 +229,14 @@ public class WalletFragment extends Fragment
         setStreetModeBackground(streetMode);
     }
 
-    void showUnconfirmed(double unconfirmedAmount) {
+    void showUnconfirmed() {
+        double unconfirmedAmount = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
         if (activityCallback.isStreetMode() || unconfirmedAmount == 0) {
             tvUnconfirmedAmount.setText(null);
             tvUnconfirmedAmount.setVisibility(View.GONE);
         } else {
-            String unconfirmed = Helper.getFormattedAmount(unconfirmedAmount, true);
-            tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed));
+            String unconfirmed = amountToString(unconfirmedAmount);
+            tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed, balanceCurrency));
             tvUnconfirmedAmount.setVisibility(View.VISIBLE);
         }
     }
@@ -232,15 +244,8 @@ public class WalletFragment extends Fragment
     void updateBalance() {
         if (isExchanging) return; // wait for exchange to finish - it will fire this itself then.
         // at this point selection is XMR in case of error
-        String displayB;
-        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
-        if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR
-            double amountB = amountA * balanceRate;
-            displayB = Helper.getFormattedAmount(amountB, false);
-        } else { // XMR
-            displayB = Helper.getFormattedAmount(amountA, true);
-        }
-        showBalance(displayB);
+        showBalance();
+        showUnconfirmed();
     }
 
     String balanceCurrency = Helper.BASE_CRYPTO;
@@ -249,11 +254,11 @@ public class WalletFragment extends Fragment
     private final ExchangeApi exchangeApi = ServiceHelper.getExchangeApi();
 
     void refreshBalance() {
-        double unconfirmedXmr = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
-        showUnconfirmed(unconfirmedXmr);
         if (sCurrency.getSelectedItemPosition() == 0) { // XMR
-            double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
-            showBalance(Helper.getFormattedAmount(amountXmr, true));
+            balanceCurrency = Helper.BASE_CRYPTO;
+            balanceRate = 1.0;
+            showBalance();
+            showUnconfirmed();
         } else { // not XMR
             String currency = (String) sCurrency.getSelectedItem();
             Timber.d(currency);
@@ -298,8 +303,7 @@ public class WalletFragment extends Fragment
 
     public void exchangeFailed() {
         sCurrency.setSelection(0, true); // default to XMR
-        double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
-        showBalance(Helper.getFormattedAmount(amountXmr, true));
+        showBalance();
         hideExchanging();
     }
 

app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java

@@ -46,7 +46,7 @@ public class Ledger {
     public static final int SW_OK = 0x9000;
     public static final int SW_INS_NOT_SUPPORTED = 0x6D00;
     public static final int OK[] = {SW_OK};
-    public static final int MINIMUM_LEDGER_VERSION = (1 << 16) + (6 << 8) + (0); // 1.6.0
+    public static final int MINIMUM_LEDGER_VERSION = (1 << 16) + (8 << 8) + (0); // 1.6.0
 
     public static UsbDevice findDevice(UsbManager usbManager) {
         if (!ENABLED) return null;

app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java

@@ -24,6 +24,7 @@ import com.m2049r.xmrwallet.util.RestoreHeight;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -96,8 +97,11 @@ public class WalletManager {
         if (wallet.getStatus().isOk()) {
             // (Re-)Estimate restore height based on what we know
             final long oldHeight = wallet.getRestoreHeight();
+            // Go back 4 days if we don't have a precise restore height
+            Calendar restoreDate = Calendar.getInstance();
+            restoreDate.add(Calendar.DAY_OF_MONTH, -4);
             final long restoreHeight =
-                    (height > -1) ? height : RestoreHeight.getInstance().getHeight(new Date());
+                    (height > -1) ? height : RestoreHeight.getInstance().getHeight(restoreDate.getTime());
             wallet.setRestoreHeight(restoreHeight);
             Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight());
             wallet.setPassword(password); // this rewrites the keys file (which contains the restore height)

app/src/main/java/com/m2049r/xmrwallet/util/LocaleHelper.java

@@ -35,7 +35,8 @@ public class LocaleHelper {
         String[] availableLocales = context.getString(R.string.available_locales).split(",");
 
         for (String localeName : availableLocales) {
-            locales.add(Locale.forLanguageTag(localeName));
+            if (!localeName.startsWith("night") && !localeName.matches("v[0-9]+"))
+                locales.add(Locale.forLanguageTag(localeName));
         }
 
         return locales;

app/src/main/res/layout/fragment_send_amount.xml

@@ -45,7 +45,7 @@
         android:id="@+id/rlSweep"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/ivSweep"

app/src/main/res/values-cat/strings.xml

@@ -134,7 +134,7 @@
     <string name="label_wallet_receive">Rebre</string>
     <string name="label_wallet_send">Enviar</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR sense confirmar</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s sense confirmar</string>
 
     <string name="service_description">Servei de monerujo</string>
 
@@ -290,7 +290,7 @@
     <string name="menu_language">Idioma</string>
     <string name="language_system_default">Utilitzar Idioma del Sistema</string>
 
-    <string name="fab_restore_ledger">Restablir desde Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restablir desde Ledger Nano</string>
 
     <string name="progress_ledger_progress">Comunicant amb Ledger</string>
     <string name="progress_ledger_confirm">Es requereix confirmació en Ledger!</string>

app/src/main/res/values-de/strings.xml

@@ -135,7 +135,7 @@
     <string name="label_wallet_receive">Empfange</string>
     <string name="label_wallet_send">Sende</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR unbestätigt</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s unbestätigt</string>
 
     <string name="service_description">monerujo Service</string>
 
@@ -286,7 +286,7 @@
     <string name="menu_language">Sprache</string>
     <string name="language_system_default">Benutze Systemsprache</string>
 
-    <string name="fab_restore_ledger">Wallet mit Ledger Nano S wiederherstellen</string>
+    <string name="fab_restore_ledger">Wallet mit Ledger Nano wiederherstellen</string>
 
     <string name="progress_ledger_progress">Kommunikation mit Ledger</string>
     <string name="progress_ledger_confirm">Bestätigung auf Ledger benötigt!</string>

app/src/main/res/values-el/strings.xml

@@ -123,7 +123,7 @@
     <string name="label_wallet_receive">Λήψη</string>
     <string name="label_wallet_send">Αποστολή</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR μη επιβεβαιωμένα</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s μη επιβεβαιωμένα</string>
 
     <string name="service_description">Υπηρεσία monerujo</string>
 
@@ -283,7 +283,7 @@
     <string name="menu_language">Language</string>
     <string name="language_system_default">Use System Language</string>
 
-    <string name="fab_restore_ledger">Restore from Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restore from Ledger Nano</string>
 
     <string name="progress_ledger_progress">Communicating with Ledger</string>
     <string name="progress_ledger_confirm">Confirmation on Ledger required!</string>

app/src/main/res/values-eo/strings.xml

@@ -134,7 +134,7 @@
     <string name="label_wallet_receive">Ricevi</string>
     <string name="label_wallet_send">Doni</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR nekonfirmite</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s nekonfirmite</string>
 
     <string name="service_description">monerujo Servo</string>
 
@@ -290,7 +290,7 @@
     <string name="menu_language">Lingvo</string>
     <string name="language_system_default">Uzi la sistemlingvon</string>
 
-    <string name="fab_restore_ledger">Restaŭri de Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaŭri de Ledger Nano</string>
 
     <string name="progress_ledger_progress">Komunikante kun Ledger</string>
     <string name="progress_ledger_confirm">Konfirmo je la Ledger estas postulita!</string>

app/src/main/res/values-es/strings.xml

@@ -86,7 +86,7 @@
     <string name="label_wallet_receive">Recibir</string>
     <string name="label_wallet_send">Enviar</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR sin confirmar</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s sin confirmar</string>
 
     <string name="service_description">Servicio de Monerujo</string>
 
@@ -273,7 +273,7 @@
     <string name="menu_language">Lenguaje</string>
     <string name="language_system_default">Usar Idioma del Sistema</string>
 
-    <string name="fab_restore_ledger">Restaurar desde Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar desde Ledger Nano</string>
 
     <string name="progress_ledger_progress">Comunicándose con Ledger</string>
     <string name="progress_ledger_confirm">¡Confirmación en Ledger requerida!</string>

app/src/main/res/values-et/strings.xml

@@ -132,7 +132,7 @@
     <string name="label_wallet_receive">Küsi raha</string>
     <string name="label_wallet_send">Saada</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR kinnitamata</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s kinnitamata</string>
 
     <string name="service_description">monerujo teenus</string>
 
@@ -285,7 +285,7 @@
     <string name="menu_language">Keel</string>
     <string name="language_system_default">Kasuta süsteemi keelt</string>
 
-    <string name="fab_restore_ledger">Taasta seadmelt Ledger Nano S</string>
+    <string name="fab_restore_ledger">Taasta seadmelt Ledger Nano</string>
 
     <string name="progress_ledger_progress">Suhtlen seadmega Ledger</string>
     <string name="progress_ledger_confirm">Seadmelt Ledger on vajalik kinnitus!</string>

app/src/main/res/values-fa/about.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
+    <string name="about_close">بستن</string>
+    <string name="about_whoami">من مونروجو هستم</string>
+    <string name="about_version">
+    نسخهٔ
+    %1$s (%2$d)
+    </string>
+
+    <string name="credits_text"><![CDATA[
+        <b>دست اندرکاران</b>
+        <br/>
+        m2049r, baltsar777, anhdres, keejef,
+        rehrar, EarlOfEgo, ErCiccione et al.
+        <br/><br/>
+        <a href="https://monerujo.app">monerujo.app</a>
+        ]]></string>
+
+    <string name="privacy_policy"><![CDATA[
+        <h1>خط‌مشی رازداری</h1>
+        <p>این صفحه شما را از سیاست‌های ما در مورد جمع‌آوری، استفاده و افشای اطلاعات شخصی که از کاربران برنامهٔ خود (مونروجو به معنای «کیف‌پول مونرو») دریافت می‌کنیم مطلع می‌کند.</p>
+        <p>با استفاده از برنامه، با جمع‌آوری و استفاده از اطلاعات، مطابق با این سیاست، موافقت می‌کنید.</p>
+        <h2>داده‌های جمع‌آوری شده</h2>
+        <p>داده‌های شخصی هر نوع داده‌ای است که بتواند یک فرد را شناسایی کند.</p>
+        <p>کلیدها و آدرس‌های عمومی مونرو توسط برنامه به صورت داخلی برای پردازش تراکنش‌ها جمع‌آوری و پردازش می‌شوند و به شکل رمزگذاری شده به شبکه مونرو منتقل می شوند.</p>
+        <p>سایر اطلاعات شخصی توسط برنامه جمع‌آوری نمی‌شوند.</p>
+        <p>
+        اگر از قابلیت اختیاری تبدیل رمزارز استفاده کنید، این برنامه نرخ ارز را از طریق API عمومی coinmarketcap.com دریافت می‌کند. برای اطلاع از جزئیات نحوهٔ جمع‌آوری داده‌های درخواست‌هایتان، خط‌مشی رازداری آنها را در
+        <a href="https://coinmarketcap.com/privacy">coinmarketcap.com/privacy</a>
+        ببینید.
+        </p>
+        <p>
+        اگر از برنامه برای پرداخت به آدرس‌های بیت‌کوین استفاده می‌کنید، از سرویس SideShift.ai استفاده خواهید کرد. برای جزئیات بیشتر به خط‌مشی رازداری آنها در
+        <a href="https://sideshift.ai">sideshift.ai</a>
+        مراجعه کنید. مونروجو مقدار و آدرس مقصد بیت‌کوین را برای آنها ارسال می‌کند. آدرس IP شما نیز قابل جمع‌آوری خواهد بود.
+        </p>
+        <h2>دسترسی‌های نرم‌افزار</h2>
+        <ul>
+        <li>اینترنت: اتصال به شبکهٔ مونرو</li>
+        <li>خوانش حافظهٔ خارجی: خواندن فایل‌های کیف‌پول ذخیره شده برروی دستگاه</li>
+        <li>نوشتار حافظهٔ خارجی: نوشتن فایل‌های کیف‌پول ذخیره شده برروی دستگاه</li>
+        <li>قفل بیداری: بیدار نگه داشتن دستگاه در هنگام همگام‌سازی</li>
+        <li>دوربین: اسکن کدهای کیوآر برای ارسال مونرو</li>
+        </ul>
+        <h2>تغییرات در این خط‌مشی رازداری</h2>
+        <p>
+        ممکن است هرازچندگاهی این خط‌مشی رازداری را به‌روز کنیم. ما با ارسال خط‌مشی رازداری جدید در برنامه و وب‌سایت
+        <a href="https://monerujo.app">(www.monerujo.app)</a>
+        شما را از هرگونه تغییر مطلع خواهیم کرد. به شما توصیه می‌شود برای هرگونه تغییر، این خط‌مشی رازداری را به صورت دوره‌ای مرور کنید.
+        </p>
+        <p>آخرین به‌روزرسانی این خط‌مشی رازداری: 10 نوامبر 2017</p>
+        <h2>تماس با ما</h2>
+        <p>
+        اگر در مورد خط‌مشی رازداری ما یا نحوهٔ جمع‌آوری و پردازش داده‌های خود سؤالی دارید، لطفا به
+        <a href="mailto:privacy@monerujo.io">privacy@monerujo.io</a>
+        ایمیل بزنید.
+        </p>
+        ]]></string>
+</resources>

app/src/main/res/values-fr/strings.xml

@@ -134,7 +134,7 @@
     <string name="label_wallet_receive">Recevoir</string>
     <string name="label_wallet_send">Envoyer</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR non confirmés</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s non confirmés</string>
 
     <string name="service_description">Service monerujo</string>
 
@@ -284,7 +284,7 @@
     <string name="tx_subaddress">Sous-adresse</string>
     <string name="generate_address_label_sub">Sous-adresse publique #%1$d: %2$s</string>
 
-    <string name="fab_restore_ledger">Restaurer depuis Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurer depuis Ledger Nano</string>
 
     <string name="progress_ledger_progress">Communication avec Ledger</string>
     <string name="progress_ledger_confirm">Confirmation requise sur Ledger !</string>

app/src/main/res/values-hu/strings.xml

@@ -132,7 +132,7 @@
     <string name="label_wallet_receive">Fogadás</string>
     <string name="label_wallet_send">Küldés</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR függőben</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s függőben</string>
 
     <string name="service_description">monerujo szolgáltatás</string>
 
@@ -283,7 +283,7 @@
     <string name="menu_language">Nyelv</string>
     <string name="language_system_default">Rendszernyelv használata</string>
 
-    <string name="fab_restore_ledger">Visszaállítás Ledger Nano S-ről</string>
+    <string name="fab_restore_ledger">Visszaállítás Ledger Nano-ről</string>
 
     <string name="progress_ledger_progress">Kommunikáció a Ledgerrel</string>
     <string name="progress_ledger_confirm">Ledgeren való megerősítés szükséges!</string>

app/src/main/res/values-it/strings.xml

@@ -134,7 +134,7 @@
     <string name="label_wallet_receive">Ricevi</string>
     <string name="label_wallet_send">Invia</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR non confermati</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s non confermati</string>
 
     <string name="service_description">Servizio monerujo</string>
 
@@ -286,7 +286,7 @@
     <string name="menu_language">Lingua</string>
     <string name="language_system_default">Usa lingua di sistema</string>
 
-    <string name="fab_restore_ledger">Ripristina da Ledger Nano S</string>
+    <string name="fab_restore_ledger">Ripristina da Ledger Nano</string>
 
     <string name="progress_ledger_progress">In comunicazione con Ledger</string>
     <string name="progress_ledger_confirm">Conferma su Ledger richiesta!</string>

app/src/main/res/values-ja/strings.xml

@@ -134,7 +134,7 @@
     <string name="label_wallet_receive">受取り</string>
     <string name="label_wallet_send">送金</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR が未承認</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s が未承認</string>
 
     <string name="service_description">monerujo のサービス</string>
 
@@ -289,7 +289,7 @@
     <string name="menu_language">言語</string>
     <string name="language_system_default">システムの言語を使う</string>
 
-    <string name="fab_restore_ledger">レッジャーナノSから復元</string>
+    <string name="fab_restore_ledger">レッジャーナノから復元</string>
 
     <string name="progress_ledger_progress">レッジャーと通信中</string>
     <string name="progress_ledger_confirm">レッジャーでの承認が必要です!</string>

app/src/main/res/values-nb/strings.xml

@@ -132,7 +132,7 @@
     <string name="label_wallet_receive">Motta</string>
     <string name="label_wallet_send">Gi</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR ubekrefta</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s ubekrefta</string>
 
     <string name="service_description">monerujo tjeneste</string>
 
@@ -283,7 +283,7 @@
     <string name="menu_language">Language</string>
     <string name="language_system_default">Use System Language</string>
 
-    <string name="fab_restore_ledger">Restore from Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restore from Ledger Nano</string>
 
     <string name="progress_ledger_progress">Communicating with Ledger</string>
     <string name="progress_ledger_confirm">Confirmation on Ledger required!</string>

app/src/main/res/values-nl/strings.xml

@@ -132,7 +132,7 @@
     <string name="label_wallet_receive">Ontvangen</string>
     <string name="label_wallet_send">Geven</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR onbevestigd</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s onbevestigd</string>
 
     <string name="service_description">monerujo-service</string>
 
@@ -281,7 +281,7 @@
     <string name="menu_language">Taal</string>
     <string name="language_system_default">Systeemtaal gebruiken</string>
 
-    <string name="fab_restore_ledger">Herstellen met Ledger Nano S</string>
+    <string name="fab_restore_ledger">Herstellen met Ledger Nano</string>
 
     <string name="progress_ledger_progress">Communiceren met Ledger…</string>
     <string name="progress_ledger_confirm">Bevestiging op Ledger vereist!</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -133,7 +133,7 @@
     <string name="label_wallet_receive">Receber</string>
     <string name="label_wallet_send">Enviar</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR não confirmado</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s não confirmado</string>
 
     <string name="service_description">Serviço monerujo</string>
 
@@ -282,7 +282,7 @@
     <string name="menu_language">Idioma</string>
     <string name="language_system_default">Usar o idioma do sistema</string>
 
-    <string name="fab_restore_ledger">Restaurar da Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar da Ledger Nano</string>
 
     <string name="progress_ledger_progress">Comunicando com a Ledger</string>
     <string name="progress_ledger_confirm">Necessária confirmação na Ledger!</string>
@@ -422,13 +422,13 @@ aqui.</string>
     <string name="menu_deletecache">Resetar carteira!</string>
     <string name="deletecache_alert_message"><![CDATA[Esta carteira será resetada, perdendo todos os dados "off-chain" (como notas, contas & nomes de subendereços, chaves de transações privadas, …)! Use isso SOMENTE se esta carteira estiver corrompida e não carrega!]]></string>
 
-    <string name="node_tor_error">Tor required</string>
-    <string name="node_waiting">\u00A0WAITING FOR NODE\u00A0</string>
-    <string name="tor_enable_background">"Allow Background Starts" in Orbot Settings to use Tor!</string>
+    <string name="node_tor_error">Necessário Tor</string>
+    <string name="node_waiting">\u00A0ESPERANDO PELO NÓ\u00A0</string>
+    <string name="tor_enable_background">"Permitir inicializações em segundo plano" nas opções do Orbot para usar o Tor!</string>
     <string name="tor_noshift">SideShift.ai doesn\'t support Tor.\nDisable Tor to swap XMR.</string>
 
-    <string name="label_seed_offset_encrypt">Seed encryption (EXPERIMENTAL)</string>
-    <string name="seed_offset_hint">Seed Offset Phrase (optional)</string>
+    <string name="label_seed_offset_encrypt">Encriptação da Semente (EXPERIMENTAL)</string>
+    <string name="seed_offset_hint">Senha de dedução da semente (opcional)</string>
 
     <string name="menu_settings">Settings</string>
     <string name="title_iface">Interface</string> <!-- like: User Intreface -->

app/src/main/res/values-pt/strings.xml

@@ -130,7 +130,7 @@
     <string name="label_wallet_receive">Receber</string>
     <string name="label_wallet_send">Enviar</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR não confirmado</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s não confirmado</string>
 
     <string name="service_description">Serviço monerujo</string>
 
@@ -285,7 +285,7 @@
     <string name="menu_language">Linguagem</string>
     <string name="language_system_default">Usar linguagem de sistema</string>
 
-    <string name="fab_restore_ledger">Restaurar de Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar de Ledger Nano</string>
 
     <string name="progress_ledger_progress">A comunicar com o Ledger</string>
     <string name="progress_ledger_confirm">Confirmação com Ledger necessária!</string>

app/src/main/res/values-ro/strings.xml

@@ -123,7 +123,7 @@
     <string name="label_wallet_receive">Primește</string>
     <string name="label_wallet_send">Trimite</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR neconfirmat</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s neconfirmat</string>
 
     <string name="service_description">Serviciul monerujo</string>
 
@@ -283,7 +283,7 @@
     <string name="menu_language">Limbă</string>
     <string name="language_system_default">De sistem</string>
 
-    <string name="fab_restore_ledger">Recuperează cu Ledger Nano S</string>
+    <string name="fab_restore_ledger">Recuperează cu Ledger Nano</string>
 
     <string name="progress_ledger_progress">Comunicare cu Ledger</string>
     <string name="progress_ledger_confirm">Confirmare necesară în Ledger!</string>

app/src/main/res/values-ru/strings.xml

@@ -133,7 +133,7 @@
     <string name="label_wallet_receive">Получить</string>
     <string name="label_wallet_send">Передать</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR неподтвержденно</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s неподтвержденно</string>
 
     <string name="service_description">Служба Monerujo</string>
 
@@ -285,7 +285,7 @@
     <string name="menu_language">Язык</string>
     <string name="language_system_default">Использовать язык системы</string>
 
-    <string name="fab_restore_ledger">Восстановление из Ledger Nano S</string>
+    <string name="fab_restore_ledger">Восстановление из Ledger Nano</string>
 
     <string name="progress_ledger_progress">Подключение к Ledger</string>
     <string name="progress_ledger_confirm">Требуется подтверждение в Ledger!</string>
@@ -438,19 +438,19 @@
     <string name="tor_enable_background">Необходимо выбрать "Allow Background Starts" в настройках Orbot для использования Tor!</string>
     <string name="tor_noshift">SideShift.ai не поддерживает Tor.\nОтключите Tor для обмена XMR.</string>
 
-    <string name="label_seed_offset_encrypt">Seed encryption (EXPERIMENTAL)</string>
-    <string name="seed_offset_hint">Seed Offset Phrase (optional)</string>
+    <string name="label_seed_offset_encrypt">Шифрование фразы (ЭКСПЕРЕМЕНТАЛЬНО)</string>
+    <string name="seed_offset_hint">Смещение фразы (необязательно)</string>
 
-    <string name="menu_settings">Settings</string>
-    <string name="title_iface">Interface</string> <!-- like: User Intreface -->
-    <string name="title_info">Information</string>
-    <string name="setting_daynight">Day / Night</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="title_iface">Интерфейс</string> <!-- like: User Intreface -->
+    <string name="title_info">Информация</string>
+    <string name="setting_daynight">Дневная / Ночная</string>
 
-    <string name="setting_theme">Style</string>
+    <string name="setting_theme">Стиль</string>
     <string-array name="themes">
-        <item>Classic</item>
+        <item>Классический</item>
         <item>Baldaŭ</item> <!-- do not translate this one -->
     </string-array>
 
-    <string name="message_qr_failed">Failed to create QR for sharing!</string>
+    <string name="message_qr_failed">Не удалось создать QR!</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -133,7 +133,7 @@
     <string name="label_wallet_receive">Prijať</string>
     <string name="label_wallet_send">Poslať</string>
 
-    <string name="xmr_unconfirmed_amount">+ %1$s XMR nepotvrdených</string>
+    <string name="xmr_unconfirmed_amount">+ %1$s %2$s nepotvrdených</string>
 
     <string name="service_description">monerujo Service</string>
 
@@ -282,7 +282,7 @@
     <string name="menu_language">Jazyk</string>
     <string name="language_system_default">Použi jazyk systému</string>
 
-    <string name="fab_restore_ledger">Obnoviť z Ledger Nano S</string>
+    <string name="fab_restore_ledger">Obnoviť z Ledger Nano</string>
 
     <string name="progress_ledger_progress">Komunikácia s Ledger</string>
     <string name="progress_ledger_confirm">Vyžaduje potvrdenie na Ledgeri!</string>