bump version 1.14.7

fix crash if auth failed (#684 )
bump version 1.14.6
2025-09-03 08:23:04 +02:00 · 2020-09-23 11:20:16 +02:00 · 2020-09-23 11:19:28 +02:00 · 2020-09-21 22:11:35 +02:00 · 2020-09-21 22:10:51 +02:00 · 2020-09-21 14:37:51 +02:00
35 changed files with 156 additions and 432 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "com.m2049r.xmrwallet"
        minSdkVersion 21
        targetSdkVersion 28
-        versionCode 403
-        versionName "1.14.3 'On Board'"
+        versionCode 407
+        versionName "1.14.7 'On Board'"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -149,11 +149,9 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
        if (walletFragment != null) walletFragment.resetDismissedTransactions();
        forceUpdate();
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
+        runOnUiThread(() -> {
+            if (getWallet() != null)
                updateAccountsBalance();
-            }
        });
    }

@@ -577,10 +575,9 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
    @Override
    public boolean onRefreshed(final Wallet wallet, final boolean full) {
        Timber.d("onRefreshed()");
-        runOnUiThread(new Runnable() {
-            public void run() {
+        runOnUiThread(() -> {
+            if (getWallet() != null)
                updateAccountsBalance();
-            }
        });
        if (numAccounts != wallet.getNumAccounts()) {
            numAccounts = wallet.getNumAccounts();
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
@@ -16,24 +16,15 @@

 package com.m2049r.xmrwallet.fragment.send;

-import android.app.Activity;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.design.widget.TextInputLayout;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.TxDataBtc;
@@ -353,7 +344,9 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
            }

            public void fail(String walletName, String password, boolean fingerprintUsed) {
-                bSend.setEnabled(sendCountdown > 0); // allow to try again
+                getActivity().runOnUiThread(() -> {
+                    bSend.setEnabled(sendCountdown > 0); // allow to try again
+                });
            }
        });
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
@@ -16,29 +16,19 @@

 package com.m2049r.xmrwallet.fragment.send;

-import android.app.Activity;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
 import android.widget.TextView;

-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.TxData;
+import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.data.UserNotes;

 import timber.log.Timber;

@@ -237,7 +227,9 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
            }

            public void fail(String walletName, String password, boolean fingerprintUsed) {
-                bSend.setEnabled(true); // allow to try again
+                getActivity().runOnUiThread(() -> {
+                    bSend.setEnabled(true); // allow to try again
+                });
            }
        });
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java
@@ -28,6 +28,7 @@ import android.widget.LinearLayout;

 import com.m2049r.xmrwallet.LoginActivity;
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;

 public class OnBoardingActivity extends AppCompatActivity implements OnBoardingAdapter.Listener {

@@ -75,6 +76,9 @@ public class OnBoardingActivity extends AppCompatActivity implements OnBoardingA
            }
        });

+        // let old users who have fingerprint wallets already agree for fingerprint sending
+        OnBoardingScreen.FPSEND.setMustAgree(KeyStoreHelper.hasStoredPasswords(this));
+
        for (int i = 0; i < OnBoardingScreen.values().length; i++) {
            agreed[i] = !OnBoardingScreen.values()[i].isMustAgree();
        }
