From eb4782c50b236ca20f5f5166229c58d6749724f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 13 Sep 2015 16:42:29 -0700
Subject: [PATCH] Remove duplicate scan_qr string. #415

The other one isn't capitalized, but we shouldn't expect translators to have
to use all caps anyway.
---
 F-Droid/res/layout/swap_blank.xml     | 4 ++--
 F-Droid/res/values-he/strings.xml     | 1 -
 F-Droid/res/values-ja/strings.xml     | 1 -
 F-Droid/res/values-nl/strings.xml     | 1 -
 F-Droid/res/values-pl/strings.xml     | 1 -
 F-Droid/res/values-pt-rBR/strings.xml | 1 -
 F-Droid/res/values/strings.xml        | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/F-Droid/res/layout/swap_blank.xml b/F-Droid/res/layout/swap_blank.xml
index 5f981838d..0c0f2c91a 100644
--- a/F-Droid/res/layout/swap_blank.xml
+++ b/F-Droid/res/layout/swap_blank.xml
@@ -226,7 +226,7 @@
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/ic_qr_grey"
                 android:drawableStart="@drawable/ic_qr_grey"
-                android:text="@string/swap_scan_qr_code"
+                android:text="@string/swap_scan_qr"
                 android:drawablePadding="10dp"
                 android:paddingLeft="25dp"
                 android:paddingRight="25dp"
@@ -237,4 +237,4 @@
 
     </LinearLayout>
 
-</org.fdroid.fdroid.views.swap.StartSwapView>
\ No newline at end of file
+</org.fdroid.fdroid.views.swap.StartSwapView>
diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml
index 1aa5b74f8..f56e676ea 100644
--- a/F-Droid/res/values-he/strings.xml
+++ b/F-Droid/res/values-he/strings.xml
@@ -286,7 +286,6 @@
     <string name="swap_setting_up_wifi">כעת מעלה Wi-Fi…</string>
     <string name="swap_not_visible_wifi">לא נראה דרך Wi-Fi</string>
     <string name="swap_wifi_device_name">שם התקן</string>
-    <string name="swap_scan_qr_code">סרוק קוד QR</string>
     <string name="swap_connecting">כעת מתחבר</string>
     <string name="bluetooth_unavailable">‏Bluetooth לא זמין</string>
     <string name="loading">כעת טוען…</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 777e74323..27c1a86fb 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -264,7 +264,6 @@
     <string name="swap_wifi_device_name">端末名</string>
     <string name="swap_cant_find_peers">探している人が見つかりませんか?</string>
     <string name="swap_send_fdroid">F-DROID を送信</string>
-    <string name="swap_scan_qr_code">QRｺｰﾄﾞを読み取る</string>
     <string name="swap_no_peers_nearby">交換する近くの人が見つかりませんでした。</string>
     <string name="swap_connecting">接続中</string>
     <string name="swap_confirm">交換の確認</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 10110faaf..ad2c94dff 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -256,7 +256,6 @@
     <string name="swap_wifi_device_name">Apparaatnaam</string>
     <string name="swap_cant_find_peers">Kan je degene waar je naar zoekt niet vinden?</string>
     <string name="swap_send_fdroid">VERSTUUR F-DROID</string>
-    <string name="swap_scan_qr_code">SCAN QR CODE</string>
     <string name="swap_no_peers_nearby">Kon geen mensen in de buurt vinden om mee te swappen.</string>
     <string name="swap_connecting">Verbinden</string>
     <string name="swap_confirm">Bevestig swap</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index 8d6bee1f9..db7235ba3 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -273,7 +273,6 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
     <string name="swap_wifi_device_name">Nazwa urządzenia</string>
     <string name="swap_cant_find_peers">Nie możesz znaleźć kogo szukasz?</string>
     <string name="swap_send_fdroid">Wyślij F-Droida</string>
-    <string name="swap_scan_qr_code">Skanuj kod QR</string>
     <string name="swap_no_peers_nearby">Nie udało się znaleźć urządzeń, z którymi można by się wymienić.</string>
     <string name="swap_connecting">Łączenie</string>
     <string name="swap_confirm">Potwierdź wymianę</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index aa72a48e5..86be70061 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -275,7 +275,6 @@ com aplicativos baixados a partir de índices não assinados.</string>
     <string name="swap_wifi_device_name">Nome do dispositivo</string>
     <string name="swap_cant_find_peers">Não consegue achar quem você está procurando?</string>
     <string name="swap_send_fdroid">ENVIAR F-DROID</string>
-    <string name="swap_scan_qr_code">ESCANEAR CÓDIGO QR</string>
     <string name="swap_no_peers_nearby">Não foi possível encontrar pessoas próximas para permutar.</string>
     <string name="swap_connecting">Conectando</string>
     <string name="swap_confirm">Confirmar a permuta</string>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 54d3706e1..8339252db 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -305,7 +305,6 @@
     <string name="swap_wifi_device_name">Device Name</string>
     <string name="swap_cant_find_peers">Can\'t find who you\'re looking for?</string>
     <string name="swap_send_fdroid">SEND F-DROID</string>
-    <string name="swap_scan_qr_code">SCAN QR CODE</string>
     <string name="swap_no_peers_nearby">Could not find people nearby to swap with.</string>
     <string name="swap_connecting">Connecting</string>
     <string name="swap_confirm">Confirm swap</string>