Merge branch 'master' into master

res/values/strings_de.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "Der eingegebene Text ist ungültig.",
 
   "biometric_auth_reason" : "Scannen Sie Ihren Fingerabdruck zur Authentifizierung",
-  "version" : "Ausführung ${currentVersion}"
+  "version" : "Ausführung ${currentVersion}",
+
+  "openalias_alert_title" : "XMR-Empfänger erkannt",
+  "openalias_alert_content" : "Sie senden Geld an\n${recipient_name}"
 }

res/values/strings_en.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "The text entered is not valid.",
 
   "biometric_auth_reason" : "Scan your fingerprint to authenticate",
-  "version" : "Version ${currentVersion}"
+  "version" : "Version ${currentVersion}",
+
+  "openalias_alert_title" : "XMR Recipient Detected",
+  "openalias_alert_content" : "You will be sending funds to\n${recipient_name}"
 }

res/values/strings_es.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "El texto ingresado no es válido.",
 
   "biometric_auth_reason" : "Escanee su huella digital para autenticar",
-  "version" : "Versión ${currentVersion}"
+  "version" : "Versión ${currentVersion}",
+
+  "openalias_alert_title" : "Destinatario XMR detectado",
+  "openalias_alert_content" : "Enviará fondos a\n${recipient_name}"
 }

res/values/strings_hi.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "दर्ज किया गया पाठ मान्य नहीं है।",
 
   "biometric_auth_reason" : "प्रमाणित करने के लिए अपने फ़िंगरप्रिंट को स्कैन करें",
-  "version" : "संस्करण ${currentVersion}"
+  "version" : "संस्करण ${currentVersion}",
+
+  "openalias_alert_title" : "XMR प्राप्तकर्ता का पता लगाया",
+  "openalias_alert_content" : "आपको धनराशि भेजी जाएगी\n${recipient_name}"
 }

res/values/strings_ja.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "入力されたテキストは無効です。",
 
   "biometric_auth_reason" : "प指紋をスキャンして認証する",
-  "version" : "バージョン ${currentVersion}"
+  "version" : "バージョン ${currentVersion}",
+
+  "openalias_alert_title" : "XMR受信者が検出されました",
+  "openalias_alert_content" : "に送金します\n${recipient_name}"
 }

res/values/strings_ko.arb

@@ -342,9 +342,8 @@
   "incorrect_seed" : "입력하신 텍스트가 유효하지 않습니다.",
 
   "biometric_auth_reason" : "지문을 스캔하여 인증",
-<<<<<<< HEAD
-=======
+  "version" : "버전 ${currentVersion}",
 
->>>>>>> 4848485be8cbc34cbec847abbb76dabd075841ae
-  "version" : "버전 ${currentVersion}"
+  "openalias_alert_title" : "XMR 수신자 감지",
+  "openalias_alert_content" : "당신은에 자금을 보낼 것입니다\n${recipient_name}"
 }

res/values/strings_nl.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "De ingevoerde tekst is niet geldig.",
 
   "biometric_auth_reason" : "Scan uw vingerafdruk om te verifiëren",
-  "version" : "Versie ${currentVersion}"
+  "version" : "Versie ${currentVersion}",
+
+  "openalias_alert_title" : "XMR-ontvanger gedetecteerd",
+  "openalias_alert_content" : "U stuurt geld naar\n${recipient_name}"
 }

res/values/strings_pl.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "Wprowadzony tekst jest nieprawidłowy.",
 
   "biometric_auth_reason" : "Zeskanuj swój odcisk palca, aby go uwierzytelnić",
-  "version" : "Wersja ${currentVersion}"
+  "version" : "Wersja ${currentVersion}",
+
+  "openalias_alert_title" : "Wykryto odbiorcę XMR",
+  "openalias_alert_content" : "Będziesz wysyłać środki na\n${recipient_name}"
 }

res/values/strings_pt.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "O texto digitado não é válido.",
 
   "biometric_auth_reason" : "Digitalize sua impressão digital para autenticar",
-  "version" : "Versão ${currentVersion}"
+  "version" : "Versão ${currentVersion}",
+
+  "openalias_alert_title" : "Destinatário XMR detectado",
+  "openalias_alert_content" : "Você enviará fundos para\n${recipient_name}"
 }

res/values/strings_ru.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "Введённый текст некорректный.",
 
   "biometric_auth_reason" : "Отсканируйте свой отпечаток пальца для аутентификации",
-  "version" : "Версия ${currentVersion}"
-}
+  "version" : "Версия ${currentVersion}",
+
+  "openalias_alert_title" : "Получатель XMR обнаружен",
+  "openalias_alert_content" : "Вы будете отправлять средства\n${recipient_name}"
+}

res/values/strings_zh.arb

@@ -342,5 +342,8 @@
   "incorrect_seed" : "输入的文字无效。",
 
   "biometric_auth_reason" : "掃描指紋以進行身份驗證",
-  "version" : "版 ${currentVersion}"
+  "version" : "版 ${currentVersion}",
+
+  "openalias_alert_title" : "檢測到XMR收件人",
+  "openalias_alert_content" : "您將匯款至\n${recipient_name}"
 }