@@ -83,6 +87,7 @@ public class OnBoardingActivity extends AppCompatActivity implements OnBoardingA
    }

    private void finishOnboarding() {
+        nextButton.setEnabled(false);
        OnBoardingManager.setOnBoardingShown(getApplicationContext());
        startActivity(new Intent(this, LoginActivity.class));
        finish();
--- a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java
@@ -28,7 +28,7 @@ enum OnBoardingScreen {
    private final int title;
    private final int information;
    private final int drawable;
-    private final boolean mustAgree;
+    private boolean mustAgree;

    OnBoardingScreen(final int title, final int information, final int drawable, final boolean mustAgree) {
        this.title = title;
@@ -52,4 +52,8 @@ enum OnBoardingScreen {
    public boolean isMustAgree() {
        return mustAgree;
    }
+
+    public boolean setMustAgree(boolean mustAgree) {
+        return this.mustAgree = mustAgree;
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
@@ -281,97 +281,114 @@ public class WalletService extends Service {
                case START_SERVICE: {
                    Bundle extras = msg.getData();
                    String cmd = extras.getString(REQUEST, null);
-                    if (cmd.equals(REQUEST_CMD_LOAD)) {
-                        String walletId = extras.getString(REQUEST_WALLET, null);
-                        String walletPw = extras.getString(REQUEST_CMD_LOAD_PW, null);
-                        Timber.d("LOAD wallet %s", walletId);
-                        if (walletId != null) {
-                            showProgress(getString(R.string.status_wallet_loading));
-                            showProgress(10);
-                            Wallet.Status walletStatus = start(walletId, walletPw);
-                            if (observer != null) observer.onWalletStarted(walletStatus);
-                            if ((walletStatus == null) || !walletStatus.isOk()) {
-                                errorState = true;
-                                stop();
-                            }
-                        }
-                    } else if (cmd.equals(REQUEST_CMD_STORE)) {
-                        Wallet myWallet = getWallet();
-                        Timber.d("STORE wallet: %s", myWallet.getName());
-                        boolean rc = myWallet.store();
-                        Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
-                        if (!rc) {
-                            Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
-                        }
-                        if (observer != null) observer.onWalletStored(rc);
-                    } else if (cmd.equals(REQUEST_CMD_TX)) {
-                        Wallet myWallet = getWallet();
-                        Timber.d("CREATE TX for wallet: %s", myWallet.getName());
-                        myWallet.disposePendingTransaction(); // remove any old pending tx
-                        TxData txData = extras.getParcelable(REQUEST_CMD_TX_DATA);
-                        String txTag = extras.getString(REQUEST_CMD_TX_TAG);
-                        PendingTransaction pendingTransaction = myWallet.createTransaction(txData);
-                        PendingTransaction.Status status = pendingTransaction.getStatus();
-                        Timber.d("transaction status %s", status);
-                        if (status != PendingTransaction.Status.Status_Ok) {
-                            Timber.w("Create Transaction failed: %s", pendingTransaction.getErrorString());
-                        }
-                        if (observer != null) {
-                            observer.onTransactionCreated(txTag, pendingTransaction);
-                        } else {
-                            myWallet.disposePendingTransaction();
-                        }
-                    } else if (cmd.equals(REQUEST_CMD_SWEEP)) {
-                        Wallet myWallet = getWallet();
-                        Timber.d("SWEEP TX for wallet: %s", myWallet.getName());
-                        myWallet.disposePendingTransaction(); // remove any old pending tx
-                        String txTag = extras.getString(REQUEST_CMD_TX_TAG);
-                        PendingTransaction pendingTransaction = myWallet.createSweepUnmixableTransaction();
-                        PendingTransaction.Status status = pendingTransaction.getStatus();
-                        Timber.d("transaction status %s", status);
-                        if (status != PendingTransaction.Status.Status_Ok) {
-                            Timber.w("Create Transaction failed: %s", pendingTransaction.getErrorString());
-                        }
-                        if (observer != null) {
-                            observer.onTransactionCreated(txTag, pendingTransaction);
-                        } else {
-                            myWallet.disposePendingTransaction();
-                        }
-                    } else if (cmd.equals(REQUEST_CMD_SEND)) {
-                        Wallet myWallet = getWallet();
-                        Timber.d("SEND TX for wallet: %s", myWallet.getName());
-                        PendingTransaction pendingTransaction = myWallet.getPendingTransaction();
-                        if (pendingTransaction == null) {
-                            throw new IllegalArgumentException("PendingTransaction is null"); // die
-                        }
-                        if (pendingTransaction.getStatus() != PendingTransaction.Status.Status_Ok) {
-                            Timber.e("PendingTransaction is %s", pendingTransaction.getStatus());
-                            final String error = pendingTransaction.getErrorString();
-                            myWallet.disposePendingTransaction(); // it's broken anyway
-                            if (observer != null) observer.onSendTransactionFailed(error);
-                            return;
-                        }
-                        final String txid = pendingTransaction.getFirstTxId(); // tx ids vanish after commit()!
-                        boolean success = pendingTransaction.commit("", true);
-                        if (success) {
-                            myWallet.disposePendingTransaction();
-                            if (observer != null) observer.onTransactionSent(txid);
-                            String notes = extras.getString(REQUEST_CMD_SEND_NOTES);
-                            if ((notes != null) && (!notes.isEmpty())) {
-                                myWallet.setUserNote(txid, notes);
+                    switch (cmd) {
+                        case REQUEST_CMD_LOAD:
+                            String walletId = extras.getString(REQUEST_WALLET, null);
+                            String walletPw = extras.getString(REQUEST_CMD_LOAD_PW, null);
+                            Timber.d("LOAD wallet %s", walletId);
+                            if (walletId != null) {
+                                showProgress(getString(R.string.status_wallet_loading));
+                                showProgress(10);
+                                Wallet.Status walletStatus = start(walletId, walletPw);
+                                if (observer != null) observer.onWalletStarted(walletStatus);
+                                if ((walletStatus == null) || !walletStatus.isOk()) {
+                                    errorState = true;
+                                    stop();
+                                }
                            }
+                            break;
+                        case REQUEST_CMD_STORE: {
+                            Wallet myWallet = getWallet();
+                            if (myWallet == null) break;
+                            Timber.d("STORE wallet: %s", myWallet.getName());
                            boolean rc = myWallet.store();
                            Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
                            if (!rc) {
                                Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
                            }
                            if (observer != null) observer.onWalletStored(rc);
-                            listener.updated = true;
-                        } else {
-                            final String error = pendingTransaction.getErrorString();
-                            myWallet.disposePendingTransaction();
-                            if (observer != null) observer.onSendTransactionFailed(error);
-                            return;
+                            break;
+                        }
+                        case REQUEST_CMD_TX: {
+                            Wallet myWallet = getWallet();
+                            if (myWallet == null) break;
+                            Timber.d("CREATE TX for wallet: %s", myWallet.getName());
+                            myWallet.disposePendingTransaction(); // remove any old pending tx
+
+                            TxData txData = extras.getParcelable(REQUEST_CMD_TX_DATA);
+                            String txTag = extras.getString(REQUEST_CMD_TX_TAG);
+                            PendingTransaction pendingTransaction = myWallet.createTransaction(txData);
+                            PendingTransaction.Status status = pendingTransaction.getStatus();
+                            Timber.d("transaction status %s", status);
+                            if (status != PendingTransaction.Status.Status_Ok) {
+                                Timber.w("Create Transaction failed: %s", pendingTransaction.getErrorString());
+                            }
+                            if (observer != null) {
+                                observer.onTransactionCreated(txTag, pendingTransaction);
+                            } else {
+                                myWallet.disposePendingTransaction();
+                            }
+                            break;
+                        }
+                        case REQUEST_CMD_SWEEP: {
+                            Wallet myWallet = getWallet();
+                            if (myWallet == null) break;
+                            Timber.d("SWEEP TX for wallet: %s", myWallet.getName());
+                            myWallet.disposePendingTransaction(); // remove any old pending tx
+
+                            String txTag = extras.getString(REQUEST_CMD_TX_TAG);
+                            PendingTransaction pendingTransaction = myWallet.createSweepUnmixableTransaction();
+                            PendingTransaction.Status status = pendingTransaction.getStatus();
+                            Timber.d("transaction status %s", status);
+                            if (status != PendingTransaction.Status.Status_Ok) {
+                                Timber.w("Create Transaction failed: %s", pendingTransaction.getErrorString());
+                            }
+                            if (observer != null) {
+                                observer.onTransactionCreated(txTag, pendingTransaction);
+                            } else {
+                                myWallet.disposePendingTransaction();
+                            }
+                            break;
+                        }
+                        case REQUEST_CMD_SEND: {
+                            Wallet myWallet = getWallet();
+                            if (myWallet == null) break;
+                            Timber.d("SEND TX for wallet: %s", myWallet.getName());
+                            PendingTransaction pendingTransaction = myWallet.getPendingTransaction();
+                            if (pendingTransaction == null) {
+                                throw new IllegalArgumentException("PendingTransaction is null"); // die
+                            }
+                            if (pendingTransaction.getStatus() != PendingTransaction.Status.Status_Ok) {
+                                Timber.e("PendingTransaction is %s", pendingTransaction.getStatus());
+                                final String error = pendingTransaction.getErrorString();
+                                myWallet.disposePendingTransaction(); // it's broken anyway
+                                if (observer != null) observer.onSendTransactionFailed(error);
+                                return;
+                            }
+                            final String txid = pendingTransaction.getFirstTxId(); // tx ids vanish after commit()!
+
+                            boolean success = pendingTransaction.commit("", true);
+                            if (success) {
+                                myWallet.disposePendingTransaction();
+                                if (observer != null) observer.onTransactionSent(txid);
+                                String notes = extras.getString(REQUEST_CMD_SEND_NOTES);
+                                if ((notes != null) && (!notes.isEmpty())) {
+                                    myWallet.setUserNote(txid, notes);
+                                }
+                                boolean rc = myWallet.store();
+                                Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
+                                if (!rc) {
+                                    Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
+                                }
+                                if (observer != null) observer.onWalletStored(rc);
+                                listener.updated = true;
+                            } else {
+                                final String error = pendingTransaction.getErrorString();
+                                myWallet.disposePendingTransaction();
+                                if (observer != null) observer.onSendTransactionFailed(error);
+                                return;
+                            }
+                            break;
                        }
                    }
                }
--- a/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java
@@ -37,33 +37,19 @@ public class Notice {
    private static final String PREFS_NAME = "notice";
    private static List<Notice> notices = null;

-    private static final String NOTICE_SHOW_XMRTO_ENABLED_LOGIN = "notice_xmrto_enabled_login";
    private static final String NOTICE_SHOW_XMRTO_ENABLED_SEND = "notice_xmrto_enabled_send";
    private static final String NOTICE_SHOW_LEDGER = "notice_ledger_enabled_login";
-    private static final String NOTICE_SHOW_NODES = "notice_nodes";

    private static void init() {
        synchronized (Notice.class) {
            if (notices != null) return;
            notices = new ArrayList<>();
-            notices.add(
-                    new Notice(NOTICE_SHOW_NODES,
-                            R.string.info_nodes_enabled,
-                            R.string.help_node,
-                            1)
-            );
            notices.add(
                    new Notice(NOTICE_SHOW_XMRTO_ENABLED_SEND,
                            R.string.info_xmrto_enabled,
                            R.string.help_xmrto,
                            1)
            );
-            notices.add(
-                    new Notice(NOTICE_SHOW_XMRTO_ENABLED_LOGIN,
-                            R.string.info_xmrto_enabled,
-                            R.string.help_xmrto,
-                            1)
-            );
            notices.add(
                    new Notice(NOTICE_SHOW_LEDGER,
                            R.string.info_ledger_enabled,
--- a/app/src/main/res/drawable/ic_backspace_black_36dp.xml
+++ b/app/src/main/res/drawable/ic_backspace_black_36dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:autoMirrored="true"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z" />
-</vector>
--- a/app/src/main/res/layout/view_onboarding.xml
+++ b/app/src/main/res/layout/view_onboarding.xml
@@ -15,11 +15,25 @@
        android:layout_marginTop="32dp"
        android:layout_marginEnd="32dp"
        android:layout_marginBottom="32dp"
+        android:src="@drawable/gunther_24dp"
        app:layout_constraintBottom_toTopOf="@+id/onboardingTitle"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/gunther_24dp" />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/onboardingTitle"
+        style="@style/MoneroText.Balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/onboardingInformation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/onboarding_fpsend_title" />

    <TextView
        android:id="@+id/onboardingInformation"
@@ -29,32 +43,14 @@
        android:layout_marginStart="32dp"
        android:layout_marginTop="16dp"
        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="16dp"
        android:gravity="center"
        android:lineSpacingMultiplier="1.2"
        app:layout_constraintBottom_toTopOf="@+id/onboardingAgree"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/onboardingTitle"
        tools:text="@string/onboarding_fpsend_information" />

-    <android.support.constraint.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.6" />
-
-    <TextView
-        android:id="@+id/onboardingTitle"
-        style="@style/MoneroText.Balance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/guideline"
-        tools:text="@string/onboarding_fpsend_title" />
-
    <CheckBox
        android:id="@+id/onboardingAgree"
        style="@style/MoneroLabel.Caps.Black"
@@ -66,6 +62,5 @@
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingInformation" />
+        app:layout_constraintStart_toStartOf="parent" />
 </android.support.constraint.ConstraintLayout>
--- a/app/src/main/res/values-cat/strings.xml
+++ b/app/src/main/res/values-cat/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">ID de transacció</string>
    <string name="label_send_address">Adreça de destí</string>
-    <string name="label_send_payment_id">ID de pagament</string>
    <string name="label_send_notes">Notes</string>

    <string name="backup_progress">Còpia de seguretat en curs</string>
@@ -126,7 +125,6 @@
    <string name="prompt_changepwB">Repetir contrasenya per %1$s</string>
    <string name="prompt_password">Contrasenya per %1$s</string>
    <string name="prompt_fingerprint_auth">Pots obrir el portamonedes fent servir l\'empremta digital.\nPremi el sensor.</string>
-    <string name="prompt_send_password">Confirmi contrasenya</string>
    <string name="prompt_open_wallet">Obrint el portamonedes&#8230;</string>
    <string name="bad_fingerprint">Empremta no reconeguda. Torni-ho a intentar.</string>
    <string name="bad_password">Contrasenya incorrecta!</string>
@@ -213,10 +211,6 @@
    <string name="generate_check_address">Introduïu una adreça vàlida</string>
    <string name="generate_check_mnemonic">Introduïu la vostra llavor de 25 paraules</string>

-    <string name="send_amount_btc_xmr">%1$s (indicatiu)</string>
-
-    <string name="send_paymentid_hint">ID de pagament (opcional)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notes privades (opcional)</string>
    <string name="send_generate_paymentid_hint">Generar</string>
    <string name="send_send_label">Spend my sweet Moneroj</string>
@@ -265,8 +259,6 @@
    <string name="tx_transfers">Transferències</string>
    <string name="tx_notes">Notes</string>
    <string name="tx_notes_hint">(opcional)</string>
-    <string name="tx_button_notes">Desa</string>
-    <string name="tx_notes_set_failed">Desat de notes fallit</string>
    <string name="tx_title">Detalls de Transacció</string>

    <string name="tx_pending">PENDENT</string>
@@ -275,8 +267,6 @@
    <string name="receive_amount_hint">Quantitat</string>
    <string name="receive_desc_hint">Descripció (opcional)</string>
    <string name="receive_cannot_open">No s\'ha pogut obrir el portamonedes!</string>
-    <string name="receive_paymentid_invalid">16 Hex caràcters (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">ha d\'estar buit amb una adreça integrada</string>

    <string name="receive_amount_too_big">Màx. %1$s</string>
    <string name="receive_amount_negative">Mín. 0</string>
@@ -329,7 +319,6 @@
    <string name="nfc_tag_size">L\'etiquetatge proporciona %1$d bits, però es necessiten %2$d!</string>
    <string name="nfc_tag_read_undef">No entenc l\'etiquetatge!</string>
    <string name="nfc_tag_read_what">No sé què vols!</string>
-    <string name="nfc_tag_read_success">Lectura d\'etiquetatge exitosa</string>
    <string name="nfc_tag_tap">NFC Disponible!</string>

    <string name="menu_info">Mostra Secrets!</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">Transaktions-ID</string>
    <string name="label_send_address">Zieladresse</string>
-    <string name="label_send_payment_id">Zahlungs-ID</string>
    <string name="label_send_notes">Notizen</string>

    <string name="backup_progress">Backup wird erstellt</string>
@@ -126,7 +125,6 @@
    <string name="prompt_changepwB">Passwort für %1$s wiederholen</string>
    <string name="prompt_password">Passwort für %1$s</string>
    <string name="prompt_fingerprint_auth">Fingerabdruck-Authentifizierung möglich.\nBitte Sensor berühren.</string>
-    <string name="prompt_send_password">Passwort bestätigen</string>
    <string name="prompt_open_wallet">Öffne Wallet &#8230;</string>
    <string name="bad_fingerprint">Fingerabdruck nicht erkannt. Nochmals versuchen.</string>
    <string name="bad_password">Falsches Passwort!</string>
@@ -212,10 +210,6 @@
    <string name="generate_check_address">Gib eine gültige Adresse ein</string>
    <string name="generate_check_mnemonic">Gib deinen, 25 Wörter langen, Seed ein</string>

-    <string name="send_amount_btc_xmr">%1$s (Anhaltswert)</string>
-
-    <string name="send_paymentid_hint">Zahlungs-ID (optional)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Private Notizen (optional)</string>
    <string name="send_generate_paymentid_hint">Erzeuge</string>
    <string name="send_send_label">Gib meine wertvollen Moneroj aus</string>
@@ -260,8 +254,6 @@
    <string name="tx_transfers">Transfers</string>
    <string name="tx_notes">Notizen</string>
    <string name="tx_notes_hint">(optional)</string>
-    <string name="tx_button_notes">Speichern</string>
-    <string name="tx_notes_set_failed">Notizen speichern fehlgeschlagen</string>
    <string name="tx_title">Transaktionsdetails</string>

    <string name="tx_pending">AUSSTEHEND</string>
@@ -269,8 +261,6 @@

    <string name="receive_amount_hint">Betrag</string>
    <string name="receive_cannot_open">Konnte Wallet nicht öffnen!</string>
-    <string name="receive_paymentid_invalid">16 Hex-Zeichen (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Muss bei einer integrierten Adresse leer sein</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -330,7 +320,6 @@
    <string name="nfc_tag_size">Tag bietet %1$d Bytes, aber wir brauchen %2$d!</string>
    <string name="nfc_tag_read_undef">Ich verstehe den Tag nicht!</string>
    <string name="nfc_tag_read_what">Ich weiß nicht, was du willst!</string>
-    <string name="nfc_tag_read_success">Tag erfolgreich gelesen</string>
    <string name="nfc_tag_tap">NFC verfügbar!</string>

    <string name="status_wallet_connect_wrongversion">Node Version inkompatibel – bitte updaten!</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -84,7 +84,6 @@

    <string name="label_send_txid">ID Συναλλαγής</string>
    <string name="label_send_address">Διεύθυνση Παραλήπτη</string>
-    <string name="label_send_payment_id">ID πληρωμής</string>
    <string name="label_send_notes">Σημειώσεις</string>

    <string name="backup_progress">Δημιουργία αντίγραφου ασφαλείας σε εξέλιξη</string>
@@ -118,7 +117,6 @@
    <string name="prompt_rename">Μετονομασία %1$s</string>

    <string name="prompt_password">Κωδικός για %1$s</string>
-    <string name="prompt_send_password">Επιβεβαίωση κωδικού</string>
    <string name="bad_password">Λάθος κωδικός!</string>
    <string name="bad_wallet">Το πορτοφόλι δεν υπάρχει!</string>
    <string name="prompt_daemon_missing">Η διεύθυνση δαίμονα πρέπει να οριστεί!</string>
@@ -186,10 +184,6 @@
    <string name="generate_check_address">Δώστε έγκυρη διεύθυνση</string>
    <string name="generate_check_mnemonic">Βάλε τον σπόρο σου 25-λέξεων</string>

-    <string name="send_amount_btc_xmr">%1$s (ενδεικτικό)</string>
-
-    <string name="send_paymentid_hint">ID Πληρωμής(Payment ID)(προαιρετικό)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Προσωπικές σημειώσεις (προαιρετικό)</string>
    <string name="send_generate_paymentid_hint">Δημιουργία</string>
    <string name="send_send_label">Ξόδεψε τα γλυκά μου Moneroj</string>
@@ -234,8 +228,6 @@
    <string name="tx_transfers">Συναλλαγές</string>
    <string name="tx_notes">Σημειώσεις</string>
    <string name="tx_notes_hint">(προαιρετικό)</string>
-    <string name="tx_button_notes">Αποθήκευση</string>
-    <string name="tx_notes_set_failed">Η αποθήκευση των σημειώσεων απέτυχε</string>
    <string name="tx_title">Λεπτομέρειες Συναλλαγής</string>

    <string name="tx_pending">ΕΚΚΡΕΜΗ</string>
@@ -243,8 +235,6 @@

    <string name="receive_amount_hint">Ποσό</string>
    <string name="receive_cannot_open">Δεν ήταν δυνατό το άνοιγμα του πορτοφολιού!</string>
-    <string name="receive_paymentid_invalid">16 χαρακτήρες Hex (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Πρέπει να είναι άδειο με ενσωματωμένη διεύθυνση</string>

    <string name="receive_amount_too_big">Μέγιστο %1$s</string>
    <string name="receive_amount_negative">Ελάχιστο 0</string>
@@ -322,7 +312,6 @@
    <string name="nfc_tag_size">Tag provides %1$d bytes, but we need %2$d!</string>
    <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
    <string name="nfc_tag_read_what">I don\'t know what you want!</string>
-    <string name="nfc_tag_read_success">Reading Tag successful</string>
    <string name="nfc_tag_tap">NFC Available!</string>

    <string name="receive_desc_hint">Description (optional)</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">Transakcia ID</string>
    <string name="label_send_address">Ricevanta adreso</string>
-    <string name="label_send_payment_id">Paga-ID</string>
    <string name="label_send_notes">Notoj</string>

    <string name="backup_progress">Sekurkopio okazanta</string>
@@ -126,7 +125,6 @@
    <string name="prompt_changepwB">Retajpu pasfrazon por %1$s</string>
    <string name="prompt_password">Pasvorto por %1$s</string>
    <string name="prompt_fingerprint_auth">Vi ankaŭ povas malfermi la monujon per fingropremaĵo.\nBonvolu tûsi la sentilon.</string>
-    <string name="prompt_send_password">Konfirmi pasvorton</string>
    <string name="prompt_open_wallet">Malfermante la monujon&#8230;</string>
    <string name="bad_fingerprint">La fringropremaĵo ne rekoniĝis. Reprovu.</string>
    <string name="bad_password">Malkorekta pasvorto!</string>
@@ -213,10 +211,6 @@
    <string name="generate_check_address">Entajpu validan adreson</string>
    <string name="generate_check_mnemonic">Entajpu vian 25-vortan semon</string>

-    <string name="send_amount_btc_xmr">%1$s (indika)</string>
-
-    <string name="send_paymentid_hint">Paga-ID (opcia)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Privataj notoj (opcia)</string>
    <string name="send_generate_paymentid_hint">Generate</string>
    <string name="send_send_label">Elspezi miajn dolĉajn monerojn</string>
@@ -265,8 +259,6 @@
    <string name="tx_transfers">Transigoj</string>
    <string name="tx_notes">Notoj</string>
    <string name="tx_notes_hint">(opcia)</string>
-    <string name="tx_button_notes">Konservi</string>
-    <string name="tx_notes_set_failed">Ne sukcesis konservi la notojn</string>
    <string name="tx_title">Transakciaj detaloj</string>

    <string name="tx_pending">OKAZONTE</string>
@@ -275,8 +267,6 @@
    <string name="receive_amount_hint">Kvanto</string>
    <string name="receive_desc_hint">Priskribo (opcia)</string>
    <string name="receive_cannot_open">Ne sukcesis malfermi la monujon!</string>
-    <string name="receive_paymentid_invalid">16 deksesumaj signoj (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Tio restu malplena kiam integrita adreso uziĝas</string>

    <string name="receive_amount_too_big">Maks. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -329,7 +319,6 @@
    <string name="nfc_tag_size">La etikedo provizas %1$d bajtojn, sed ni bezonas %2$d!</string>
    <string name="nfc_tag_read_undef">Mi ne komprenas la etikedon!</string>
    <string name="nfc_tag_read_what">Damne, kion vi volas?!</string>
-    <string name="nfc_tag_read_success">Sukcesis legi la etikedon</string>
    <string name="nfc_tag_tap">NFC disponeblas!</string>


--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -37,7 +37,6 @@

    <string name="label_send_txid">ID de Transacción</string>
    <string name="label_send_address">Dirección de Destino</string>
-    <string name="label_send_payment_id">ID de Pago</string>
    <string name="label_send_notes">Notas</string>

    <string name="backup_progress">Copia de seguridad en progreso</string>
@@ -75,7 +74,6 @@
    <string name="prompt_changepwB">Repetir contraseña para %1$s</string>
    <string name="prompt_password">Contraseña para %1$s</string>
    <string name="prompt_fingerprint_auth">Puedes poner tu dedo en el sensor para autorizar con tu huella.</string>
-    <string name="prompt_send_password">Confirmar Contraseña</string>
    <string name="prompt_open_wallet">Abriendo el monedero&#8230;</string>
    <string name="bad_fingerprint">Huella no reconocida. Inténtalo nuevamente.</string>
    <string name="bad_password">¡Contraseña incorrecta!</string>
@@ -159,8 +157,6 @@
    <string name="generate_check_address">Introduce una dirección válida</string>
    <string name="generate_check_mnemonic">Introduce tu semilla de 25 palabras</string>

-    <string name="send_paymentid_hint">ID de Pago (opcional)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notas Privadas (opcional)</string>
    <string name="send_generate_paymentid_hint">Generar</string>
    <string name="send_qr_invalid">No es un Código QR de monero</string>
@@ -195,8 +191,6 @@
    <string name="tx_transfers">Transferencias</string>
    <string name="tx_notes">Notas</string>
    <string name="tx_notes_hint">(opcional)</string>
-    <string name="tx_button_notes">Guardar</string>
-    <string name="tx_notes_set_failed">El guardado de las notas ha fallado</string>
    <string name="tx_title">Detalles de la Transacción</string>

    <string name="tx_pending">PENDIENTE</string>
@@ -204,8 +198,6 @@

    <string name="receive_amount_hint">Monto</string>
    <string name="receive_cannot_open">¡No se ha podido abrir el monedero!</string>
-    <string name="receive_paymentid_invalid">16 caracteres hexadecimales (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Debe estar vacío con una dirección integrada</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -261,7 +253,6 @@
    <string name="send_xmrto_timeout">Oye, esperaste demasiado!</string>
    <string name="label_copy_xmrtokey">Clave XMR.TO</string>
    <string name="message_copy_xmrtokey">¡Clave XMR.TO copiada al portapapeles!</string>
-    <string name="send_amount_btc_xmr">%1$s (indicativo)</string>
    <string name="send_send_label">Enviar mis preciados moneroj</string>
    <string name="send_send_timed_label">Gastar mis preciados moneroj (%1$s)</string>
    <string name="send_address_invalid">No es una dirección válida</string>
@@ -310,7 +301,6 @@
    <string name="nfc_tag_size">La etiqueta provee %1$d bytes, pero necesitamos %2$d!</string>
    <string name="nfc_tag_read_undef">¡No comprendo la etiqueta!</string>
    <string name="nfc_tag_read_what">¡No sé lo que pides!</string>
-    <string name="nfc_tag_read_success">Lectura de Etiqueta exitosa</string>
    <string name="nfc_tag_tap">¡NFC disponible!</string>

    <string name="receive_desc_hint">Descripción (opcional)</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">Ülekande ID</string>
    <string name="label_send_address">Sihtkoha address</string>
-    <string name="label_send_payment_id">Makse ID</string>
    <string name="label_send_notes">Kommentaarid</string>

    <string name="backup_progress">Teostan tagavarakoopiat</string>
@@ -124,7 +123,6 @@
    <string name="prompt_changepwB">Korda parooli rahakotile %1$s</string>
    <string name="prompt_password">Prool rahakotile %1$s</string>
    <string name="prompt_fingerprint_auth">Sa saad rahakoti avamiseks kasutada ka sõrmejälge.\nSelleks puuduta sõrmejäljelugejat.</string>
-    <string name="prompt_send_password">Kinnita parool</string>
    <string name="prompt_open_wallet">Avan rahakoti&#8230;</string>
    <string name="bad_fingerprint">Sõrmejälge ei tuntud ära. Proovi uuesti.</string>
    <string name="bad_password">Vale parool!</string>
@@ -208,10 +206,6 @@
    <string name="generate_check_address">Sisesta korrektne  aadress</string>
    <string name="generate_check_mnemonic">Sisesta oma 25-sõnaline seeme</string>

-    <string name="send_amount_btc_xmr">%1$s (umbkaudne)</string>
-
-    <string name="send_paymentid_hint">Makse ID (valikuline)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Privaatsed kommentaarid (valikuline)</string>
    <string name="send_generate_paymentid_hint">Genereeri</string>
    <string name="send_send_label">Saada mu kallid Monerod teele</string>
@@ -260,8 +254,6 @@
    <string name="tx_transfers">Ülekanded</string>
    <string name="tx_notes">Kommentaarid</string>
    <string name="tx_notes_hint">(valikuline)</string>
-    <string name="tx_button_notes">Salvesta</string>
-    <string name="tx_notes_set_failed">Kommentaaride salvestamine ebaõnnestus</string>
    <string name="tx_title">Ülekande lisainfo</string>

    <string name="tx_pending">OOTEL</string>
@@ -270,8 +262,6 @@
    <string name="receive_amount_hint">Kogus</string>
    <string name="receive_desc_hint">Kommentaarid (valikuline)</string>
    <string name="receive_cannot_open">Rahakotti ei õnnestunud avada!</string>
-    <string name="receive_paymentid_invalid">16 Hex tähemärgid (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Peab olema tühi koos integreeritud aadressiga</string>

    <string name="receive_amount_too_big">Kuni %1$s</string>
    <string name="receive_amount_negative">Vähemalt 0</string>
@@ -324,7 +314,6 @@
    <string name="nfc_tag_size">Sildil on %1$d baiti, kuid meil on vaja %2$d!</string>
    <string name="nfc_tag_read_undef">Ma ei oska seda silti lugeda!</string>
    <string name="nfc_tag_read_what">Ma ei tea, mida sa tahad!</string>
-    <string name="nfc_tag_read_success">Sildi lugemine õnnestus</string>
    <string name="nfc_tag_tap">NFC on saadaval!</string>

    <string name="status_wallet_connect_wrongversion">Serveri versioon ei sobi - palun uuenda!</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID de Transaction</string>
    <string name="label_send_address">Adresse Destination</string>
-    <string name="label_send_payment_id">ID de Paiement</string>
    <string name="label_send_notes">Notes</string>

    <string name="backup_progress">Sauvegarde en cours</string>
@@ -126,7 +125,6 @@
    <string name="prompt_changepwB">Répéter la Phase secrète pour %1$s</string>
    <string name="prompt_password">Mot de passe pour %1$s</string>
    <string name="prompt_fingerprint_auth">Vous pouvez également ouvrir le portefeuille avec votre empreinte digitale.\nMerci de toucher le capteur.</string>
-    <string name="prompt_send_password">Confirmez le mot de passe</string>
    <string name="prompt_open_wallet">Ouverture du portefeuille &#8230;</string>
    <string name="bad_fingerprint">Empreinte digitale non reconnue. Résessayez.</string>
    <string name="bad_password">Mot de passe incorrect !</string>
@@ -214,10 +212,6 @@
    <string name="generate_check_address">Entrez une Adresse valide</string>
    <string name="generate_check_mnemonic">Entrez votre phrase Mnémonique</string>

-    <string name="send_amount_btc_xmr">%1$s (indicatif)</string>
-
-    <string name="send_paymentid_hint">ID de Paiement (optionnel)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notes Privées (optionnelles)</string>
    <string name="send_generate_paymentid_hint">Générer</string>
    <string name="send_send_label">Dépenser mes beaux Moneroj</string>
@@ -262,8 +256,6 @@
    <string name="tx_transfers">Transferts</string>
    <string name="tx_notes">Notes</string>
    <string name="tx_notes_hint">(optionnelles)</string>
-    <string name="tx_button_notes">Sauvegarder</string>
-    <string name="tx_notes_set_failed">Sauvegarde de Notes échouée</string>
    <string name="tx_title">Détails de la Transaction</string>

    <string name="tx_pending">EN ATTENTE</string>
@@ -271,8 +263,6 @@

    <string name="receive_amount_hint">Montant</string>
    <string name="receive_cannot_open">Ouverture du portefeuille impossible !</string>
-    <string name="receive_paymentid_invalid">16 caractères héxadécimaux (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Doit être vide avec une adresse intégrée</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -322,7 +312,6 @@
    <string name="nfc_tag_size">Le Tag donne %1$d octets, mais il en faut %2$d !</string>
    <string name="nfc_tag_read_undef">Je ne comprend pas le Tag !</string>
    <string name="nfc_tag_read_what">Je ne sais pas ce que vous voulez !</string>
-    <string name="nfc_tag_read_success">Tag lut avec succès</string>
    <string name="nfc_tag_tap">NFC Disponible !</string>

    <string name="menu_language">Langue</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">Tranzakcióazonosító</string>
    <string name="label_send_address">Kedvezményezett címe</string>
-    <string name="label_send_payment_id">Fizetési azonosító</string>
    <string name="label_send_notes">Közlemény</string>

    <string name="backup_progress">Biztonsági mentés folyamatban</string>
@@ -124,7 +123,6 @@
    <string name="prompt_changepwB">Ismételd meg a(z) %1$s tárca új jelszavát</string>
    <string name="prompt_password">A(z) %1$s tárca jelszava</string>
    <string name="prompt_fingerprint_auth">Ujjlenyomattal is megnyithatod a tárcát.\nKérlek, érintsd meg a szenzort.</string>
-    <string name="prompt_send_password">Jelszó megerősítése</string>
    <string name="prompt_open_wallet">Tárca megnyitása&#8230;</string>
    <string name="bad_fingerprint">Az ujjlenyomat nem felismerhető. Próbáld újra.</string>
    <string name="bad_password">Helytelen jelszó!</string>
@@ -211,10 +209,6 @@
    <string name="generate_check_address">Adj meg egy valós címet</string>
    <string name="generate_check_mnemonic">Add meg a 25 szavas magod</string>

-    <string name="send_amount_btc_xmr">%1$s (előrejelzés)</string>
-
-    <string name="send_paymentid_hint">Fizetési azonosító (opcionális)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Privát közlemény (opcionális)</string>
    <string name="send_generate_paymentid_hint">Generálás</string>
    <string name="send_send_label">Édes, drága Monero elköltése</string>
@@ -259,8 +253,6 @@
    <string name="tx_transfers">Transzferek</string>
    <string name="tx_notes">Közlemény</string>
    <string name="tx_notes_hint">(opcionális)</string>
-    <string name="tx_button_notes">Mentés</string>
-    <string name="tx_notes_set_failed">A közlemény mentése sikertelen</string>
    <string name="tx_title">Tranzakciórészletek</string>

    <string name="tx_pending">FÜGGŐBEN</string>
@@ -268,8 +260,6 @@

    <string name="receive_amount_hint">Mennyiség</string>
    <string name="receive_cannot_open">Nem sikerült megnyitni a tárcát!</string>
-    <string name="receive_paymentid_invalid">16 hexadecimális karakter (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Integrált cím esetén üresnek kell lennie</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -322,7 +312,6 @@
    <string name="nfc_tag_size">A címke %1$d byte-os, de %2$d kellene!</string>
    <string name="nfc_tag_read_undef">Nem értem a címkét!</string>
    <string name="nfc_tag_read_what">Nem tudom, mit akarsz!</string>
-    <string name="nfc_tag_read_success">Sikeres címkeolvasás</string>
    <string name="nfc_tag_tap">NFC elérhető!</string>

    <string name="receive_desc_hint">Description (optional)</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID Transazione</string>
    <string name="label_send_address">Indirizzo di Destinazione</string>
-    <string name="label_send_payment_id">ID Pagamento</string>
    <string name="label_send_notes">Note</string>

    <string name="backup_progress">Backup in corso</string>
@@ -126,7 +125,6 @@
    <string name="prompt_changepwB">Ripeti passphrase per %1$s</string>
    <string name="prompt_password">Password per %1$s</string>
    <string name="prompt_fingerprint_auth">Puoi aprire il portafoglio anche usando la tua impronta digitale.\nTocca il sensore.</string>
-    <string name="prompt_send_password">Conferma Password</string>
    <string name="prompt_open_wallet">Aprendo il portafoglio&#8230;</string>
    <string name="bad_fingerprint">Impronta digitale non riconosciuta. Prova di nuovo.</string>
    <string name="bad_password">Password errata!</string>
@@ -213,10 +211,6 @@
    <string name="generate_check_address">Inserisci un indirizzo valido</string>
    <string name="generate_check_mnemonic">Inserisci il tuo seed di 25 parole</string>

-    <string name="send_amount_btc_xmr">%1$s (indicativo)</string>
-
-    <string name="send_paymentid_hint">ID pagamento (opzionale)</string>
-    <string name="send_amount_hint">0,00</string>
    <string name="send_notes_hint">Note private (opzionali)</string>
    <string name="send_generate_paymentid_hint">Genera</string>
    <string name="send_send_label">Spendi i miei bei Moneroj</string>
@@ -261,8 +255,6 @@
    <string name="tx_transfers">Trasferimenti</string>
    <string name="tx_notes">Note</string>
    <string name="tx_notes_hint">(opzionale)</string>
-    <string name="tx_button_notes">Salva</string>
-    <string name="tx_notes_set_failed">Salvataggio note fallito</string>
    <string name="tx_title">Dettagli della transazione</string>

    <string name="tx_pending">IN ATTESA</string>
@@ -270,8 +262,6 @@

    <string name="receive_amount_hint">Ammontare</string>
    <string name="receive_cannot_open">Impossibile aprire il portafoglio!</string>
-    <string name="receive_paymentid_invalid">16 caratteri esadecimali (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Deve essere vuoto con un indirizzo integrato</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -324,7 +314,6 @@
    <string name="nfc_tag_size">La Tag fornisce %1$d bytes, ma ne servono %2$d!</string>
    <string name="nfc_tag_read_undef">Non capisco la tag!</string>
    <string name="nfc_tag_read_what">Non capisco cosa mi hai chiesto!</string>
-    <string name="nfc_tag_read_success">Lettura tag riuscita</string>
    <string name="nfc_tag_tap">NFC disponibile!</string>

    <string name="receive_desc_hint">Descrizione (opzionale)</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">取引ID</string>
    <string name="label_send_address">送金先アドレス</string>
-    <string name="label_send_payment_id">ペイメントID</string>
    <string name="label_send_notes">メモ</string>

    <string name="backup_progress">バックアップ中</string>
@@ -128,7 +127,6 @@
    <string name="prompt_changepwB">%1$s の新しいパスフレーズを再入力</string>
    <string name="prompt_password">%1$s のパスワード</string>
    <string name="prompt_fingerprint_auth">あなたは指紋でもウォレットを開くことができます。\nセンサーにタッチしてください。</string>
-    <string name="prompt_send_password">パスワードを確認</string>
    <string name="prompt_open_wallet">ウォレットを開いています&#8230;</string>
    <string name="bad_fingerprint">指紋が認識できません。もう一度試してください。</string>
    <string name="bad_password">パスワードが違います!</string>
@@ -213,10 +211,6 @@
    <string name="generate_check_address">有効なアドレスを入力してください</string>
    <string name="generate_check_mnemonic">25 単語のシードを入力してください</string>

-    <string name="send_amount_btc_xmr">%1$s (指定)</string>
-
-    <string name="send_paymentid_hint">ペイメントID (オプション)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">プライベートノート (オプション)</string>
    <string name="send_generate_paymentid_hint">生成</string>
    <string name="send_qr_hint" translatable="false">スキャン</string>
@@ -266,8 +260,6 @@
    <string name="tx_transfers">送金</string>
    <string name="tx_notes">メモ</string>
    <string name="tx_notes_hint">(オプション)</string>
-    <string name="tx_button_notes">保存</string>
-    <string name="tx_notes_set_failed">メモの保存に失敗しました</string>
    <string name="tx_title">取引詳細</string>

    <string name="tx_pending">待機中</string>
@@ -276,8 +268,6 @@
    <string name="receive_amount_hint">数量</string>
    <string name="receive_desc_hint">説明 (オプション)</string>
    <string name="receive_cannot_open">ウォレットを開けませんでした!</string>
-    <string name="receive_paymentid_invalid">16 文字の16進数 (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">インテグレーテッドアドレスでは空でなければなりません</string>

    <string name="receive_amount_too_big">最大. %1$s</string>
    <string name="receive_amount_negative">最小. 0</string>
@@ -333,7 +323,6 @@
    <string name="nfc_tag_size">タグは %1$d バイトを提供していますが, 私達は %2$d が必要です!</string>
    <string name="nfc_tag_read_undef">タグを理解できません!</string>
    <string name="nfc_tag_read_what">あなたが何をしたいのかわかりません!</string>
-    <string name="nfc_tag_read_success">タグ読み込み成功</string>
    <string name="nfc_tag_tap">NFCが利用可能です!</string>

    <string name="unknown_amount" translatable="false">\?\?\?</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -84,7 +84,6 @@

    <string name="label_send_txid">Transaksjons-ID</string>
    <string name="label_send_address">Destinasjonsadresse</string>
-    <string name="label_send_payment_id">Betalings-ID</string>
    <string name="label_send_notes">Notater</string>

    <string name="backup_progress">Backup pågår</string>
@@ -124,7 +123,6 @@
    <string name="prompt_changepwB">[Gjenta passord for %1$s]</string>
    <string name="prompt_password">Passord for %1$s</string>
    <string name="prompt_fingerprint_auth">[You can also open wallet using fingerprint.\nPlease touch sensor.]</string>
-    <string name="prompt_send_password">Bekreft passord</string>
    <string name="prompt_open_wallet">[Opening the wallet&#8230;]</string>
    <string name="bad_fingerprint">[Fingerprint not recognized. Try again.]</string>
    <string name="bad_password">Feil passord!</string>
@@ -211,10 +209,6 @@
    <string name="generate_check_address">Skriv inn gyldig adresse</string>
    <string name="generate_check_mnemonic">Skriv inn ditt 25-ord lange seed</string>

-    <string name="send_amount_btc_xmr">%1$s (veiledende)</string>
-
-    <string name="send_paymentid_hint">Betalings-ID (valgfritt)</string>
-    <string name="send_amount_hint">0,00</string>
    <string name="send_notes_hint">Privat notat (valgfritt)</string>
    <string name="send_generate_paymentid_hint">Generer</string>
    <string name="send_send_label">Bruk mine søte moneroj</string>
@@ -259,8 +253,6 @@
    <string name="tx_transfers">Overføringer</string>
    <string name="tx_notes">Notater</string>
    <string name="tx_notes_hint">(valgfritt)</string>
-    <string name="tx_button_notes">Lagre</string>
-    <string name="tx_notes_set_failed">Lagra notater feila</string>
    <string name="tx_title">Transaksjonsdetaljer</string>

    <string name="tx_pending">VENTENDE</string>
@@ -268,8 +260,6 @@

    <string name="receive_amount_hint">Mengde</string>
    <string name="receive_cannot_open">Kunne ikke åpne lommebok!</string>
-    <string name="receive_paymentid_invalid">16 heks-karakterer (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Må være tom med integrert adresse</string>

    <string name="receive_amount_too_big">Maks. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -322,7 +312,6 @@
    <string name="nfc_tag_size">Tag provides %1$d bytes, but we need %2$d!</string>
    <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
    <string name="nfc_tag_read_what">I don\'t know what you want!</string>
-    <string name="nfc_tag_read_success">Reading Tag successful</string>
    <string name="nfc_tag_tap">NFC Available!</string>

    <string name="receive_desc_hint">Description (optional)</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">Transactie-ID</string>
    <string name="label_send_address">Doeladres</string>
-    <string name="label_send_payment_id">Betalings-ID</string>
    <string name="label_send_notes">Opmerkingen</string>

    <string name="backup_progress">Back-up wordt gemaakt</string>
@@ -124,7 +123,6 @@
    <string name="prompt_changepwB">Herhaal wachtzin voor %1$s</string>
    <string name="prompt_password">Wachtwoord voor %1$s</string>
    <string name="prompt_fingerprint_auth">Je kunt ook je vingerafdruk gebruiken.\nRaak de sensor aan.</string>
-    <string name="prompt_send_password">Bevestig wachtwoord</string>
    <string name="prompt_open_wallet">Portemonnee openen…</string>
    <string name="bad_fingerprint">Vingerafdruk niet herkend. Probeer het opnieuw.</string>
    <string name="bad_password">Onjuist wachtwoord!</string>
@@ -208,10 +206,6 @@
    <string name="generate_check_address">Voer geldig adres in</string>
    <string name="generate_check_mnemonic">Voer je 25 woorden in</string>

-    <string name="send_amount_btc_xmr">%1$s (schatting)</string>
-
-    <string name="send_paymentid_hint">Betalings-ID (optioneel)</string>
-    <string name="send_amount_hint">0,00</string>
    <string name="send_notes_hint">Opmerkingen voor jezelf (optioneel)</string>
    <string name="send_generate_paymentid_hint">Genereren</string>
    <string name="send_send_label">Geef mijn mooie moneroj uit</string>
@@ -256,8 +250,6 @@
    <string name="tx_transfers">Betalingen</string>
    <string name="tx_notes">Opmerkingen</string>
    <string name="tx_notes_hint">(optioneel)</string>
-    <string name="tx_button_notes">Opslaan</string>
-    <string name="tx_notes_set_failed">Opmerkingen opslaan mislukt</string>
    <string name="tx_title">Transactiedetails</string>

    <string name="tx_pending">WACHTEN</string>
@@ -265,8 +257,6 @@

    <string name="receive_amount_hint">Bedrag</string>
    <string name="receive_cannot_open">Kan portemonnee niet openen!</string>
-    <string name="receive_paymentid_invalid">16 hexadecimale tekens (0–9, a–f)</string>
-    <string name="receive_integrated_paymentid_invalid">Moet leeg zijn bij een geïntegreerd adres</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -319,7 +309,6 @@
    <string name="nfc_tag_size">Tag levert %1$d bytes, maar we hebben er %2$d nodig!</string>
    <string name="nfc_tag_read_undef">Ik begrijp de Tag niet!</string>
    <string name="nfc_tag_read_what">Ik weet niet wat je wilt!</string>
-    <string name="nfc_tag_read_success">Tag is gelezen</string>
    <string name="nfc_tag_tap">NFC beschikbaar!</string>

    <string name="receive_desc_hint">Omschrijving (optioneel)</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">ID da Transação</string>
    <string name="label_send_address">Endereço de destino</string>
-    <string name="label_send_payment_id">ID do pagamento</string>
    <string name="label_send_notes">Notas</string>

    <string name="backup_progress">Criando backup</string>
@@ -125,7 +124,6 @@
    <string name="prompt_changepwB">Repetir senha para %1$s</string>
    <string name="prompt_password">Senha para %1$s</string>
    <string name="prompt_fingerprint_auth">Também é possível abrir a carteira usando sua impressão digital.\nPor favor, use o sensor.</string>
-    <string name="prompt_send_password">Confirmar senha</string>
    <string name="prompt_open_wallet">Abrindo a carteira&#8230;</string>
    <string name="bad_fingerprint">Impressão digital não reconhecida. Tente novamente.</string>
    <string name="bad_password">Senha incorreta!</string>
@@ -210,10 +208,6 @@
    <string name="generate_check_address">Escreva um endereço válido</string>
    <string name="generate_check_mnemonic">Escreva a semente de 25 palavras</string>

-    <string name="send_amount_btc_xmr">%1$s (indicativo)</string>
-
-    <string name="send_paymentid_hint">ID do pagamento (opcional)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notas (opcional)</string>
    <string name="send_generate_paymentid_hint">Gerar</string>
    <string name="send_send_label">Gastar meu querido Monero!</string>
@@ -258,8 +252,6 @@
    <string name="tx_transfers">Transferências</string>
    <string name="tx_notes">Notas</string>
    <string name="tx_notes_hint">(opcional)</string>
-    <string name="tx_button_notes">Salvar</string>
-    <string name="tx_notes_set_failed">Erro ao salvar as notas</string>
    <string name="tx_title">Detalhes da Transação</string>

    <string name="tx_pending">PENDENTE</string>
@@ -267,8 +259,6 @@

    <string name="receive_amount_hint">Valor</string>
    <string name="receive_cannot_open">Não foi possível abrir a carteira!</string>
-    <string name="receive_paymentid_invalid">16 caracteres em hexadecimal (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Deve estar vazio ao usar endereços integrados</string>

    <string name="receive_amount_too_big">Máx. %1$s</string>
    <string name="receive_amount_negative">Mín. 0</string>
@@ -321,7 +311,6 @@
    <string name="nfc_tag_size">Tag disponibiliza %1$d bytes, mas precisamos de %2$d!</string>
    <string name="nfc_tag_read_undef">Não consigo ler a tag!</string>
    <string name="nfc_tag_read_what">Não sei o que você quer!</string>
-    <string name="nfc_tag_read_success">Sucesso na leitura da tag</string>
    <string name="nfc_tag_tap">NFC disponível!</string>

    <string name="menu_info">Mostrar Segredos!</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -85,7 +85,6 @@

    <string name="label_send_txid">ID da Transacção</string>
    <string name="label_send_address">Endereço de destino</string>
-    <string name="label_send_payment_id">ID do pagamento</string>
    <string name="label_send_notes">Notas</string>

    <string name="backup_progress">A efectuar cópia de segurança</string>
@@ -124,7 +123,6 @@
    <string name="prompt_changepwB">Repetir frase passe para %1$s</string>
    <string name="prompt_password">Palavra passe para %1$s</string>
    <string name="prompt_fingerprint_auth">Também podes abrir a carteira utilizando a impressão digital.\nPor favor, toca no sensor.</string>
-    <string name="prompt_send_password">Confirmar palavra passe</string>
    <string name="bad_fingerprint">Impressão diginal não reconhecida. Tenta novamente.</string>
    <string name="bad_password">Palavra passe incorrecta!</string>
    <string name="bad_wallet">A carteira não existe!</string>
@@ -210,10 +208,6 @@
    <string name="generate_check_address">Introduz um endereço válido</string>
    <string name="generate_check_mnemonic">Introduz a semente de 25 palavras</string>

-    <string name="send_amount_btc_xmr">%1$s (indicativo)</string>
-
-    <string name="send_paymentid_hint">ID do pagamento (opcional)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notas privadas (opcional)</string>
    <string name="send_generate_paymentid_hint">Gerar</string>
    <string name="send_send_label">Gasta os meus queridos Moneroj</string>
@@ -258,8 +252,6 @@
    <string name="tx_transfers">Transferências</string>
    <string name="tx_notes">Notas</string>
    <string name="tx_notes_hint">(opcional)</string>
-    <string name="tx_button_notes">Guardar</string>
-    <string name="tx_notes_set_failed">Erro ao gravar as notas</string>
    <string name="tx_title">Detalhes da Transacção</string>

    <string name="tx_pending">PENDENTE</string>
@@ -267,8 +259,6 @@

    <string name="receive_amount_hint">Quantidade</string>
    <string name="receive_cannot_open">Não foi possível abrir a carteira!</string>
-    <string name="receive_paymentid_invalid">16 caracteres em hexadecimal (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Tem que estar vazio com endereços integrados</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Mín. 0</string>
@@ -324,7 +314,6 @@
    <string name="nfc_tag_size">A Tag tem %1$d bytes, mas nós precisamos de %2$d!</string>
    <string name="nfc_tag_read_undef">Eu não percebo a Tag!</string>
    <string name="nfc_tag_read_what">Eu não percebo o que queres fazer!</string>
-    <string name="nfc_tag_read_success">Leitura do Tag bem sucedida</string>
    <string name="nfc_tag_tap">NFC Disponivel!</string>

    <string name="receive_desc_hint">Descrição (opcional)</string>
--- a/app/src/main/res/values-ro/about.xml
+++ b/app/src/main/res/values-ro/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="about_close">Inchide</string>
+    <string name="about_close">Închide</string>
    <string name="about_whoami">Eu sunt monerujo</string>
    <string name="about_version">Versiunea %1$s (%2$d)</string>

@@ -15,11 +15,11 @@

    <string name="privacy_policy"><![CDATA[
        <h1>Politică de confidențialitate</h1>
-        <p>Această pagină vă informează despre politicile privind colectarea,
+        <p>Această pagină te informează despre politicile privind colectarea,
        utilizarea și divulgarea informațiilor personale pe care le primim de la
-        utilizatorii aplicației noastre (monerujo: Portofelul Monero ).
+        utilizatorii aplicației noastre (monerujo: Portofelul Monero).
        </p>
-        <p>Folosind această aplicație, sunteți de acord cu colectarea și utilizarea informațiilor
+        <p>Folosind această aplicație, ești de acord cu colectarea și utilizarea informațiilor
 		în conformitate cu această politică.
        </p>
        <h2>Informații colectate</h2>
@@ -30,10 +30,10 @@
 		rețeaua Monero într-o formă criptată.
        </p>
        <p>Alte date personale nu sunt colectate de către aplicație.</p>
-        <p>În cazul în care folosiți funcția de schimb monetar USD/EUR (facultativ), monerujo preia rata de schimb
+        <p>În cazul în care folosești funcția de schimb monetar USD/EUR (facultativ), monerujo preia rata de schimb
        prin intermediul API-ului public al kraken.com.
-        Vizualizeaza politica de confidențialitate la adresa https://www.kraken.com/legal/privacy pentru a vedea
-		cum este procesata informația ( În special secțiunea "Information We Collect Automatically").</p>
+        Vizualizează politica de confidențialitate la adresa https://www.kraken.com/legal/privacy pentru a vedea
+		cum este procesată informația (În special secțiunea "Information We Collect Automatically").</p>
        <p>În cazul in care folosești aplicația pentru a face o plată către o adresă de portofel BTC,
 		vei folosi serviciul oferit de XMR.TO.
        Vizualizează politica lor de confidențialitate la adresa https://xmr.to/ pentru detalii. Monerujo le va trimite lor 
@@ -47,16 +47,16 @@
        <li>CAMERA : Scanează codurile QR pentru a primi Monero</li>
        </ul>
        <h2>Modificări ale acestei politici de confidențialitate</h2>
-        <p>Modificări ale acestei politici de confidențialitate pot aprea din când în când.
-		Vă vom notifica cu privire la orice modificare postând noua politică de confidențialitate în aplicație
-		sau pe siteul nostru (www.monerujo.io)
-        Vă recomandăm să revizuiți periodic această politică de confidențialitate pentru orice modificări aparute.
-        <p>Această politică de confidențialitate a fost modificată la data de: 10 Noiembrie, 2017.
+        <p>Modificări ale acestei politici de confidențialitate pot apărea din când în când.
+		Te vom notifica cu privire la orice modificare, postând noua politică de confidențialitate în aplicație
+		sau pe site-ul nostru (www.monerujo.io)
+        Îți recomandăm să revizuiești periodic această politică de confidențialitate pentru orice modificări apărute.
+        <p>Această politică de confidențialitate a fost modificată la data de: 10 noiembrie, 2017.
        </p>
        <h2>Contactează-ne</h2>
-        <p>Pentru orice întrbari legate de politica de confidențialitate,
+        <p>Pentru orice întrebări legate de politica de confidențialitate,
        sau despre cum este informația colectată și procesată,
-        vă rugăm să ne scrieți la privacy@monerujo.io.
+        te rugăm să ne scrii la privacy@monerujo.io.
        </p>
        ]]></string>
 </resources>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -84,7 +84,6 @@

    <string name="label_send_txid">ID Tranzacție </string>
    <string name="label_send_address">Adresă destinație</string>
-    <string name="label_send_payment_id">Payment ID</string>
    <string name="label_send_notes">Notițe</string>

    <string name="backup_progress">Copie de rezervă în curs</string>
@@ -118,7 +117,6 @@
    <string name="prompt_rename">Redenumește %1$s</string>

    <string name="prompt_password">Parola pentru %1$s</string>
-    <string name="prompt_send_password">Confirmă Parola</string>
    <string name="bad_password">Parolă incorectă!</string>
    <string name="bad_wallet">Portofelul nu există!</string>
    <string name="prompt_daemon_missing">Adresa nodului trebuie setată!</string>
@@ -186,10 +184,6 @@
    <string name="generate_check_address">Introdu Adresă validă</string>
    <string name="generate_check_mnemonic">Introdu cele 25 de cuvinte</string>

-    <string name="send_amount_btc_xmr">%1$s (indicativ)</string>
-
-    <string name="send_paymentid_hint">Payment ID (facultativ)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Notițe private (facultativ)</string>
    <string name="send_generate_paymentid_hint">Generează</string>
    <string name="send_send_label">Spend my sweet Moneroj</string>
@@ -234,8 +228,6 @@
    <string name="tx_transfers">Transferuri</string>
    <string name="tx_notes">Notițe</string>
    <string name="tx_notes_hint">(facultativ)</string>
-    <string name="tx_button_notes">Salvează</string>
-    <string name="tx_notes_set_failed">Salvare notițe eșuată</string>
    <string name="tx_title">Detalii tranzacție</string>

    <string name="tx_pending">ÎN CURS</string>
@@ -243,8 +235,6 @@

    <string name="receive_amount_hint">Sumă</string>
    <string name="receive_cannot_open">Nu pot deschide portofel!</string>
-    <string name="receive_paymentid_invalid">16 caractere Hex (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Trebuie să fie gol cu adresă integrată</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -322,7 +312,6 @@
    <string name="nfc_tag_size">Tag provides %1$d bytes, but we need %2$d!</string>
    <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
    <string name="nfc_tag_read_what">I don\'t know what you want!</string>
-    <string name="nfc_tag_read_success">Reading Tag successful</string>
    <string name="nfc_tag_tap">NFC Available!</string>

    <string name="receive_desc_hint">Description (optional)</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID транзакции</string>
    <string name="label_send_address">Адрес назначения</string>
-    <string name="label_send_payment_id">ID платежа</string>
    <string name="label_send_notes">Примечание</string>

    <string name="backup_progress">Выполняется резервное копирование</string>
@@ -125,7 +124,6 @@
    <string name="prompt_changepwB">Повторите пароль для %1$s</string>
    <string name="prompt_password">Пароль для %1$s</string>
    <string name="prompt_fingerprint_auth">Теперь вы можете открыть кошелек с помощью отпечатков пальцев.\nПожалуйста коснитесь датчика.</string>
-    <string name="prompt_send_password">Подтверждение пароля</string>
    <string name="prompt_open_wallet">Открытие кошелька&#8230;</string>
    <string name="bad_fingerprint">Отпечаток пальца не распознается. Попробуйте ещё раз.</string>
    <string name="bad_password">Неверный пароль!</string>
@@ -212,10 +210,6 @@
    <string name="generate_check_address">Введите действующий адрес</string>
    <string name="generate_check_mnemonic">Введите вашу мнемоническую фразу</string>

-    <string name="send_amount_btc_xmr">%1$s (приблизительно)</string>
-
-    <string name="send_paymentid_hint">ID платежа (необязательно)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Персональная заметка (необязательно)</string>
    <string name="send_generate_paymentid_hint">Генерация</string>
    <string name="send_send_label">Потратьте мои сладкие Moneroj</string>
@@ -260,8 +254,6 @@
    <string name="tx_transfers">Переводы</string>
    <string name="tx_notes">Заметки</string>
    <string name="tx_notes_hint">(необязательно)</string>
-    <string name="tx_button_notes">Сохранено</string>
-    <string name="tx_notes_set_failed">Ошибка сохранения заметки</string>
    <string name="tx_title">Подробно</string>

    <string name="tx_pending">ОЖИДАНИЕ</string>
@@ -269,8 +261,6 @@

    <string name="receive_amount_hint">Сумма</string>
    <string name="receive_cannot_open">Не удалось открыть кошелек!</string>
-    <string name="receive_paymentid_invalid">Система счисления - 16 (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Должно быть пустым со встроенным адресом</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -323,7 +313,6 @@
    <string name="nfc_tag_size">Метка предоставляет %1$d байт, но нам нужно %2$d!</string>
    <string name="nfc_tag_read_undef">Я не понимаю эту метку!</string>
    <string name="nfc_tag_read_what">Я не знаю, чего ты хочешь!</string>
-    <string name="nfc_tag_read_success">Чтение метки завершено успешно</string>
    <string name="nfc_tag_tap">NFC доступен!</string>

    <string name="receive_desc_hint">Описание (необязательно)</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID Transakcie</string>
    <string name="label_send_address">Cieľová Addresa</string>
-    <string name="label_send_payment_id">ID Platby</string>
    <string name="label_send_notes">Poznámky</string>

    <string name="backup_progress">Prebieha Záloha</string>
@@ -125,7 +124,6 @@
    <string name="prompt_changepwB">Opakuj heslo pre %1$s</string>
    <string name="prompt_password">Heslo pre %1$s</string>
    <string name="prompt_fingerprint_auth">Môžeš tiež otvoriť peňaženku pomocou odtlačku prsta.\nDotkni sa senzora.</string>
-    <string name="prompt_send_password">Potvrď heslo</string>
    <string name="prompt_open_wallet">Otváram peňaženku&#8230;</string>
    <string name="bad_fingerprint">Odtlačok som nerozoznal. Skús znova.</string>
    <string name="bad_password">Nesprávne heslo!</string>
@@ -209,10 +207,6 @@
    <string name="generate_check_address">Vlož platnú Adresu</string>
    <string name="generate_check_mnemonic">Vlož svoj 25-slovný seed</string>

-    <string name="send_amount_btc_xmr">%1$s (odhad)</string>
-
-    <string name="send_paymentid_hint">ID Platby (voliteľné)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Súkromné Poznámky (voliteľné)</string>
    <string name="send_generate_paymentid_hint">Generuj</string>
    <string name="send_send_label">Odošli Monero</string>
@@ -257,8 +251,6 @@
    <string name="tx_transfers">Poslaných</string>
    <string name="tx_notes">Poznámky</string>
    <string name="tx_notes_hint">(voliteľné)</string>
-    <string name="tx_button_notes">Ulož</string>
-    <string name="tx_notes_set_failed">Uloženie poznámky zlyhalo</string>
    <string name="tx_title">Detaily Transakcie</string>

    <string name="tx_pending">ČAKAJÚCI</string>
@@ -266,8 +258,6 @@

    <string name="receive_amount_hint">Suma</string>
    <string name="receive_cannot_open">Nemohol som otvoriť peňaženku!</string>
-    <string name="receive_paymentid_invalid">16 hexa znakov (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Musí byť prázdna s integrovanou adresou</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -320,7 +310,6 @@
    <string name="nfc_tag_size">Tag poskytol %1$d bytes, ale treba %2$d!</string>
    <string name="nfc_tag_read_undef">Neruzumiem Tagu!</string>
    <string name="nfc_tag_read_what">Neviem čo tým básnik myslel!</string>
-    <string name="nfc_tag_read_success">Čítanie Tagu úspešné</string>
    <string name="nfc_tag_tap">NFC je dostupné!</string>

    <string name="receive_desc_hint">Popis (voliteľné)</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID transakcije</string>
    <string name="label_send_address">Adresa odredišta</string>
-    <string name="label_send_payment_id">ID plaćanja</string>
    <string name="label_send_notes">Beleške</string>

    <string name="backup_progress">Bekap u toku</string>
@@ -128,7 +127,6 @@
    <string name="prompt_changepwB">Ponovi fraza-lozinku za %1$s</string>
    <string name="prompt_password">Lozinka za %1$s</string>
    <string name="prompt_fingerprint_auth">Možeš otvoriti novčanik i sa otiskom prsta.\nMolimo takni senzor.</string>
-    <string name="prompt_send_password">Potvrdi lozinku</string>
    <string name="prompt_open_wallet">Otvaranje novčanika&#8230;</string>
    <string name="bad_fingerprint">Otisak prsta nije prepoznat. Try again.</string>
    <string name="bad_password">Netačna lozinka!</string>
@@ -214,10 +212,6 @@
    <string name="generate_check_address">Unesi validnu adresu</string>
    <string name="generate_check_mnemonic">Unesi tvoje seme od 25 reči</string>

-    <string name="send_amount_btc_xmr">%1$s (indikativno)</string>
-
-    <string name="send_paymentid_hint">ID plaćanja (opciono)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Privatne beleške (opciono)</string>
    <string name="send_generate_paymentid_hint">Generiši</string>

@@ -267,8 +261,6 @@
    <string name="tx_transfers">Transferi</string>
    <string name="tx_notes">Čvorovi</string>
    <string name="tx_notes_hint">(opciono)</string>
-    <string name="tx_button_notes">Sačuvaj</string>
-    <string name="tx_notes_set_failed">Čuvanje čvorova neuspelo</string>
    <string name="tx_title">Detalji transakcije</string>

    <string name="tx_pending">NA ČEKANJU</string>
@@ -277,8 +269,6 @@
    <string name="receive_amount_hint">Suma</string>
    <string name="receive_desc_hint">Opis (opciono)</string>
    <string name="receive_cannot_open">Nemoguće otvaranje novčanika!</string>
-    <string name="receive_paymentid_invalid">16 heks. znakova (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Mora biti prazno sa integrisanom adresom</string>

    <string name="receive_amount_too_big">Maks. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -331,7 +321,6 @@
    <string name="nfc_tag_size">Tag omogućava %1$d bajta, međutim nama treba %2$d!</string>
    <string name="nfc_tag_read_undef">Ne razumem tag!</string>
    <string name="nfc_tag_read_what">Ne znam šta si mislio!</string>
-    <string name="nfc_tag_read_success">Čitanje taga uspešno</string>
    <string name="nfc_tag_tap">NFC dostupno!</string>

    <string name="menu_info">Pokaži tajne!</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -78,7 +78,6 @@

    <string name="label_send_txid">Transaktions-ID</string>
    <string name="label_send_address">Måladress</string>
-    <string name="label_send_payment_id">Betalnings-ID</string>
    <string name="label_send_notes">Anteckningar</string>

    <string name="backup_progress">Säkerhetskopiering pågår</string>
@@ -118,7 +117,6 @@
    <string name="prompt_changepwB">Upprepa lösenfrasen för %1$s</string>
    <string name="prompt_password">Lösenord för %1$s</string>
    <string name="prompt_fingerprint_auth">Du kan också öppna plånboken med fingeravtryck.\nAnvänd fingeravtryckssensorn.</string>
-    <string name="prompt_send_password">Bekräfta lösenord</string>
    <string name="bad_fingerprint">Fingeravtrycket känns inte igen. Försök igen.</string>
    <string name="bad_password">Lösenordet är fel!</string>
    <string name="bad_wallet">Plånboken finns inte!</string>
@@ -192,10 +190,6 @@
    <string name="generate_check_address">Ange en giltig adress</string>
    <string name="generate_check_mnemonic">Ange ditt startvärde på 25 ord</string>

-    <string name="send_amount_btc_xmr">%1$s (ungefärlig)</string>
-
-    <string name="send_paymentid_hint">Betalnings-ID (valfritt)</string>
-    <string name="send_amount_hint">0,00</string>
    <string name="send_notes_hint">Privat anteckning (valfri)</string>
    <string name="send_generate_paymentid_hint">Skapa</string>
    <string name="send_send_label">Spendera mina Moneroj</string>
@@ -240,8 +234,6 @@
    <string name="tx_transfers">Överföringar</string>
    <string name="tx_notes">Anteckningar</string>
    <string name="tx_notes_hint">(valfritt)</string>
-    <string name="tx_button_notes">Spara</string>
-    <string name="tx_notes_set_failed">Det gick inte att spara anteckningarna</string>
    <string name="tx_title">Transaktionsdetaljer</string>

    <string name="tx_pending">VÄNTANDE</string>
@@ -249,8 +241,6 @@

    <string name="receive_amount_hint">Belopp</string>
    <string name="receive_cannot_open">Det gick inte att öppna plånboken!</string>
-    <string name="receive_paymentid_invalid">16 hexadecimala tecken (0–9, a–f)</string>
-    <string name="receive_integrated_paymentid_invalid">Måste vara tomt med en integrerad adress</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -306,7 +296,6 @@
    <string name="nfc_tag_size">Taggen har %1$d bytes, men vi behöver %2$d!</string>
    <string name="nfc_tag_read_undef">Jag förstår inte taggen!</string>
    <string name="nfc_tag_read_what">Jag vet inte vad du vill!</string>
-    <string name="nfc_tag_read_success">Lyckades läsa tagg</string>
    <string name="nfc_tag_tap">NFC tillgängligt!</string>

    <string name="receive_desc_hint">Beskrivning (valfri)</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -86,7 +86,6 @@

    <string name="label_send_txid">ID транзакції</string>
    <string name="label_send_address">Адреса призначення</string>
-    <string name="label_send_payment_id">ID платежу</string>
    <string name="label_send_notes">Примітка</string>

    <string name="backup_progress">Виконується резервне копіювання</string>
@@ -125,7 +124,6 @@
    <string name="prompt_changepwB">Повторіть пароль для %1$s</string>
    <string name="prompt_password">Пароль для %1$s</string>
    <string name="prompt_fingerprint_auth">Тепер ви можете відкрити гаманець за допомогою відбитка пальця.\nБудь ласка торкніться датчика.</string>
-    <string name="prompt_send_password">Підтвердження пароля</string>
    <string name="prompt_open_wallet">Відкриття гаманця&#8230;</string>
    <string name="bad_fingerprint">Відбиток пальця не розпізнається. Спробуйте ще раз.</string>
    <string name="bad_password">Невірний пароль!!</string>
@@ -212,10 +210,6 @@
    <string name="generate_check_address">Введіть діючу адресу</string>
    <string name="generate_check_mnemonic">Введіть вашу мнемонічну фразу</string>

-    <string name="send_amount_btc_xmr">%1$s (приблизно)</string>
-
-    <string name="send_paymentid_hint">ID платежу (необов\'язково)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">Персональна замітка (необов\'язково)</string>
    <string name="send_generate_paymentid_hint">Генерація</string>
    <string name="send_send_label">Витратити мої солодкі Moneroj</string>
@@ -260,8 +254,6 @@
    <string name="tx_transfers">Перекази</string>
    <string name="tx_notes">Замітки</string>
    <string name="tx_notes_hint">(необов\'язково)</string>
-    <string name="tx_button_notes">Збережено</string>
-    <string name="tx_notes_set_failed">Помилка збереження замітки</string>
    <string name="tx_title">Детально</string>

    <string name="tx_pending">ОЧІКУВАННЯ</string>
@@ -269,8 +261,6 @@

    <string name="receive_amount_hint">Сума</string>
    <string name="receive_cannot_open">Не вдалося відкрити гаманець!</string>
-    <string name="receive_paymentid_invalid">Система зчислення - 16 (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">Повинно бути порожнім при використанні інтегрованої адреси</string>

    <string name="receive_amount_too_big">Max. %1$s</string>
    <string name="receive_amount_negative">Min. 0</string>
@@ -323,7 +313,6 @@
    <string name="nfc_tag_size">Мітка надає %1$d байт, але нам потрібно %2$d!</string>
    <string name="nfc_tag_read_undef">Я не розумію цю мітку!</string>
    <string name="nfc_tag_read_what">Я не знаю, що ти хочеш!</string>
-    <string name="nfc_tag_read_success">Читання мітки завершено успішно</string>
    <string name="nfc_tag_tap">NFC доступний!</string>

    <string name="receive_desc_hint">Опис (необов\'язково)</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -64,7 +64,6 @@
    <string name="label_send_btc_amount">金额</string>
    <string name="label_send_txid">交易ID</string>
    <string name="label_send_address">收款地址</string>
-    <string name="label_send_payment_id">支付ID</string>
    <string name="label_send_notes">备注</string>
    <string name="backup_progress">备份中</string>
    <string name="archive_progress">存档中</string>
@@ -95,7 +94,6 @@
    <string name="prompt_changepwB">重复新密码%1$s</string>
    <string name="prompt_password">密码%1$s</string>
    <string name="prompt_fingerprint_auth">您也可以选择指纹登录。\n请触摸传感器。</string>
-    <string name="prompt_send_password">确认密码</string>
    <string name="prompt_open_wallet">钱包打开中&#8230;</string>
    <string name="bad_fingerprint">无法识别您的指纹，请重试。</string>
    <string name="bad_password">密码错误！</string>
@@ -163,9 +161,6 @@
    <string name="generate_check_key">输入有效密钥</string>
    <string name="generate_check_address">输入有效地址</string>
    <string name="generate_check_mnemonic">请输入您的25词助记种子密语</string>
-    <string name="send_amount_btc_xmr">%1$s (参考)</string>
-    <string name="send_paymentid_hint">支付ID (选填)</string>
-    <string name="send_amount_hint">0.00</string>
    <string name="send_notes_hint">私密备注 (选填)</string>
    <string name="send_generate_paymentid_hint">生成</string>
    <string name="send_send_label">发送门罗币</string>
@@ -209,16 +204,12 @@
    <string name="tx_transfers">转账</string>
    <string name="tx_notes">备注</string>
    <string name="tx_notes_hint">(选填)</string>
-    <string name="tx_button_notes">保存</string>
-    <string name="tx_notes_set_failed">备注保存失败</string>
    <string name="tx_title">交易明细</string>
    <string name="tx_pending">待处理中</string>
    <string name="tx_failed">失败</string>
    <string name="receive_amount_hint">金额</string>
    <string name="receive_desc_hint">描述 (选填)</string>
    <string name="receive_cannot_open">无法打开钱包！</string>
-    <string name="receive_paymentid_invalid">16十六进制字符 (0&#8211;9,a&#8211;f)</string>
-    <string name="receive_integrated_paymentid_invalid">集成地址的交易ID必须为空</string>
    <string name="receive_amount_too_big">上限 %1$s</string>
    <string name="receive_amount_negative">下限 0</string>
    <string name="receive_amount_nan">请输入数字</string>
@@ -259,7 +250,6 @@
    <string name="nfc_tag_size">NFC标签提供%1$d字节，但我们需要%2$d!</string>
    <string name="nfc_tag_read_undef">我不了解NFC标签！</string>
    <string name="nfc_tag_read_what">我不知道你想要什么！</string>
-    <string name="nfc_tag_read_success">NFC标签读取成功</string>
    <string name="nfc_tag_tap">NFC可用！</string>
    <string name="menu_info">显示私密信息</string>
    <string name="menu_streetmode">公共场合模式</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
m2049r	c6a1b503bc	bump version 1.14.7	2020-09-23 11:20:16 +02:00
m2049r	8bda7aa0cf	fix crash if auth failed (#684 )	2020-09-23 11:19:28 +02:00
m2049r	97fb0a5483	bump version 1.14.6	2020-09-21 22:11:35 +02:00
m2049r	fc950c6772	fix onboarding layout (#683 )	2020-09-21 22:10:51 +02:00
m2049r	46add5e927	bump version v1.14.5	2020-09-21 14:37:51 +02:00
m2049r	fa0692ceab	force agree for fingerprint send (#682 )	2020-09-21 14:36:17 +02:00
m2049r	ff4f4a1c2c	remove notices covered by onboarding (#681 )	2020-09-21 14:35:50 +02:00
m2049r	79abb89725	disable button on finish onbaording (#680 )	2020-09-21 14:35:25 +02:00
m2049r	ef8301fd6f	bump version v1.14.4	2020-09-18 22:09:32 +02:00
hiddener	3a15c842ff	updated Romanian translation	2020-09-18 22:01:41 +02:00
m2049r	1697da55b5	only update if we still have a wallet	2020-09-18 22:00:14 +02:00
m2049r	454f3e412a	don't do stuff if the wallet is already closed	2020-09-18 22:00:14 +02:00
m2049r	d803a1e220	remove unused resources (#678 )	2020-09-18 21:59:38 +02:00