keep barcode data if unchanged

Co-authored-by: ordtrogen <ordtrogen@users.noreply.github.com>

app/build.gradle

@@ -8,8 +8,8 @@ android {
         compileSdk 35
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 4104
-        versionName "4.1.4 'Exolix'"
+        versionCode 4106
+        versionName "4.1.6 'Exolix'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -108,8 +108,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     namespace 'com.m2049r.xmrwallet'
     buildFeatures {
@@ -123,6 +123,10 @@ android {
             }
         }
     }
+
+    lint {
+        disable "MissingTranslation" // Translation is crowd-sourced.
+    }
 }
 
 static def getId(name) {
@@ -132,40 +136,42 @@ static def getId(name) {
 }
 
 dependencies {
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
+    implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.21'))
 
-    implementation 'androidx.core:core:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core:1.16.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.preference:preference:1.2.1'
 
     implementation 'com.google.android.material:material:1.12.0'
 
+    implementation 'com.google.guava:guava:33.4.8-android'
+
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation "com.squareup.okhttp3:okhttp:4.12.0"
-    implementation "io.github.rburgst:okhttp-digest:3.1.0"
+    implementation 'io.github.rburgst:okhttp-digest:3.1.1'
     implementation "com.jakewharton.timber:timber:5.0.1"
 
     implementation 'info.guardianproject.netcipher:netcipher:2.1.0'
     //implementation 'info.guardianproject.netcipher:netcipher-okhttp3:2.1.0'
     implementation fileTree(dir: 'libs/classes', include: ['*.jar'])
-    implementation 'com.nulab-inc:zxcvbn:1.8.2'
+    implementation 'com.nulab-inc:zxcvbn:1.9.0'
 
-    implementation 'dnsjava:dnsjava:3.5.3'
-    implementation 'org.slf4j:slf4j-nop:2.0.11'
+    implementation 'dnsjava:dnsjava:3.6.3'
+    implementation 'org.slf4j:slf4j-nop:2.0.17'
     implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
 
     //noinspection GradleDependency
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.mockito:mockito-all:1.10.19"
     testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
-    testImplementation 'org.json:json:20231013'
+    testImplementation 'org.json:json:20250517'
     testImplementation 'net.jodah:concurrentunit:0.4.6'
 
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
 }

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

@@ -908,7 +908,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         BarcodeData bcData = BarcodeData.fromString(qrCode);
         if (bcData != null) {
             popFragmentStack(null);
-            Timber.d("AAA");
             onUriScanned(bcData);
             return true;
         } else {

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

@@ -51,6 +51,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.StickyFiatHelper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
@@ -131,6 +132,7 @@ public class WalletFragment extends Fragment
         ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(requireContext(), R.layout.item_spinner_balance, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         sCurrency.setAdapter(spinnerAdapter);
+        StickyFiatHelper.setPreferredCurrencyPosition(sCurrency);
 
         bSend = view.findViewById(R.id.bSend);
         bReceive = view.findViewById(R.id.bReceive);
@@ -182,6 +184,7 @@ public class WalletFragment extends Fragment
         sCurrency.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+                StickyFiatHelper.setPreferredFiatSymbol(requireContext(), (String) sCurrency.getSelectedItem());
                 refreshBalance();
             }
 
@@ -315,13 +318,7 @@ public class WalletFragment extends Fragment
             balanceCurrency = Helper.BASE_CRYPTO;
             balanceRate = 1.0;
         } else {
-            int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
-            if (spinnerPosition < 0) { // requested currency not in list
-                Timber.e("Requested currency not in list %s", exchangeRate.getQuoteCurrency());
-                sCurrency.setSelection(0, true);
-            } else {
-                sCurrency.setSelection(spinnerPosition, true);
-            }
+            StickyFiatHelper.setCurrencyPosition(sCurrency, exchangeRate.getQuoteCurrency());
             balanceCurrency = exchangeRate.getQuoteCurrency();
             balanceRate = exchangeRate.getRate();
         }

app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java

@@ -23,7 +23,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DefaultNodes {
     AGORIST("xmr.agor.ist:18089/mainnet/agor.ist"),
-    BOLDSUCK("xmr-de.boldsuck.org:18080/mainnet/boldsuck.org"),
+    BOLDSUCK("xmr-de.boldsuck.org:18081/mainnet/boldsuck.org"),
     boldsuck("6dsdenp6vjkvqzy4wzsnzn6wixkdzihx3khiumyzieauxuxslmcaeiad.onion:18081/mainnet/boldsuck.onion"),
     CAKE("xmr-node.cakewallet.com:18081/mainnet/cakewallet.com"),
     DS_JETZT("monero.ds-jetzt.de:18089/mainnet/ds-jetzt.de"),

app/src/main/java/com/m2049r/xmrwallet/data/Node.java

@@ -16,6 +16,7 @@
 
 package com.m2049r.xmrwallet.data;
 
+import com.google.common.net.HostAndPort;
 import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.OnionHelper;
@@ -169,10 +170,10 @@ public class Node {
             throw new IllegalArgumentException("Too many '/' or too few");
 
         daemonAddress = daParts[0];
-        String[] da = daemonAddress.split(":");
-        if ((da.length > 2) || (da.length < 1))
-            throw new IllegalArgumentException("Too many ':' or too few");
-        String host = da[0];
+        HostAndPort hostAndPort = HostAndPort.fromString(daemonAddress)
+                .withDefaultPort(getDefaultRpcPort())
+                .requireBracketsForIPv6();
+        String host = hostAndPort.getHost();
 
         if (daParts.length == 1) {
             networkType = NetworkType.NetworkType_Mainnet;
@@ -204,22 +205,12 @@ public class Node {
         }
         this.name = name;
 
-        int port;
-        if (da.length == 2) {
-            try {
-                port = Integer.parseInt(da[1]);
-            } catch (NumberFormatException ex) {
-                throw new IllegalArgumentException("Port not numeric");
-            }
-        } else {
-            port = getDefaultRpcPort();
-        }
         try {
             setHost(host);
         } catch (UnknownHostException ex) {
             throw new IllegalArgumentException("cannot resolve host " + host);
         }
-        this.rpcPort = port;
+        this.rpcPort = hostAndPort.getPort();
         this.levinPort = getDefaultLevinPort();
     }
 
@@ -233,7 +224,8 @@ public class Node {
         if (!username.isEmpty() && !password.isEmpty()) {
             sb.append(username).append(":").append(password).append("@");
         }
-        sb.append(host).append(":").append(rpcPort);
+        HostAndPort address = HostAndPort.fromParts(host, rpcPort);
+        sb.append(address.toString());
         sb.append("/");
         switch (networkType) {
             case NetworkType_Mainnet:
@@ -271,7 +263,7 @@ public class Node {
     }
 
     public String getAddress() {
-        return getHostAddress() + ":" + rpcPort;
+        return HostAndPort.fromParts(getHostAddress(), rpcPort).toString();
     }
 
     public String getHostAddress() {

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java

@@ -160,11 +160,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             public void afterTextChanged(Editable editable) {
                 Timber.d("AFTER: %s", editable.toString());
                 BarcodeData bc = sendListener.getBarcodeData();
+                if ((bc != null) && !bc.getAddress().equals(etAddress.getEditText().getText().toString()))
+                    sendListener.setBarcodeData(null); // it's used up now
                 if (bc == null) {
                     final String address = etAddress.getEditText().getText().toString();
                     bc = BarcodeData.fromString(address);
                 }
-                sendListener.setBarcodeData(null); // it's used up now
                 possibleCryptos.clear();
                 selectedCrypto = null;
                 if ((bc != null) && (bc.filter(ShiftService.getPossibleAssets()))) {

app/src/main/java/com/m2049r/xmrwallet/service/shift/provider/exolix/CreateOrderImpl.java

@@ -18,6 +18,7 @@ package com.m2049r.xmrwallet.service.shift.provider.exolix;
 
 import androidx.annotation.NonNull;
 
+import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.service.shift.NetworkCallback;
 import com.m2049r.xmrwallet.service.shift.ShiftApiCall;
 import com.m2049r.xmrwallet.service.shift.ShiftCallback;
@@ -123,7 +124,8 @@ class CreateOrderImpl implements CreateOrder {
             jsonObject.put("rateType", "fixed");
             jsonObject.put("withdrawalAmount", quote.getBtcAmount());
         }
-        jsonObject.put("coinFrom", "XMR");
+        jsonObject.put("coinFrom", Crypto.XMR.getSymbol());
+        jsonObject.put("networkFrom", Crypto.XMR.getNetwork());
         jsonObject.put("coinTo", ShiftService.ASSET.getSymbol());
         jsonObject.put("networkTo", ShiftService.ASSET.getNetwork());
         jsonObject.put("withdrawalAddress", btcAddress);

app/src/main/java/com/m2049r/xmrwallet/service/shift/provider/exolix/QueryOrderParametersImpl.java

@@ -56,11 +56,13 @@ class QueryOrderParametersImpl implements QueryOrderParameters {
         if (btcAmount.getCrypto() == Crypto.XMR) { // we are sending XMR, so float
             params.append("rateType=float");
             params.append("&amount=").append(AmountHelper.format(cryptoAmount.getAmount()));
-            params.append("&coinFrom=XMR");
+            params.append("&coinFrom=").append(Crypto.XMR.getSymbol());
+            params.append("&networkFrom=").append(Crypto.XMR.getNetwork());
         } else { // we are receiving non-XMR, i.e. paying something, so fixed
             params.append("rateType=fixed");
             params.append("&withdrawalAmount=").append(AmountHelper.format(cryptoAmount.getAmount()));
-            params.append("&coinFrom=XMR");
+            params.append("&coinFrom=").append(Crypto.XMR.getSymbol());
+            params.append("&networkFrom=").append(Crypto.XMR.getNetwork());
         }
         params.append("&coinTo=").append(ShiftService.ASSET.getSymbol());
         params.append("&networkTo=").append(ShiftService.ASSET.getNetwork());

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.util;
+
+import android.content.Context;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import androidx.preference.PreferenceManager;
+
+import com.m2049r.xmrwallet.R;
+
+public class StickyFiatHelper {
+
+    public static String getPreferredFiatSymbol(Context ctx) {
+        if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                .getBoolean(ctx.getString(R.string.preferred_stickyfiat), false)) {
+            return PreferenceManager.getDefaultSharedPreferences(ctx)
+                    .getString(ctx.getString(R.string.preferred_stickyfiat_pref), Helper.BASE_CRYPTO);
+        }
+        return null;
+    }
+
+    public static void setPreferredFiatSymbol(Context ctx, String symbol) {
+        if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                .getBoolean(ctx.getString(R.string.preferred_stickyfiat), false)) {
+            PreferenceManager.getDefaultSharedPreferences(ctx).edit()
+                    .putString(ctx.getString(R.string.preferred_stickyfiat_pref), symbol).apply();
+        }
+    }
+
+
+    public static void setPreferredCurrencyPosition(Spinner spinner) {
+        String stickyFiat = StickyFiatHelper.getPreferredFiatSymbol(spinner.getContext());
+        if (stickyFiat != null) {
+            StickyFiatHelper.setCurrencyPosition(spinner, stickyFiat);
+        }
+    }
+
+    public static void setCurrencyPosition(Spinner spinner, String symbol) {
+        @SuppressWarnings("unchecked")
+        int spinnerPosition = ((ArrayAdapter<String>) spinner.getAdapter()).getPosition(symbol);
+        spinner.setSelection(Math.max(spinnerPosition, 0), true);
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeEditText.java

@@ -41,6 +41,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.StickyFiatHelper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 
 import java.util.ArrayList;
@@ -181,7 +182,8 @@ public class ExchangeEditText extends LinearLayout {
     }
 
     void setInitialSpinnerSelections(Spinner baseSpinner, Spinner quoteSpinner) {
-        baseSpinner.setSelection(0, true);
+        //baseSpinner.setSelection(0, true);
+        StickyFiatHelper.setPreferredCurrencyPosition(baseSpinner);
         quoteSpinner.setSelection(0, true);
     }
 

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -44,6 +44,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.StickyFiatHelper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 
 import java.util.ArrayList;
@@ -174,6 +175,7 @@ public class ExchangeView extends LinearLayout {
         pbExchange = findViewById(R.id.pbExchange);
 
         setCurrencyAdapter(sCurrencyA);
+        StickyFiatHelper.setPreferredCurrencyPosition(sCurrencyA);
         setCurrencyAdapter(sCurrencyB);
 
         // make progress circle gray

app/src/main/res/drawable-v24/ic_launcher_monochrome.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.9961111"
+      android:scaleY="0.9961111"
+      android:translateX="0.21"
+      android:translateY="0.21">
+    <path
+        android:pathData="M62.76,39.37a11.13,11.13 0,0 0,-8.86 4.39,11.13 11.13,0 0,0 -15.42,-2.25V40H33.89V67.87h4.59V50.53a6.57,6.57 0,1 1,13.13 0V67.87H56.2V50.53a6.57,6.57 0,1 1,13.13 0V67.87a6.57,6.57 0,0 1,-6.57 6.56V79A11.17,11.17 0,0 0,73.92 67.87V49.28h0A11.24,11.24 0,0 0,62.76 39.37Z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M71.62,33.07m-2.38,0a2.38,2.38 0,1 1,4.76 0a2.38,2.38 0,1 1,-4.76 0"
+        android:fillColor="#fff"/>
+  </group>
+</vector>

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

@@ -2,12 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
     <com.m2049r.xmrwallet.widget.Toolbar
-        style="@style/MonerujoToolbar"
         android:id="@+id/toolbar"
+        style="@style/MonerujoToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@drawable/backgound_toolbar_mainnet"

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

@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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.io/">monerujo.io</a>
+        ]]></string>
+
+    <string name="privacy_policy"><![CDATA[
+        <h1>سياسة الخصوصية</h1>
+        <p>توضح هذه الصفحة لكم سياساتنا بشأن جمع واستخدام وكشف المعلومات الشخصية التي نتلقاها من مستخدمي تطبيقنا مونيروجو  (monerujo: Monero Wallet).
+        </p>
+        <p>من خلال استخدام التطبيق، أنتم توافقون على جمع واستخدام المعلومات وفقًا لهذه السياسة.
+        </p>
+        <h2>البيانات المجمعة</h2>
+        <p>البيانات الشخصية هي أي نوع من البيانات التي يمكن أن تحدد الفرد.
+        </p>
+        <p>يتم جمع مفاتيح وعناوين Monero ومعالجتها محليًا بواسطة التطبيق لغرض معالجة المعاملات ونقلها إلى شبكة Monero
+        بشكل مشفر.
+        </p>
+        <p>لا يتم جمع أي بيانات شخصية أخرى بواسطة التطبيق.</p>
+        <p>إذا كنتم تستخدمون وظيفة التبادل (اختياريًا)، يقوم مونيروجو (Monerujo) بجلب سعر التبادل من خلال واجهة برمجة التطبيقات (API) العامة لـ coinmarketcap.com.
+        انظروا إلى سياسة خصوصيتهم على https://coinmarketcap.com/privacy لمزيد من التفاصيل حول كيفية جمع البيانات في طلباتكم.
+        </p>
+        <p>إذا كنتم تستخدمون التطبيق لدفع الأموال إلى عناوين BTC، فستقومون باستخدام خدمة SideShift.ai.
+        انظروا إلى سياسة خصوصيتهم على https://sideshift.ai/ للحصول على التفاصيل. يقوم مونيروجو (Monerujo) بإرسال عنوان ومبلغ الوجهة BTC إليهم. يمكن جمع عنوان IP الخاص بكم أيضًا.
+        </p>
+        <h2>أذونات التطبيق</h2>
+        <ul>
+        <li>INTERNET: الاتصال بشبكة Monero عبر Monero Daemon</li>
+        <li>READ_EXTERNAL_STORAGE: قراءة ملفات المحفظة المخزنة على الجهاز</li>
+        <li>WRITE_EXTERNAL_STORAGE: كتابة ملفات المحفظة المخزنة على الجهاز</li>
+        <li>WAKE_LOCK: الحفاظ على استيقاظ الجهاز أثناء المزامنة</li>
+        <li>CAMERA: مسح رموز الاستجابة السريعة لاستلام Monero</li>
+        </ul>
+        <h2>تغييرات في السياسة الخصوصية</h2>
+        <p>قد نقوم بتحديث سياسة الخصوصية هذه من وقت لآخر. سنقوم بإعلامكم بأي تغييرات من خلال نشر السياسة الجديدة في التطبيق وعلى
+        الموقع الإلكتروني (www.monerujo.io)
+        يُنصح بمراجعة هذه سياسة بشكل دوري للتحقق من أية تغييرات.
+        <p>تم تحديث هذه سياسة الخصوصية آخر مرة في: 10 نوفمبر، 2017.
+        </p>
+        <h2>تواصلوا معنا</h2>
+        <p>إذا كان لديكم أي أسئلة حول سياسة الخصوصية لدينا،
+        أو كيفية جمع ومعالجة بياناتكم،
+        يُرجى إرسال بريد إلكتروني إلى privacy@monerujo.io.
+        </p>
+        ]]></string>
+</resources>

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

@@ -230,58 +230,4 @@
     ]]></string>
 
     <string name="help_ok">Ja ho tinc!</string> <!-- Note: "Got it" as in "I understand this" -->
-
-    <string name="help_nok">Nah…</string> <!-- Note: "Nah..." as in "I don't want this" -->
-    <string name="help_getorbot">Get Orbot!</string>
-    <string name="help_tor"><![CDATA[
-        <h1>Tor</h1>
-        <p>Tor, short for The Onion Router, is free and open-source software for enabling anonymous
-        communication.</p>
-        <p>Enabling Tor will route your connection through several relays and hide your IP address
-        from the node. Keep in mind this is more private but also <b>slower</b>.</p>
-        <p>In order to use Tor with Monerujo, you\'ll need Orbot installed on your phone. After
-        installing Orbot, make sure to enable it by clicking the network icon on the wallet list
-        screen.</p>
-        <p>If you have issues connecting with Tor, try to get a new Identity in the Orbot App (icon
-        on the top right).</p>
-    ]]></string>
-
-    <string name="help_tor_enable"><![CDATA[
-        <h1>Tor Node</h1>
-        <p>This is an .onion node. In order to use it, you must enable Tor mode by touching the
-        <img src="ic_network_clearnet"/> icon near the top of the Wallet List page.</p>
-    ]]></string>
-
-    <string name="help_sidekick"><![CDATA[
-        <h2>Using your sidekick wallet</h2>
-        Check that both phones are connected via Bluetooth and both apps are opened.
-
-        <h3>On sidekick:</h3>
-        Open your wallet of choice.
-
-        <h3>On monerujo:</h3>
-        Connect to sidekick.
-
-        Open the wallet matching the one you have opened on the sidekick phone.
-
-        Use it as you\'d normally use any wallet. Let it scan to see incoming transactions, share addresses, or send moneros. If the app needs to do something that involves your keys, it\'ll ask for permission from sidekick.
-
-        <h3>On sidekick:</h3>
-        If monerujo requested permission, you should see a dialog that shows the transaction details like amount and fees. You\'ll also see two options, to ACCEPT or DENY it. Choose wisely.
-
-        <h3>On monerujo:</h3>
-        The transaction should be signed and ready to be sent. Press to make it so.
-         <br/>
-    ]]></string>
-
-    <string name="help_create_sidekick" translatable="false"><![CDATA[
-        <h1>Create Wallet - Sidekick</h1>
-        <p>You want to recover your wallet from your awesome Sidekick device.</p>
-        <p>Et netus et malesuada fames. Mattis enim ut tellus elementum sagittis vitae. Eget duis at
-        tellus at. Id aliquet risus feugiat in. Donec et odio pellentesque diam. Dictum fusce ut
-        placerat orci nulla. Amet nisl suscipit adipiscing bibendum est ultricies integer quis.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
 </resources>

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

@@ -344,124 +344,4 @@
     <string name="prompt_ledger_seed_warn">Introduir la vostra llavor del Ledger aquí té un elevat risc de seguretat!</string>
 
     <string name="label_restoreheight">Restablir Alçada</string> <!-- Restore Height -->
-
-    <string name="toast_ledger_start_app">Start Monero App on %1$s</string>
-
-    <string name="menu_rescan">Rescan!</string>
-
-    <string name="onboarding_agree">I get it!</string>
-    <string name="onboarding_button_next">Next</string>
-    <string name="onboarding_button_ready">I\'m ready!</string>
-
-    <string name="onboarding_welcome_title">Welcome to Monerujo!</string>
-    <string name="onboarding_welcome_information">This app allows you to create and use Monero wallets. You can store your sweet moneroj in them.</string>
-    <string name="onboarding_seed_title">Keep your seed safe</string>
-    <string name="onboarding_seed_information">The seed grants full access to whoever has it. If you lose it, we cannot help you recover it and you lose your beloved moneroj.</string>
-    <string name="onboarding_xmrto_title">Send Crypto</string>
-    <string name="onboarding_xmrto_information">Monerujo has exchange support built-in. Just paste or scan a BTC, LTC, ETH, TRXUSDT or SOL address and you\'ll be sending these cryptos by spending XMR.</string>
-    <string name="onboarding_nodes_title">Nodes, your way</string>
-    <string name="onboarding_nodes_information">Nodes connect you to the Monero network. Choose between public nodes or go full cypherpunk using your own.</string>
-    <string name="onboarding_fpsend_title">Send with fingerprint</string>
-    <string name="onboarding_fpsend_information">You\'re now able to send XMR with just your fingerprint if you enabled it. To request the password, just disable fingerprint access.</string>
-
-    <string name="menu_daynight">Dark Mode</string>
-    <string-array name="daynight_themes">
-        <item>Auto</item>
-        <item>Day</item>
-        <item>Night</item>
-    </string-array>
-    <string name="gunther_says">There is nothing here\nPlease create or restore a wallet</string>
-
-    <string name="menu_default_nodes">Restore default nodes</string>
-    <string name="toast_default_nodes">Restoring already in progress…</string>
-
-    <string name="node_updated_now">Last Block: %1$d seconds ago</string>
-    <string name="node_updated_mins">Last Block: %1$d minutes ago</string>
-    <string name="node_updated_hours">Last Block: %1$d hours ago</string>
-    <string name="node_updated_days">Last Block: %1$d days ago</string>
-
-    <string name="shift_noquote">Cannot get quote</string>
-    <string name="shift_checkamount">Check amount and try again</string>
-
-    <string name="info_xmrto_ambiguous"><![CDATA[
-        <b>Ambiguous address.</b><br/>
-        <i>Please select the type above.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help"><![CDATA[
-        <b>Please enter or scan a %1$s address.</b><br/>
-        <i>You&apos;ll send XMR and the receiver will get %2$s using the <b>%3$s</b> service.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help_xmr"><![CDATA[
-        <b>Please enter or scan a Monero address.</b>
-    ]]></string>
-
-    <string name="subbaddress_title">Subaddresses</string>
-    <string name="subbaddress_name_hint">Subaddress Name</string>
-    <string name="max_subaddress_warning">Too many unused addresses - use some to enable creating more!</string>
-    <string name="max_account_warning">Too many unused accounts - use some to enable creating more!</string>
-    <string name="subaddress_tx_label">Transactions for this subaddress:</string>
-    <string name="subaddress_notx_label">No transactions for this subaddress yet</string>
-    <string name="subaddress_select_label">Select a subaddress</string>
-    <string name="subaddress_details_hint">Long-press for details</string>
-
-    <string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
-    <string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
-    <string name="delete_failed">Delete failed!</string>
-
-    <string name="menu_restore">Import wallet</string>
-    <string name="restore_failed">Import failed!</string>
-
-    <string name="menu_deletecache">Reset wallet!</string>
-    <string name="deletecache_alert_message">This wallet will be reset, losing all off-chain data (like notes, account &amp; subaddress names, private transaction keys, &#8230;)! Use this ONLY if this wallet is corrupt and does not load!</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="tor_noshift">%1$s 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="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="setting_theme">Style</string>
-    <string-array name="themes">
-        <item>Classic</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="tx_locked">Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days)</string>
-
-    <string name="label_streetmode">Street Mode enabled\nOnly new transactions will be shown</string>
-
-    <string name="pocketchange_info">To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount.</string>
-    <string name="pocketchange_create_title">Create Change</string>
-
-    <string name="label_apply">APPLY</string>
-
-    <string name="setting_lock">Lock Wallet in Background</string>
-
-    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label">Select Sidekick device</string>
-
-    <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
-    <string name="bluetooth_permissions_ok">OK</string>
-    <string name="bluetooth_permissions_settings">App Settings</string>
-    <string name="bluetooth_permissions_cancel">Cancel</string>
-
-    <string name="sidekick_pin">PIN: %1$s</string>
-    <string name="sidekick_not_connected">[not connected]</string>
-    <string name="sidekick_confirm_tx">Confirm Transaction</string>
-    <string name="sidekick_network_warning">Network is on - this is a security risk. It is recommended
-        to turn on flight mode and restart the app with only Bluetooth enabled!</string>
-    <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
-    <string name="fab_restore_sidekick">Restore from Sidekick</string>
-    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

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

@@ -8,7 +8,7 @@
         <b>Credits</b>
         <br/>
         m2049r, baltsar777, anhdres, keejef,
-        rehrar, EarlOfEgo et al.
+        rehrar, EarlOfEgo, ErCiccione et al.
         <br/><br/>
         <a href="https://monerujo.io/">monerujo.io</a>
         ]]></string>

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

@@ -290,58 +290,4 @@
     ]]></string>
 
     <string name="help_ok">Hab\'s verstanden!</string> <!-- Note: "Got it" as in "I understand this" -->
-
-    <string name="help_nok">Nah…</string> <!-- Note: "Nah..." as in "I don't want this" -->
-    <string name="help_getorbot">Get Orbot!</string>
-    <string name="help_tor"><![CDATA[
-        <h1>Tor</h1>
-        <p>Tor, short for The Onion Router, is free and open-source software for enabling anonymous
-        communication.</p>
-        <p>Enabling Tor will route your connection through several relays and hide your IP address
-        from the node. Keep in mind this is more private but also <b>slower</b>.</p>
-        <p>In order to use Tor with Monerujo, you\'ll need Orbot installed on your phone. After
-        installing Orbot, make sure to enable it by clicking the network icon on the wallet list
-        screen.</p>
-        <p>If you have issues connecting with Tor, try to get a new Identity in the Orbot App (icon
-        on the top right).</p>
-    ]]></string>
-
-    <string name="help_tor_enable"><![CDATA[
-        <h1>Tor Node</h1>
-        <p>This is an .onion node. In order to use it, you must enable Tor mode by touching the
-        <img src="ic_network_clearnet"/> icon near the top of the Wallet List page.</p>
-    ]]></string>
-
-    <string name="help_sidekick"><![CDATA[
-        <h2>Using your sidekick wallet</h2>
-        Check that both phones are connected via Bluetooth and both apps are opened.
-
-        <h3>On sidekick:</h3>
-        Open your wallet of choice.
-
-        <h3>On monerujo:</h3>
-        Connect to sidekick.
-
-        Open the wallet matching the one you have opened on the sidekick phone.
-
-        Use it as you\'d normally use any wallet. Let it scan to see incoming transactions, share addresses, or send moneros. If the app needs to do something that involves your keys, it\'ll ask for permission from sidekick.
-
-        <h3>On sidekick:</h3>
-        If monerujo requested permission, you should see a dialog that shows the transaction details like amount and fees. You\'ll also see two options, to ACCEPT or DENY it. Choose wisely.
-
-        <h3>On monerujo:</h3>
-        The transaction should be signed and ready to be sent. Press to make it so.
-         <br/>
-    ]]></string>
-
-    <string name="help_create_sidekick" translatable="false"><![CDATA[
-        <h1>Create Wallet - Sidekick</h1>
-        <p>You want to recover your wallet from your awesome Sidekick device.</p>
-        <p>Et netus et malesuada fames. Mattis enim ut tellus elementum sagittis vitae. Eget duis at
-        tellus at. Id aliquet risus feugiat in. Donec et odio pellentesque diam. Dictum fusce ut
-        placerat orci nulla. Amet nisl suscipit adipiscing bibendum est ultricies integer quis.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
 </resources>

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

@@ -446,23 +446,4 @@
     <string name="pocketchange_create_title">Erstelle schnellen Wechsel</string>
 
     <string name="label_apply">ANWENDEN</string>
-
-    <string name="setting_lock">Lock Wallet in Background</string>
-
-    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label">Select Sidekick device</string>
-
-    <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
-    <string name="bluetooth_permissions_ok">OK</string>
-    <string name="bluetooth_permissions_settings">App Settings</string>
-    <string name="bluetooth_permissions_cancel">Cancel</string>
-
-    <string name="sidekick_pin">PIN: %1$s</string>
-    <string name="sidekick_not_connected">[not connected]</string>
-    <string name="sidekick_confirm_tx">Confirm Transaction</string>
-    <string name="sidekick_network_warning">Network is on - this is a security risk. It is recommended
-        to turn on flight mode and restart the app with only Bluetooth enabled!</string>
-    <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
-    <string name="fab_restore_sidekick">Restore from Sidekick</string>
-    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

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

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="about_close">Close</string>
-    <string name="about_whoami">I am monerujo</string>
-    <string name="about_version">Version %1$s (%2$d)</string>
-
-    <string name="credits_text"><![CDATA[
-        <b>Credits</b>
-        <br/>
-        m2049r, baltsar777, anhdres, keejef,
-        rehrar, EarlOfEgo et al.
-        <br/><br/>
-        <a href="https://monerujo.io/">monerujo.io</a>
-        ]]></string>
-
-    <string name="privacy_policy"><![CDATA[
-        <h1>Privacy Policy</h1>
-        <p>This page informs you of our policies regarding the collection,
-        use and disclosure of personal information we receive from users of our
-        app (monerujo: Monero Wallet).
-        </p>
-        <p>By using the app, you agree to the collection and use of information in
-        accordance with this policy.
-        </p>
-        <h2>Data Collected</h2>
-        <p>Personal data is any kind of data that could identify an individual.
-        </p>
-        <p>Monero keys and public addresses are collected and processed by the app locally
-        for the purpose of processing transactions and transmitted into the Monero Network
-        in encrypted form.
-        </p>
-        <p>Other personal data is not collected by the app.</p>
-        <p>If you use the exchange (optional) functionality, monerujo fetches the exchange
-        rate through the public API of coinmarketcap.com.
-        See their privacy policy at https://coinmarketcap.com/privacy for
-        details on how data in your requests is collected.</p>
-        <p>If you use the app to pay to BTC addresses, you will be using the Exolix service.
-        See their privacy policy at https://exolix.com/privacy for details. Monerujo send them the BTC
-        destination address and amount. Your IP will also be collectable.</p>
-        <h2>App Permissions</h2>
-        <ul>
-        <li>INTERNET : Connect to the Monero Network via a Monero Daemon Node</li>
-        <li>READ_EXTERNAL_STORAGE : Read wallet files stored on the device</li>
-        <li>WRITE_EXTERNAL_STORAGE : Write wallet files stored on the device</li>
-        <li>WAKE_LOCK : Keep device awake while syncing</li>
-        <li>CAMERA : Scan QR Codes for receiving Monero</li>
-        </ul>
-        <h2>Changes to this Privacy Policy</h2>
-        <p>We may update this privacy policy from time to time. We will notify
-        you of any changes by posting the new privacy policy in the app and on the
-        website (www.monerujo.io)
-        You are advised to review this privacy policy periodically for any changes.
-        <p>This Privacy Policy was last updated: 10th November, 2017.
-        </p>
-        <h2>Contact Us</h2>
-        <p>If you have any questions about our privacy policy,
-        or how your data is being collected and processed,
-        please e-mail privacy@monerujo.io.
-        </p>
-        ]]></string>
-</resources>

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

@@ -174,156 +174,4 @@
         <p>Μόλις η αντίστροφη μέτρηση φθάσει στο μηδέν, χρειάζεται να ξεκινήσεις πάλι την συναλλαγή στο Exolix πηγαίνοντας
         πίσω στο προηγούμενο βήμα και μετά επιστρέφοντας στην οθόνη \"Επιβεβαίωση\".</p>
     ]]></string>
-
-    <string name="help_create_ledger"><![CDATA[
-        <h1>Create Wallet - Ledger</h1>
-        <p>You want to recover your wallet from your Ledger Nano S device.</p>
-        <p>Your secret keys never leave the Ledger device, so you need it plugged in every
-        time you want to access your wallet.</p>
-        <p>Enter a unique wallet name and password. The password is used for securing your wallet data on the Android
-        device. Use a strong password - even better use a passphrase.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
-
-    <string name="help_wallet"><![CDATA[
-        <h1>Το Πορτοφόλι</h1>
-        <h2>Street Mode</h2>
-        <p>Street mode can be enabled/disabled in the menu or Gunther\'s head icon. In this mode, your
-        balance is not shown on any screen so you can safely use your wallet on the street, a pub or
-        other public place. Previous transactions are also hidden. New transactions will be shown, so
-        you can see that you have sent/received sweet Moneroj!</p>
-        <h2>Σάρωση</h2>
-        Επειδή το Monero θέλει να κρατάει τα πράγματα ιδιωτικά, κάθε φορά που ανοίγεις ένα πορτοφόλι
-        Monerujo πρέπει να σαρώσουμε όλο το blockchain για να βρεθούν νέα ληφθέντα Moneroj στο πορτοφόλι σας, αυτό
-        αποθηκεύει μόνο πληροφορίες στο τηλέφωνό σου που ανιστοιχούν στο πορτοφόλι σου. Μερικές φορές
-        μπορεί να χρειαστεί λίγος χρόνος γιατί δεν έχεις συγχρονίσει για μεγάλο χρονικό διάστημα.
-        <h2>Το Υπόλοιπο</h2>
-        <p><b>Βοήθεια! Το υπόλοιπο του πορτοφολιού μου εξαφανίστηκε ή ειναι μη επιβεβαιωμένο!</b><br/>
-        Μην πανικοβάλεσαι! Όταν στέλνεις κεφάλαια από το πορτοφόλι σου, ένα μέρος
-        του υπολοίπου σου θα δείχνει για λίγο ως μη επιβεβαιωμένο.
-        Αυτό συμβαίνει σαν αποτέλεσμα του πως το Monero ανταλλάσεται στο blockchain και το πως δουλεύουν τα ρέστα.
-        Διάβασε περισσότερα για τα ρέστα εδώ(Αγγλικά) https://getmonero.org/resources/moneropedia/change.html
-        <h2>Λίστα Συναλλαγών</h2>
-        <p>Μια λίστα απο τις συναλλαγές του πορτοφολιού. Στα πορτοφόλια παρακολούθησης φαίνοντε μόνο οι εισερχόμενες συναλλαγές.</p>
-    ]]></string>
-
-    <string name="help_node"><![CDATA[
-        <h1>Nodes</h1>
-        <h2>TL;DR</h2>
-        <p>Refresh the nodes list by pulling down &amp; bookmark 3&#8211;5 nodes to allow Monerujo
-        to choose the best one for you!</p>
-        <h2>What&apos;s a Node?</h2>
-        <p>Monerujo uses a Remote Node (sometimes also called Daemon) to communicate with
-        the Monero Network without having to download and store a copy of the
-        whole blockchain itself.<p>
-        <h2>Node List</h2>
-        <p>If the list is empty, you can either add new nodes manually or let Monerujo
-        scan the network for you. Or both. Read on&#8230;</p>
-        <p>The node list shows all currently known nodes. Additionally, the timestamp
-        of the latest block known to each node is shown under the node name. An icon
-        representing the node&apos;s response behaviour
-        (which indicates the level of connectivity to be expected)
-        is shown next to each node.</p>
-        <p>Any node in the list can be bookmarked for later use.
-        Nodes which are not bookmarked will be forgotten.<p>
-        <p>Monerujo will choose the optimal bookmarked node each time you use it.
-        It does this by checking the blockheight (how up-to-date
-        is the node?) as well as the response behaviour (how fast does the node respond to requests?).</p>
-        <p>The list is sorted by these characteristics, so the top node would be the one Monerujo
-        would choose right now. The bottom of the list would show very slow or unavailable nodes.</p>
-        <h2>Add a Node</h2>
-        <p>By touching the &quot;Add Node&quot; button at the bottom, you will be asked to
-        enter the node details in the following dialog.
-        The &quot;Address&quot; is the hostname or IP-address of the node - this is the only
-        mandatory entry.
-        Enter the &quot;Port&quot; if the node runs on a non-default port (e.g. 18089).
-        You can also optionally name the node, so you can identify it easier later on.
-        Some nodes require credentials to use them. Enter the provided username &amp;
-        password in the appropriate fields. Now you can &quot;Test&quot; these setting.
-        The &quot;Test Results&quot; will display the blockheight, response time and actual IP used.
-        The result may also be an error - usually because the hostname provided is
-        not reachable in a sensible amount of time or the credentials are incorrect.
-        Or the hostname/port combination does not point to an actual Monero Node!
-        Once the test passes (no error) - you&apos;re set to press &quot;OK&quot; to save &amp;
-        bookmark this node.</p>
-        <h2>Scan for Nodes</h2>
-        <p>Additionally, you can scan the network for nodes. Monerujo will start
-        scanning the network for Remote Nodes on port 18089. It begins by asking your
-        bookmarked nodes for other peers in the Monero P2P network and then continues
-        by asking those for their peers, and so on. If you have no bookmarked nodes
-        (or they don&apos;t tell us about their peers),
-        Monerujo will go straight to the Monero seed nodes hardcoded into Monero. The
-        scan stops when it finds 10 remote nodes in total.</p>
-    ]]></string>
-
-    <!-- Note for translators: new/changed text also in help_send -->
-
-    <string name="help_uri"><![CDATA[
-        <h1>Using a payment link</h1>
-        <p>You have started monerujo with a payment link. In order to send funds, please do the following:</p>
-        <p>
-        1. Open the wallet you want to spend from<br>
-        2. Wait until the wallet is synced &amp; the "Give" button appears<br>
-        3. Touch the "Give" button
-        </p>
-        <p>The payment details will be filled in. Check them and proceed like for any other transaction.</p>
-    ]]></string>
-
-    <string name="help_ok">Got it!</string> <!-- Note: "Got it" as in "I understand this" -->
-
-    <string name="help_nok">Nah…</string> <!-- Note: "Nah..." as in "I don't want this" -->
-    <string name="help_getorbot">Get Orbot!</string>
-    <string name="help_tor"><![CDATA[
-        <h1>Tor</h1>
-        <p>Tor, short for The Onion Router, is free and open-source software for enabling anonymous
-        communication.</p>
-        <p>Enabling Tor will route your connection through several relays and hide your IP address
-        from the node. Keep in mind this is more private but also <b>slower</b>.</p>
-        <p>In order to use Tor with Monerujo, you\'ll need Orbot installed on your phone. After
-        installing Orbot, make sure to enable it by clicking the network icon on the wallet list
-        screen.</p>
-        <p>If you have issues connecting with Tor, try to get a new Identity in the Orbot App (icon
-        on the top right).</p>
-    ]]></string>
-
-    <string name="help_tor_enable"><![CDATA[
-        <h1>Tor Node</h1>
-        <p>This is an .onion node. In order to use it, you must enable Tor mode by touching the
-        <img src="ic_network_clearnet"/> icon near the top of the Wallet List page.</p>
-    ]]></string>
-
-    <string name="help_sidekick"><![CDATA[
-        <h2>Using your sidekick wallet</h2>
-        Check that both phones are connected via Bluetooth and both apps are opened.
-
-        <h3>On sidekick:</h3>
-        Open your wallet of choice.
-
-        <h3>On monerujo:</h3>
-        Connect to sidekick.
-
-        Open the wallet matching the one you have opened on the sidekick phone.
-
-        Use it as you\'d normally use any wallet. Let it scan to see incoming transactions, share addresses, or send moneros. If the app needs to do something that involves your keys, it\'ll ask for permission from sidekick.
-
-        <h3>On sidekick:</h3>
-        If monerujo requested permission, you should see a dialog that shows the transaction details like amount and fees. You\'ll also see two options, to ACCEPT or DENY it. Choose wisely.
-
-        <h3>On monerujo:</h3>
-        The transaction should be signed and ready to be sent. Press to make it so.
-         <br/>
-    ]]></string>
-
-    <string name="help_create_sidekick" translatable="false"><![CDATA[
-        <h1>Create Wallet - Sidekick</h1>
-        <p>You want to recover your wallet from your awesome Sidekick device.</p>
-        <p>Et netus et malesuada fames. Mattis enim ut tellus elementum sagittis vitae. Eget duis at
-        tellus at. Id aliquet risus feugiat in. Donec et odio pellentesque diam. Dictum fusce ut
-        placerat orci nulla. Amet nisl suscipit adipiscing bibendum est ultricies integer quis.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
 </resources>

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

@@ -244,226 +244,4 @@
     <string name="fab_restore_viewonly">Επαναφορά πορτοφολιού προβολής-μόνο</string>
     <string name="fab_restore_key">Επαναφορά πορτοφολιού από ιδιωτικά κλειδιά</string>
     <string name="fab_restore_seed">Επαναφορά πορτοφολιού από σπόρο 25-λέξεων</string>
-
-    <string name="menu_changepw">Change Passphrase</string>
-    <string name="changepw_progress">Change Password in progress</string>
-    <string name="changepw_failed">Change Password failed!</string>
-    <string name="changepw_success">Password changed</string>
-    <string name="prompt_changepw">New Passphrase for %1$s</string>
-    <string name="prompt_changepwB">Repeat Passphrase for %1$s</string>
-    <string name="prompt_fingerprint_auth">You can also open wallet using fingerprint.\nPlease touch sensor.</string>
-    <string name="prompt_open_wallet">Opening the wallet&#8230;</string>
-    <string name="bad_fingerprint">Fingerprint not recognized. Try again.</string>
-    <string name="bad_saved_password">Saved password is incorrect.\nPlease enter password manually.</string>
-    <string name="generate_fingerprint_hint">Allow to open wallet using fingerprint</string>
-    <string name="generate_fingerprint_warn">
-        <strong>Fingerprint Authentication</strong>
-        <p>With fingerprint authentication enabled, you can view wallet balance and receive funds
-        without entering password.</p>
-        <p>But for additional security, monerujo will still require you to enter password when
-        viewing wallet details or sending funds.</p>
-        <strong>Security Warning</strong>
-        <p>Finally, monerujo wants to remind you that anyone who can get your fingerprint will be
-        able to peep into your wallet balance.</p>
-        <p>For instance, a malicious user around you can open your wallet when you are asleep.</p>
-        <strong>Are you sure to enable this function?</strong>
-    </string>
-    <string name="generate_bad_passwordB">Passphrases do not match</string>
-    <string name="generate_empty_passwordB">Passphrase may not be empty</string>
-    <string name="generate_crazypass_label">Wallet Files Restore Password</string>
-    <string name="accounts_drawer_new">Create Account</string>
-    <string name="accounts_new">Added new account #%1$d</string>
-    <string name="tx_account">Account #</string>
-    <string name="send_sweepall">Send all confirmed funds in this account!</string>
-    <string name="tx_subaddress">Subaddress</string>
-    <string name="generate_address_label_sub">Public Subaddress #%1$d: %2$s</string>
-
-    <string name="menu_language">Language</string>
-    <string name="language_system_default">Use System Language</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>
-    <string name="progress_ledger_lookahead">Retrieving subaddresses</string>
-    <string name="progress_ledger_verify">Verifying keys</string>
-    <string name="progress_ledger_opentx">Doing crazy maths</string>
-    <string name="progress_ledger_mlsag">Hashing stuff</string>
-    <string name="open_wallet_ledger_missing">Please (re)connect Ledger device</string>
-
-    <string name="accounts_progress_new">Creating account</string>
-
-    <string name="toast_ledger_attached">%1$s attached</string>
-    <string name="toast_ledger_detached">%1$s detached</string>
-
-    <string name="receive_desc_hint">Description (optional)</string>
-
-    <string name="send_address_not_openalias">OpenAlias address not available</string>
-    <string name="send_address_openalias">OpenAlias secure &#x2714;</string>
-    <string name="send_address_resolve_openalias">Resolving OpenAlias&#8230;</string>
-    <string name="send_address_no_dnssec">OpenAlias without DNSSEC - address may be spoofed</string>
-
-    <string name="status_wallet_connect_wrongversion">Node version incompatible - please upgrade!</string>
-
-    <string name="menu_info">Λεπτομέριες</string><!--Changed to: Show Secrets!-->
-    <string name="menu_streetmode">Street Mode</string>
-
-    <string name="info_nodes_enabled">Node-o-matiC enabled, tap for more info.</string>
-    <string name="node_height">Last block updated: %1$s</string>
-    <string name="label_nodes">Nodes</string>
-    <string name="node_name_hint">Node Name (Optional)</string>
-    <string name="node_address_hint">Hostname</string>
-    <string name="node_port_hint">Port</string>
-    <string name="node_user_hint">Username (Optional)</string>
-    <string name="node_pass_hint">Password (Optional)</string>
-    <string name="node_host_unresolved">Cannot resolve host</string>
-    <string name="node_host_empty">We need this!</string>
-    <string name="node_port_numeric">Must be numeric</string>
-    <string name="node_port_range">Must be 1&#8211;65535</string>
-    <string name="node_fab_add">Add Node</string>
-    <string name="node_refresh_hint">Touch to refresh!</string>
-    <string name="node_test_error">CONNECTION ERROR %1$d</string>
-    <string name="node_general_error">CONNECTION ERROR</string>
-    <string name="node_auth_error">AUTHENTICATION FAILED</string>
-    <string name="node_result_label">Test Result:</string>
-    <string name="node_result">Height: %1$s (v%2$d), Ping: %3$.0fms, IP: %4$s</string>
-    <string name="node_testing">Testing IP: %1$s &#8230;</string>
-    <string name="node_refresh_wait">Please wait for scan to finish</string>
-    <string name="node_create_hint">Touch to select or add nodes</string>
-    <string name="node_pull_hint">Add nodes manually or pull down to scan</string>
-    <string name="node_scanning">Scanning network&#8230;</string>
-    <string name="node_nobookmark">Automatically bookmarked best %1$d nodes</string>
-    <string name="label_test">Test</string><!--note: as in "Test a network connection"-->
-
-    <string name="send_address_hint">Receiver</string>
-
-    <string name="street_sweep_amount">EVERYTHING!</string> <!-- as in: "everything in the account" = "all the money" -->
-
-    <string name="menu_ledger_seed">Convert Ledger Seed</string>
-    <string name="prompt_ledger_seed">Ledger Seed Words</string>
-    <string name="prompt_ledger_phrase">Ledger Passphrase (optional)</string>
-    <string name="bad_ledger_seed">Invalid Ledger Seed!</string>
-    <string name="prompt_ledger_seed_warn">Entering your Ledger Seed here is a major security risk!</string>
-
-    <string name="label_restoreheight">Ύψος ανάκτησης</string> <!-- "Restore Height" -->
-
-    <string name="toast_ledger_start_app">Start Monero App on %1$s</string>
-
-    <string name="menu_rescan">Rescan!</string>
-
-    <string name="onboarding_agree">I get it!</string>
-    <string name="onboarding_button_next">Next</string>
-    <string name="onboarding_button_ready">I\'m ready!</string>
-
-    <string name="onboarding_welcome_title">Welcome to Monerujo!</string>
-    <string name="onboarding_welcome_information">This app allows you to create and use Monero wallets. You can store your sweet moneroj in them.</string>
-    <string name="onboarding_seed_title">Keep your seed safe</string>
-    <string name="onboarding_seed_information">The seed grants full access to whoever has it. If you lose it, we cannot help you recover it and you lose your beloved moneroj.</string>
-    <string name="onboarding_xmrto_title">Send Crypto</string>
-    <string name="onboarding_xmrto_information">Monerujo has exchange support built-in. Just paste or scan a BTC, LTC, ETH, TRXUSDT or SOL address and you\'ll be sending these cryptos by spending XMR.</string>
-    <string name="onboarding_nodes_title">Nodes, your way</string>
-    <string name="onboarding_nodes_information">Nodes connect you to the Monero network. Choose between public nodes or go full cypherpunk using your own.</string>
-    <string name="onboarding_fpsend_title">Send with fingerprint</string>
-    <string name="onboarding_fpsend_information">You\'re now able to send XMR with just your fingerprint if you enabled it. To request the password, just disable fingerprint access.</string>
-
-    <string name="menu_daynight">Dark Mode</string>
-    <string-array name="daynight_themes">
-        <item>Auto</item>
-        <item>Day</item>
-        <item>Night</item>
-    </string-array>
-    <string name="gunther_says">There is nothing here\nPlease create or restore a wallet</string>
-
-    <string name="menu_default_nodes">Restore default nodes</string>
-    <string name="toast_default_nodes">Restoring already in progress…</string>
-
-    <string name="node_updated_now">Last Block: %1$d seconds ago</string>
-    <string name="node_updated_mins">Last Block: %1$d minutes ago</string>
-    <string name="node_updated_hours">Last Block: %1$d hours ago</string>
-    <string name="node_updated_days">Last Block: %1$d days ago</string>
-
-    <string name="shift_noquote">Cannot get quote</string>
-    <string name="shift_checkamount">Check amount and try again</string>
-
-    <string name="info_xmrto_ambiguous"><![CDATA[
-        <b>Ambiguous address.</b><br/>
-        <i>Please select the type above.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help"><![CDATA[
-        <b>Please enter or scan a %1$s address.</b><br/>
-        <i>You&apos;ll send XMR and the receiver will get %2$s using the <b>%3$s</b> service.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help_xmr"><![CDATA[
-        <b>Please enter or scan a Monero address.</b>
-    ]]></string>
-
-    <string name="subbaddress_title">Subaddresses</string>
-    <string name="subbaddress_name_hint">Subaddress Name</string>
-    <string name="max_subaddress_warning">Too many unused addresses - use some to enable creating more!</string>
-    <string name="max_account_warning">Too many unused accounts - use some to enable creating more!</string>
-    <string name="subaddress_tx_label">Transactions for this subaddress:</string>
-    <string name="subaddress_notx_label">No transactions for this subaddress yet</string>
-    <string name="subaddress_select_label">Select a subaddress</string>
-    <string name="subaddress_details_hint">Long-press for details</string>
-
-    <string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
-    <string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
-    <string name="delete_failed">Delete failed!</string>
-
-    <string name="menu_restore">Import wallet</string>
-    <string name="restore_failed">Import failed!</string>
-
-    <string name="menu_deletecache">Reset wallet!</string>
-    <string name="deletecache_alert_message">This wallet will be reset, losing all off-chain data (like notes, account &amp; subaddress names, private transaction keys, &#8230;)! Use this ONLY if this wallet is corrupt and does not load!</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="tor_noshift">%1$s 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="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="setting_theme">Style</string>
-    <string-array name="themes">
-        <item>Classic</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="tx_locked">Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days)</string>
-
-    <string name="label_streetmode">Street Mode enabled\nOnly new transactions will be shown</string>
-
-    <string name="pocketchange_info">To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount.</string>
-    <string name="pocketchange_create_title">Create Change</string>
-
-    <string name="label_apply">APPLY</string>
-
-    <string name="setting_lock">Lock Wallet in Background</string>
-
-    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label">Select Sidekick device</string>
-
-    <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
-    <string name="bluetooth_permissions_ok">OK</string>
-    <string name="bluetooth_permissions_settings">App Settings</string>
-    <string name="bluetooth_permissions_cancel">Cancel</string>
-
-    <string name="sidekick_pin">PIN: %1$s</string>
-    <string name="sidekick_not_connected">[not connected]</string>
-    <string name="sidekick_confirm_tx">Confirm Transaction</string>
-    <string name="sidekick_network_warning">Network is on - this is a security risk. It is recommended
-        to turn on flight mode and restart the app with only Bluetooth enabled!</string>
-    <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
-    <string name="fab_restore_sidekick">Restore from Sidekick</string>
-    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

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

@@ -303,71 +303,4 @@
         Se vi ne markis nodojn (aŭ se ili ne respondas pri iliaj konektoj), Monerujo direkte petos la
         pranodojn konservitajn en la kerno de Monero. La skanado haltos kiam 10 foraj nodoj estos trovitaj.</p>
     ]]></string>
-
-    <string name="help_uri"><![CDATA[
-        <h1>Using a payment link</h1>
-        <p>You have started monerujo with a payment link. In order to send funds, please do the following:</p>
-        <p>
-        1. Open the wallet you want to spend from<br>
-        2. Wait until the wallet is synced &amp; the "Give" button appears<br>
-        3. Touch the "Give" button
-        </p>
-        <p>The payment details will be filled in. Check them and proceed like for any other transaction.</p>
-    ]]></string>
-
-    <string name="help_ok">Got it!</string> <!-- Note: "Got it" as in "I understand this" -->
-
-    <string name="help_nok">Nah…</string> <!-- Note: "Nah..." as in "I don't want this" -->
-    <string name="help_getorbot">Get Orbot!</string>
-    <string name="help_tor"><![CDATA[
-        <h1>Tor</h1>
-        <p>Tor, short for The Onion Router, is free and open-source software for enabling anonymous
-        communication.</p>
-        <p>Enabling Tor will route your connection through several relays and hide your IP address
-        from the node. Keep in mind this is more private but also <b>slower</b>.</p>
-        <p>In order to use Tor with Monerujo, you\'ll need Orbot installed on your phone. After
-        installing Orbot, make sure to enable it by clicking the network icon on the wallet list
-        screen.</p>
-        <p>If you have issues connecting with Tor, try to get a new Identity in the Orbot App (icon
-        on the top right).</p>
-    ]]></string>
-
-    <string name="help_tor_enable"><![CDATA[
-        <h1>Tor Node</h1>
-        <p>This is an .onion node. In order to use it, you must enable Tor mode by touching the
-        <img src="ic_network_clearnet"/> icon near the top of the Wallet List page.</p>
-    ]]></string>
-
-    <string name="help_sidekick"><![CDATA[
-        <h2>Using your sidekick wallet</h2>
-        Check that both phones are connected via Bluetooth and both apps are opened.
-
-        <h3>On sidekick:</h3>
-        Open your wallet of choice.
-
-        <h3>On monerujo:</h3>
-        Connect to sidekick.
-
-        Open the wallet matching the one you have opened on the sidekick phone.
-
-        Use it as you\'d normally use any wallet. Let it scan to see incoming transactions, share addresses, or send moneros. If the app needs to do something that involves your keys, it\'ll ask for permission from sidekick.
-
-        <h3>On sidekick:</h3>
-        If monerujo requested permission, you should see a dialog that shows the transaction details like amount and fees. You\'ll also see two options, to ACCEPT or DENY it. Choose wisely.
-
-        <h3>On monerujo:</h3>
-        The transaction should be signed and ready to be sent. Press to make it so.
-         <br/>
-    ]]></string>
-
-    <string name="help_create_sidekick" translatable="false"><![CDATA[
-        <h1>Create Wallet - Sidekick</h1>
-        <p>You want to recover your wallet from your awesome Sidekick device.</p>
-        <p>Et netus et malesuada fames. Mattis enim ut tellus elementum sagittis vitae. Eget duis at
-        tellus at. Id aliquet risus feugiat in. Donec et odio pellentesque diam. Dictum fusce ut
-        placerat orci nulla. Amet nisl suscipit adipiscing bibendum est ultricies integer quis.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
 </resources>

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

@@ -336,132 +336,4 @@
     <string name="send_address_hint">Ricevanto</string>
 
     <string name="street_sweep_amount">ĈIO!</string>
-
-    <string name="menu_ledger_seed">Convert Ledger Seed</string>
-    <string name="prompt_ledger_seed">Ledger Seed Words</string>
-    <string name="prompt_ledger_phrase">Ledger Passphrase (optional)</string>
-    <string name="bad_ledger_seed">Invalid Ledger Seed!</string>
-    <string name="prompt_ledger_seed_warn">Entering your Ledger Seed here is a major security risk!</string>
-
-    <string name="label_restoreheight">Restaŭralteco</string> <!-- Restore Height -->
-
-    <string name="toast_ledger_start_app">Start Monero App on %1$s</string>
-
-    <string name="menu_rescan">Rescan!</string>
-
-    <string name="onboarding_agree">I get it!</string>
-    <string name="onboarding_button_next">Next</string>
-    <string name="onboarding_button_ready">I\'m ready!</string>
-
-    <string name="onboarding_welcome_title">Welcome to Monerujo!</string>
-    <string name="onboarding_welcome_information">This app allows you to create and use Monero wallets. You can store your sweet moneroj in them.</string>
-    <string name="onboarding_seed_title">Keep your seed safe</string>
-    <string name="onboarding_seed_information">The seed grants full access to whoever has it. If you lose it, we cannot help you recover it and you lose your beloved moneroj.</string>
-    <string name="onboarding_xmrto_title">Send Crypto</string>
-    <string name="onboarding_xmrto_information">Monerujo has exchange support built-in. Just paste or scan a BTC, LTC, ETH, TRXUSDT or SOL address and you\'ll be sending these cryptos by spending XMR.</string>
-    <string name="onboarding_nodes_title">Nodes, your way</string>
-    <string name="onboarding_nodes_information">Nodes connect you to the Monero network. Choose between public nodes or go full cypherpunk using your own.</string>
-    <string name="onboarding_fpsend_title">Send with fingerprint</string>
-    <string name="onboarding_fpsend_information">You\'re now able to send XMR with just your fingerprint if you enabled it. To request the password, just disable fingerprint access.</string>
-
-    <string name="menu_daynight">Dark Mode</string>
-    <string-array name="daynight_themes">
-        <item>Auto</item>
-        <item>Day</item>
-        <item>Night</item>
-    </string-array>
-    <string name="gunther_says">There is nothing here\nPlease create or restore a wallet</string>
-
-    <string name="menu_default_nodes">Restore default nodes</string>
-    <string name="toast_default_nodes">Restoring already in progress…</string>
-
-    <string name="node_updated_now">Last Block: %1$d seconds ago</string>
-    <string name="node_updated_mins">Last Block: %1$d minutes ago</string>
-    <string name="node_updated_hours">Last Block: %1$d hours ago</string>
-    <string name="node_updated_days">Last Block: %1$d days ago</string>
-
-    <string name="shift_noquote">Cannot get quote</string>
-    <string name="shift_checkamount">Check amount and try again</string>
-
-    <string name="info_xmrto_ambiguous"><![CDATA[
-        <b>Ambiguous address.</b><br/>
-        <i>Please select the type above.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help"><![CDATA[
-        <b>Please enter or scan a %1$s address.</b><br/>
-        <i>You&apos;ll send XMR and the receiver will get %2$s using the <b>%3$s</b> service.</i>
-    ]]></string>
-
-    <string name="info_xmrto_help_xmr"><![CDATA[
-        <b>Please enter or scan a Monero address.</b>
-    ]]></string>
-
-    <string name="subbaddress_title">Subaddresses</string>
-    <string name="subbaddress_name_hint">Subaddress Name</string>
-    <string name="max_subaddress_warning">Too many unused addresses - use some to enable creating more!</string>
-    <string name="max_account_warning">Too many unused accounts - use some to enable creating more!</string>
-    <string name="subaddress_tx_label">Transactions for this subaddress:</string>
-    <string name="subaddress_notx_label">No transactions for this subaddress yet</string>
-    <string name="subaddress_select_label">Select a subaddress</string>
-    <string name="subaddress_details_hint">Long-press for details</string>
-
-    <string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
-    <string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
-    <string name="delete_failed">Delete failed!</string>
-
-    <string name="menu_restore">Import wallet</string>
-    <string name="restore_failed">Import failed!</string>
-
-    <string name="menu_deletecache">Reset wallet!</string>
-    <string name="deletecache_alert_message">This wallet will be reset, losing all off-chain data (like notes, account &amp; subaddress names, private transaction keys, &#8230;)! Use this ONLY if this wallet is corrupt and does not load!</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="tor_noshift">%1$s 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="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="setting_theme">Style</string>
-    <string-array name="themes">
-        <item>Classic</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="tx_locked">Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days)</string>
-
-    <string name="label_streetmode">Street Mode enabled\nOnly new transactions will be shown</string>
-
-    <string name="pocketchange_info">To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount.</string>
-    <string name="pocketchange_create_title">Create Change</string>
-
-    <string name="label_apply">APPLY</string>
-
-    <string name="setting_lock">Lock Wallet in Background</string>
-
-    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label">Select Sidekick device</string>
-
-    <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
-    <string name="bluetooth_permissions_ok">OK</string>
-    <string name="bluetooth_permissions_settings">App Settings</string>
-    <string name="bluetooth_permissions_cancel">Cancel</string>
-
-    <string name="sidekick_pin">PIN: %1$s</string>
-    <string name="sidekick_not_connected">[not connected]</string>
-    <string name="sidekick_confirm_tx">Confirm Transaction</string>
-    <string name="sidekick_network_warning">Network is on - this is a security risk. It is recommended
-        to turn on flight mode and restart the app with only Bluetooth enabled!</string>
-    <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
-    <string name="fab_restore_sidekick">Restore from Sidekick</string>
-    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

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

@@ -7,7 +7,7 @@
         <b>Créditos</b>
         <br/>
         m2049r, baltsar777, anhdres, keejef,
-        rehrar, EarlOfEgo et al.
+        rehrar, EarlOfEgo, ErCiccione et al.
         <br/><br/>
         <a href="https://monerujo.io/">monerujo.io</a>
         ]]></string>

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

@@ -201,37 +201,4 @@
         <h1>Nodo de Tor</h1>
         <p>Este nodo tiene una dirección <em>.onion</em>. Para usarlo, debes activar el modo Tor presionando el ícono <img src="ic_network_clearnet"/> junto al nodo en la pantalla principal.</p>
     ]]></string>
-
-    <string name="help_sidekick"><![CDATA[
-        <h2>Using your sidekick wallet</h2>
-        Check that both phones are connected via Bluetooth and both apps are opened.
-
-        <h3>On sidekick:</h3>
-        Open your wallet of choice.
-
-        <h3>On monerujo:</h3>
-        Connect to sidekick.
-
-        Open the wallet matching the one you have opened on the sidekick phone.
-
-        Use it as you\'d normally use any wallet. Let it scan to see incoming transactions, share addresses, or send moneros. If the app needs to do something that involves your keys, it\'ll ask for permission from sidekick.
-
-        <h3>On sidekick:</h3>
-        If monerujo requested permission, you should see a dialog that shows the transaction details like amount and fees. You\'ll also see two options, to ACCEPT or DENY it. Choose wisely.
-
-        <h3>On monerujo:</h3>
-        The transaction should be signed and ready to be sent. Press to make it so.
-         <br/>
-    ]]></string>
-
-    <string name="help_create_sidekick" translatable="false"><![CDATA[
-        <h1>Create Wallet - Sidekick</h1>
-        <p>You want to recover your wallet from your awesome Sidekick device.</p>
-        <p>Et netus et malesuada fames. Mattis enim ut tellus elementum sagittis vitae. Eget duis at
-        tellus at. Id aliquet risus feugiat in. Donec et odio pellentesque diam. Dictum fusce ut
-        placerat orci nulla. Amet nisl suscipit adipiscing bibendum est ultricies integer quis.</p>
-        <p>Enter the block number of the first transaction used for this address in the
-        field \"Restore Height\". You can also use a date in the format YYYY-MM-DD. If you are not sure,
-        enter an approximate date/blockheight <em>before</em> you first used this wallet address.</p>
-    ]]></string>
 </resources>

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

@@ -428,10 +428,6 @@
     <string name="setting_daynight">Modo</string>
 
     <string name="setting_theme">Tema</string>
-    <string-array name="themes">
-        <item>Classic</item>
-        <item>Baldaŭ</item> <!-- do not translate this one -->
-    </string-array>
 
     <string name="message_qr_failed">¡Error al crear QR!</string>
 
@@ -442,23 +438,4 @@
     <string name="pocketchange_create_title">Crear cambio</string>
 
     <string name="label_apply">APLICAR</string>
-
-    <string name="setting_lock">Lock Wallet in Background</string>
-
-    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label">Select Sidekick device</string>
-
-    <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
-    <string name="bluetooth_permissions_ok">OK</string>
-    <string name="bluetooth_permissions_settings">App Settings</string>
-    <string name="bluetooth_permissions_cancel">Cancel</string>
-
-    <string name="sidekick_pin">PIN: %1$s</string>
-    <string name="sidekick_not_connected">[not connected]</string>
-    <string name="sidekick_confirm_tx">Confirm Transaction</string>
-    <string name="sidekick_network_warning">Network is on - this is a security risk. It is recommended
-        to turn on flight mode and restart the app with only Bluetooth enabled!</string>
-    <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
-    <string name="fab_restore_sidekick">Restore from Sidekick</string>
-    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>