From 61441b3f2c7fc58dd1a5952893ed72d100bc1ddb Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 8 Apr 2021 15:59:46 +0200
Subject: [PATCH 1/5] remove jcenter as source of libraries, except 1 lib

https://developer.android.com/studio/build/jcenter-migration
https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/

refs #2223
---
 build.gradle | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4bc99107e..a54a08ac4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url 'https://maven.google.com/' } // :-| must be before jcenter()
-        jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency
+        maven { url 'https://maven.google.com/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
@@ -11,7 +10,11 @@ buildscript {
 allprojects {
     repositories {
         mavenCentral()
-        maven { url 'https://maven.google.com/' } // :-| must be before jcenter()
-        jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency
+        maven { url 'https://maven.google.com/' }
+        jcenter() {
+            content {
+                includeModule("cc.mvdan.accesspoint", "library")
+            }
+        }
     }
 }

From 49a1bd702aede9e895be7a566cba742da2fe1274 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 9 Jul 2021 15:58:47 +0200
Subject: [PATCH 2/5] port WiFiStateChangeService to WorkManager

Everything should move to WorkManager because it is much better at
scheduling background things and is easier to debug.
---
 app/src/full/AndroidManifest.xml              |  3 -
 .../fdroid/nearby/WifiStateChangeService.java | 97 +++++++++++--------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 305c3c707..c6e4b9fd0 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -159,9 +159,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".nearby.WifiStateChangeService"
-            android:exported="false" />
         <service android:name=".nearby.SwapService" />
 
         <service
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
index c3ddc3879..31c812ed2 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
@@ -1,7 +1,5 @@
 package org.fdroid.fdroid.nearby;
 
-import android.app.IntentService;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.DhcpInfo;
@@ -9,20 +7,14 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import org.apache.commons.net.util.SubnetUtils;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Repo;
 
@@ -35,8 +27,19 @@ import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.work.Constraints;
+import androidx.work.Data;
+import androidx.work.NetworkType;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
+import androidx.work.WorkRequest;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
 import cc.mvdan.accesspoint.WifiApControl;
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 /**
  * Handle state changes to the device's wifi, storing the required bits.
@@ -61,7 +64,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
  * keep the {@link #BROADCAST} useful.
  */
 @SuppressWarnings("LineLength")
-public class WifiStateChangeService extends IntentService {
+public class WifiStateChangeService extends Worker {
     private static final String TAG = "WifiStateChangeService";
 
     public static final String BROADCAST = "org.fdroid.fdroid.action.WIFI_CHANGE";
@@ -70,42 +73,52 @@ public class WifiStateChangeService extends IntentService {
     private WifiManager wifiManager;
     private static WifiInfoThread wifiInfoThread;
     private static int previousWifiState = Integer.MIN_VALUE;
-    private static int wifiState;
+    private volatile static int wifiState;
+    private static final int NETWORK_INFO_STATE_NOT_SET = -1;
 
-    private final CompositeDisposable compositeDisposable = new CompositeDisposable();
-
-    public WifiStateChangeService() {
-        super("WifiStateChangeService");
+    public WifiStateChangeService(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
     }
 
     public static void start(Context context, @Nullable Intent intent) {
-        if (intent == null) {
-            intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        int networkInfoStateInt = NETWORK_INFO_STATE_NOT_SET;
+        if (intent != null) {
+            NetworkInfo ni = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
+            networkInfoStateInt = ni.getState().ordinal();
         }
-        intent.setComponent(new ComponentName(context, WifiStateChangeService.class));
-        context.startService(intent);
+
+        WorkRequest workRequest = new OneTimeWorkRequest.Builder(WifiStateChangeService.class)
+                .setConstraints(new Constraints.Builder()
+                        .setRequiredNetworkType(NetworkType.CONNECTED)
+                        .build())
+                .setInputData(new Data.Builder()
+                        .putInt(WifiManager.EXTRA_NETWORK_INFO, networkInfoStateInt)
+                        .build()
+                )
+                .build();
+        WorkManager.getInstance(context).enqueue(workRequest);
     }
 
+    @NonNull
     @Override
-    public void onDestroy() {
-        compositeDisposable.dispose();
-        super.onDestroy();
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
+    public Result doWork() {
         android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_LOWEST);
-        if (intent == null) {
-            Utils.debugLog(TAG, "received null Intent, ignoring");
-            return;
+        int networkInfoStateInt = getInputData().getInt(WifiManager.EXTRA_NETWORK_INFO, NETWORK_INFO_STATE_NOT_SET);
+        NetworkInfo.State networkInfoState = null;
+        if (networkInfoStateInt != NETWORK_INFO_STATE_NOT_SET) {
+            networkInfoState = NetworkInfo.State.values()[networkInfoStateInt];
         }
         Utils.debugLog(TAG, "WiFi change service started.");
-        NetworkInfo ni = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
         wifiManager = ContextCompat.getSystemService(getApplicationContext(), WifiManager.class);
+        if (wifiManager == null) {
+            return Result.failure();
+        }
         wifiState = wifiManager.getWifiState();
-        Utils.debugLog(TAG, "ni == " + ni + "  wifiState == " + printWifiState(wifiState));
-        if (ni == null
-                || ni.getState() == NetworkInfo.State.CONNECTED || ni.getState() == NetworkInfo.State.DISCONNECTED) {
+        Utils.debugLog(TAG, "networkInfoStateInt == " + networkInfoStateInt
+                + "  wifiState == " + printWifiState(wifiState));
+        if (networkInfoState == null
+                || networkInfoState == NetworkInfo.State.CONNECTED
+                || networkInfoState == NetworkInfo.State.DISCONNECTED) {
             if (previousWifiState != wifiState &&
                     (wifiState == WifiManager.WIFI_STATE_ENABLED
                             || wifiState == WifiManager.WIFI_STATE_DISABLING  // might be switching to hotspot
@@ -117,11 +130,8 @@ public class WifiStateChangeService extends IntentService {
                 wifiInfoThread = new WifiInfoThread();
                 wifiInfoThread.start();
             }
-
-            if (Build.VERSION.SDK_INT < 21 && wifiState == WifiManager.WIFI_STATE_ENABLED) {
-                compositeDisposable.add(UpdateService.scheduleIfStillOnWifi(this).subscribe());
-            }
         }
+        return Result.success();
     }
 
     public class WifiInfoThread extends Thread {
@@ -235,16 +245,17 @@ public class WifiStateChangeService extends IntentService {
             }
             Intent intent = new Intent(BROADCAST);
             intent.putExtra(EXTRA_STATUS, wifiState);
-            LocalBroadcastManager.getInstance(WifiStateChangeService.this).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
         }
     }
 
     private void setSsid(WifiInfo wifiInfo) {
+        Context context = getApplicationContext();
         if (wifiInfo != null && wifiInfo.getBSSID() != null) {
             String ssid = wifiInfo.getSSID();
             Utils.debugLog(TAG, "Have wifi info, connected to " + ssid);
             if (ssid == null) {
-                FDroidApp.ssid = getString(R.string.swap_blank_wifi_ssid);
+                FDroidApp.ssid = context.getString(R.string.swap_blank_wifi_ssid);
             } else {
                 FDroidApp.ssid = ssid.replaceAll("^\"(.*)\"$", "$1");
             }
@@ -252,7 +263,7 @@ public class WifiStateChangeService extends IntentService {
         } else {
             WifiApControl wifiApControl = null;
             try {
-                wifiApControl = WifiApControl.getInstance(this);
+                wifiApControl = WifiApControl.getInstance(context);
                 wifiApControl.isEnabled();
             } catch (NullPointerException e) {
                 wifiApControl = null;
@@ -263,19 +274,19 @@ public class WifiStateChangeService extends IntentService {
                 if (wifiInfo != null && wifiInfo.getBSSID() != null) {
                     setSsid(wifiInfo);
                 } else {
-                    FDroidApp.ssid = getString(R.string.swap_active_hotspot, "");
+                    FDroidApp.ssid = context.getString(R.string.swap_active_hotspot, "");
                 }
             } else if (wifiApControl != null && wifiApControl.isEnabled()) {
                 WifiConfiguration wifiConfiguration = wifiApControl.getConfiguration();
                 Utils.debugLog(TAG, "WifiConfiguration: " + wifiConfiguration);
                 if (wifiConfiguration == null) {
-                    FDroidApp.ssid = getString(R.string.swap_active_hotspot, "");
+                    FDroidApp.ssid = context.getString(R.string.swap_active_hotspot, "");
                     FDroidApp.bssid = "";
                     return;
                 }
 
                 if (wifiConfiguration.hiddenSSID) {
-                    FDroidApp.ssid = getString(R.string.swap_hidden_wifi_ssid);
+                    FDroidApp.ssid = context.getString(R.string.swap_hidden_wifi_ssid);
                 } else {
                     FDroidApp.ssid = wifiConfiguration.SSID;
                 }

From 4e0f9f1aaf4b3bb7f963bcdbb1276d44e2dc42c6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 9 Jul 2021 16:32:34 +0200
Subject: [PATCH 3/5] add direct link to app selection on Nearby front screen

---
 .../fdroid/fdroid/nearby/StartSwapView.java   |  4 +++
 .../fdroid/nearby/SwapWorkflowActivity.java   | 32 +++++++++----------
 app/src/full/res/layout/swap_start_swap.xml   | 12 +++++--
 app/src/main/res/values-ar/strings.xml        |  1 +
 app/src/main/res/values-ast/strings.xml       |  1 +
 app/src/main/res/values-be/strings.xml        |  1 +
 app/src/main/res/values-bn/strings.xml        |  1 +
 app/src/main/res/values-bo/strings.xml        |  1 +
 app/src/main/res/values-ca/strings.xml        |  1 +
 app/src/main/res/values-cs/strings.xml        |  1 +
 app/src/main/res/values-cy/strings.xml        |  1 +
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values-el/strings.xml        |  1 +
 app/src/main/res/values-eo/strings.xml        |  1 +
 app/src/main/res/values-es-rAR/strings.xml    |  1 +
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-et/strings.xml        |  1 +
 app/src/main/res/values-eu/strings.xml        |  1 +
 app/src/main/res/values-fa/strings.xml        |  1 +
 app/src/main/res/values-fi/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values-he/strings.xml        |  1 +
 app/src/main/res/values-hi/strings.xml        |  1 +
 app/src/main/res/values-hr/strings.xml        |  1 +
 app/src/main/res/values-hu/strings.xml        |  1 +
 app/src/main/res/values-id/strings.xml        |  1 +
 app/src/main/res/values-is/strings.xml        |  1 +
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values-kab/strings.xml       |  1 +
 app/src/main/res/values-ko/strings.xml        |  1 +
 app/src/main/res/values-ml/strings.xml        |  1 +
 app/src/main/res/values-nb/strings.xml        |  1 +
 app/src/main/res/values-nl-rBE/strings.xml    |  1 +
 app/src/main/res/values-nl/strings.xml        |  1 +
 app/src/main/res/values-nn/strings.xml        |  1 +
 app/src/main/res/values-pl/strings.xml        |  1 +
 app/src/main/res/values-ps/strings.xml        |  1 +
 app/src/main/res/values-pt-rBR/strings.xml    |  1 +
 app/src/main/res/values-pt-rPT/strings.xml    |  1 +
 app/src/main/res/values-pt/strings.xml        |  1 +
 app/src/main/res/values-ro/strings.xml        |  1 +
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values-sq/strings.xml        |  1 +
 app/src/main/res/values-sr/strings.xml        |  1 +
 app/src/main/res/values-sv/strings.xml        |  1 +
 app/src/main/res/values-ta/strings.xml        |  1 +
 app/src/main/res/values-tr/strings.xml        |  1 +
 app/src/main/res/values-uk/strings.xml        |  1 +
 app/src/main/res/values-vi/strings.xml        |  1 +
 app/src/main/res/values-zh-rCN/strings.xml    |  1 +
 app/src/main/res/values-zh-rTW/strings.xml    |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 53 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 4b699a842..0d2b3340e 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -28,6 +28,8 @@ import org.fdroid.fdroid.nearby.peers.Peer;
 import java.util.ArrayList;
 
 import androidx.annotation.Nullable;
+
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -126,6 +128,8 @@ public class StartSwapView extends SwapView {
     };
 
     private void uiInitButtons() {
+        MaterialButton sendFDroidButton = findViewById(R.id.btn_send_fdroid);
+        sendFDroidButton.setEllipsize(TextUtils.TruncateAt.END);
         findViewById(R.id.btn_send_fdroid).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index e41c15da4..e476464e7 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -34,17 +34,8 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.core.content.ContextCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
@@ -75,6 +66,15 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import cc.mvdan.accesspoint.WifiApControl;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
@@ -1014,12 +1014,12 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             }
         });
 
-        findViewById(R.id.btn_scan_qr).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                inflateSwapView(R.layout.swap_wifi_qr);
-            }
-        });
+        MaterialButton scanQrButton = findViewById(R.id.btn_scan_qr);
+        scanQrButton.setOnClickListener(v -> inflateSwapView(R.layout.swap_wifi_qr));
+
+        MaterialButton appsButton = findViewById(R.id.btn_apps);
+        appsButton.setOnClickListener(v -> inflateSwapView(R.layout.swap_select_apps));
+        appsButton.setEllipsize(TextUtils.TruncateAt.END);
 
         if (SwapService.getWifiVisibleUserPreference()) {
             wifiSwitch.setChecked(true);
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 0edcee19c..f8ab84a20 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -153,7 +153,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_send_fdroid"
             style="@style/Widget.App.Button.TextButton"
             android:layout_width="wrap_content"
@@ -161,7 +161,7 @@
             android:layout_height="wrap_content"
             android:text="@string/swap_send_fdroid" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_scan_qr"
             style="@style/Widget.App.Button.TextButton"
             android:layout_width="wrap_content"
@@ -169,6 +169,14 @@
             android:text="@string/swap_scan_qr"
             swap:icon="@drawable/ic_qr_code" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_apps"
+            style="@style/Widget.App.Button.TextButton"
+            android:ellipsize="end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/apps" />
+
     </LinearLayout>
 
     <!-- Heading for "can't find peers" -->
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index aacda505b..da7fb4b28 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -220,6 +220,7 @@
     <string name="swap_wifi_device_name">اسم الجهاز</string>
     <string name="swap_cant_find_peers">لا يمكن العثور على من كنت تبحث عنه؟</string>
     <string name="swap_send_fdroid">إرسال اف-درويد</string>
+    <string name="apps">تطبيقات</string>
     <string name="swap_no_peers_nearby">لا يمكن العثور على شخص في مكان قريب للمبادلة معه.</string>
     <string name="swap_connecting">جارٍ الاتصال</string>
     <string name="swap_confirm">تأكيد المبادلة</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 8e880240e..ff1d04c43 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -151,6 +151,7 @@
     <string name="swap_connecting">Coneutando</string>
     <string name="swap_cant_find_peers">¿Nun alcuentres a quién tas guetando\?</string>
     <string name="swap_send_fdroid">Unviar F-Droid</string>
+    <string name="apps">Restolar</string>
     <string name="swap_qr_isnt_for_swap">El códigu QR qu\'escaniesti nun paez un códigu d\'intercambéu.</string>
     <string name="swap_connection_misc_error">Asocedió un fallu mentanto se coneutaba col preséu, ¡nun pue intercambiase con elli!</string>
     <string name="swap_confirm">Confirmación</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 25bfcb7b1..3bf0d68d1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -228,6 +228,7 @@
     <string name="swap_wifi_device_name">Назва прылады</string>
     <string name="swap_cant_find_peers">Не можаце знайсці, каго шукаеце\?</string>
     <string name="swap_send_fdroid">Адправіць F-Droid</string>
+    <string name="apps">Праграмы</string>
     <string name="swap_no_peers_nearby">Не атрымалася знайсці людзей паблізу для абмену.</string>
     <string name="swap_connecting">Падлучэнне</string>
     <string name="swap_confirm">Пацвердзіць абмен</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 51589cb26..58c04b41b 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -89,6 +89,7 @@
     <string name="theme_dark">অন্ধকার</string>
     <string name="theme_light">হালকা</string>
     <string name="swap_send_fdroid">এফ-ড্রয়েড পাঠান</string>
+    <string name="apps">অ্যাপ</string>
     <string name="category_Science_Education">বিজ্ঞান ও শিক্ষা</string>
     <string name="category_Reading">পড়া</string>
     <string name="category_Phone_SMS">ফোন ও এসএমএস</string>
diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml
index e05ea4e5c..4dcbbdeb2 100644
--- a/app/src/main/res/values-bo/strings.xml
+++ b/app/src/main/res/values-bo/strings.xml
@@ -56,6 +56,7 @@
     <string name="category_Sports_Health">རྩེད་རིགས་དང་འཕྲོད་བསྟེན།</string>
     <string name="category_System">མ་ལག</string>
     <string name="swap_send_fdroid">ཨེཕ་རོཌ་གཏོང་།</string>
+    <string name="apps">ལྟ་བ།</string>
     <string name="crash_dialog_title">ཨེཕ་རོཌ་ལ་གཏོར་སྐྱོན་ཤོར་འདུག</string>
     <string name="crash_dialog_text">གློ་བུར་དུ་སྐྱོན་ཆ་ཞིག་ཤོར་སོང་བས་མཉེན་ཆས་འདི་སྒོ་མ་རྒྱབ་ཀ་མེད་ཐུག་སོང་། ཁྱེད་རང་གིས་གློག་འཕྲིན་གཏོང་ནས་གནད་དོན་འདི་སེལ་འདོད་དམ།?</string>
     <string name="notification_title_single_update_available">གསར་བསྒྱུར་ཡོད།</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 47238e19d..8c7a1a786 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -226,6 +226,7 @@
     <string name="swap_wifi_device_name">Nom del dispositiu</string>
     <string name="swap_cant_find_peers">No trobeu a qui esteu cercant?</string>
     <string name="swap_send_fdroid">Envia l\'F-Droid</string>
+    <string name="apps">Aplicacions</string>
     <string name="swap_no_peers_nearby">No s\'ha trobat ningú a prop amb qui intercanviar.</string>
     <string name="swap_connecting">S\'està connectant</string>
     <string name="swap_confirm">Confirmeu l\'intercanvi</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e4eb5acac..4aa7ace51 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -202,6 +202,7 @@
     <string name="swap_wifi_device_name">Jméno přístroje</string>
     <string name="swap_cant_find_peers">Nemůžete nalézt koho hledáte?</string>
     <string name="swap_send_fdroid">Odeslat F-Droid</string>
+    <string name="apps">Aplikace</string>
     <string name="swap_connecting">Připojování</string>
     <string name="swap_confirm">Potvrdit výměnu</string>
     <string name="swap_qr_isnt_for_swap">Naskenovaný QR kód nevypadá jako výměnný kód.</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index c3828723d..7326cc653 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -312,6 +312,7 @@
     <string name="swap_wifi_device_name">Enw\'r Ddyfais</string>
     <string name="swap_cant_find_peers">Methu â ffeindio\'r person wyt yn edrych am\?</string>
     <string name="swap_send_fdroid">Anfon F-Droid</string>
+    <string name="apps">Apiau</string>
     <string name="swap_no_peers_nearby">Methwyd â ffeindio pobol gerllaw i gyfnewid â nhw.</string>
     <string name="swap_connecting">Yn cysylltu</string>
     <string name="swap_confirm">Cadarnhau cyfnewid</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2614a3f08..a8915befd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -177,6 +177,7 @@
 \nEs sind Apps auf Ihrem Gerät installiert, aber keine davon ist von F-Droid abrufbar. Das könnte daran liegen, dass Sie Ihre Paketquellen aktualisieren müssen oder diese tatsächlich keine Ihrer Apps beinhalten.</string>
     <string name="empty_can_update_app_list">Glückwunsch!\nIhre Apps sind auf dem neuesten Stand.</string>
     <string name="swap_send_fdroid">F-Droid senden</string>
+    <string name="apps">Apps</string>
     <string name="swap_connecting">Verbindungsaufbau</string>
     <string name="interval_never">Keine automatischen App-Aktualisierungen</string>
     <string name="interval_2w">Alle zwei Wochen nach Aktualisierungen suchen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4914a48e3..80b50dba6 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -208,6 +208,7 @@
     <string name="swap_wifi_device_name">Όνομα της συσκευής</string>
     <string name="swap_cant_find_peers">Δεν βρήκατε αυτόν που αναζητάτε;</string>
     <string name="swap_send_fdroid">Αποστολή F-Droid</string>
+    <string name="apps">Εφαρμογές</string>
     <string name="swap_connecting">Σύνδεση</string>
     <string name="swap_confirm">Επιβεβαίωση ανταλλαγής</string>
     <string name="swap_qr_isnt_for_swap">Ο κώδικας QR που σαρώσατε δεν μοιάζει με έναν κωδικό ανταλλαγής.</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index c21d965c5..4b8d1e69e 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -219,6 +219,7 @@
     <string name="swap_wifi_device_name">Nomo de aparato</string>
     <string name="swap_cant_find_peers">Ĉu vi ne povas trovi kiun, tiun vi serĉas?</string>
     <string name="swap_send_fdroid">Sendi F-Droid</string>
+    <string name="apps">Katalogo</string>
     <string name="swap_no_peers_nearby">Ne povas trovi homojn proksime por interŝanĝi.</string>
     <string name="swap_connecting">Konektado</string>
     <string name="swap_confirm">Konfirmi interŝanĝon</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 5f5a27a7d..626c1febb 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -208,6 +208,7 @@
     <string name="swap_welcome">¡Bienvenido a F-Droid!</string>
     <string name="swap_dont_show_again">No mostrar de nuevo</string>
     <string name="swap_send_fdroid">Enviar F-Droid</string>
+    <string name="apps">Aplicaciones</string>
     <string name="newPerms">Nuevo</string>
     <string name="crash_dialog_title">F-Droid se detuvo</string>
     <string name="crash_dialog_text">Ocurrió un error inesperado que forzó a la aplicación a detenerse. ¿Querés enviar los detalles por correo electrónico para ayudar a resolver el problema\?</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0bd5226f8..2cff3d0cd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -190,6 +190,7 @@
     <string name="swap_wifi_device_name">Nombre del dispositivo</string>
     <string name="swap_cant_find_peers">¿No encuentra a quien busca\?</string>
     <string name="swap_send_fdroid">Enviar</string>
+    <string name="apps">Aplicaciones</string>
     <string name="swap_no_peers_nearby">No se pudo encontrar gente cerca para realizar intercambios.</string>
     <string name="swap_connecting">Estableciendo conexión</string>
     <string name="swap_confirm">Confirmar intercambio</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 95520c718..23562e8a9 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -228,6 +228,7 @@
     <string name="swap_wifi_device_name">Seadme nimi</string>
     <string name="swap_cant_find_peers">Ei leia seda, keda otsid?</string>
     <string name="swap_send_fdroid">Saada F-Droid</string>
+    <string name="apps">Rakendused</string>
     <string name="swap_no_peers_nearby">Ei leidnud lähedal inimesi, kellega vahetada.</string>
     <string name="swap_connecting">Ühendamine</string>
     <string name="swap_confirm">Kinnita vahetus</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9025603a3..76256299b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -219,6 +219,7 @@
     <string name="swap_not_visible_wifi">Wi-Fi bidez ez ikusgai</string>
     <string name="swap_cant_find_peers">Ezin duzu bilatzen ari zarena aurkitu?</string>
     <string name="swap_send_fdroid">Bidali F-Droid</string>
+    <string name="apps">Aplikazioak</string>
     <string name="swap_no_peers_nearby">Ezin izan da inguruan partekatzeko jenderik aurkitu.</string>
     <string name="swap_confirm">Berretsi trukea</string>
     <string name="swap_nfc_title">Ukitu partekatzeko</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 982cdb200..5cab6f66a 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -184,6 +184,7 @@
     <string name="swap_wifi_device_name">نام دستگاه</string>
     <string name="swap_cant_find_peers">نمی‌توانید کسی که دنبالش هستید را پیدا کنید؟</string>
     <string name="swap_send_fdroid">ارسال اف‌دروید</string>
+    <string name="apps">کاره‌ها</string>
     <string name="swap_no_peers_nearby">نمی‌توان افراد نزدیک را برای تبادل با آن‌ها پیدا کرد.</string>
     <string name="swap_connecting">درحال اتصال</string>
     <string name="swap_confirm">تأیید تبادل</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9eb8ace1a..e13e4aec3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -143,6 +143,7 @@
     <string name="allPerms">Kaikki</string>
     <string name="newPerms">Uusi</string>
     <string name="swap_send_fdroid">Lähetä F-Droid</string>
+    <string name="apps">Sovellukset</string>
     <string name="swap_wifi_device_name">Laitteen nimi</string>
     <string name="swap_choose_apps">Valitse sovellukset</string>
     <string name="links">Linkit</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d33aea88f..fe8943726 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -216,6 +216,7 @@
     <string name="swap_not_visible_wifi">Non visible en Wi-Fi</string>
     <string name="swap_wifi_device_name">Nom de l’appareil</string>
     <string name="swap_send_fdroid">Envoyer F-Droid</string>
+    <string name="apps">Applications</string>
     <string name="swap_no_peers_nearby">Aucune personne n\'a été trouvée à proximité.</string>
     <string name="swap_connecting">Connexion</string>
     <string name="swap_confirm">Confirmez l\'échange</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 617fb1bd4..b39ac395c 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -197,6 +197,7 @@
     <string name="swap_nearby">החלפה בקרבת מקום</string>
     <string name="swap_cant_find_peers">לא מצאת את מבוקשך?</string>
     <string name="swap_send_fdroid">שליחת F-Droid</string>
+    <string name="apps">יישומונים</string>
     <string name="swap_confirm">אימות ההחלפה</string>
     <string name="swap_qr_isnt_for_swap">קוד ה־QR שסרקת לא נראה כמו קוד החלפה.</string>
     <string name="swap_intro">ניתן להתחבר ולהחליף יישומונים עם אנשים בקרבתך.</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index eb7a8c4f5..fb907eace 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -84,6 +84,7 @@
     <string name="swap_wifi_device_name">उपकरण का नाम</string>
     <string name="swap_cant_find_peers">नहीं धुंद प् रहे जिसकी आप तलाश कर रहे है?</string>
     <string name="swap_send_fdroid">F-Droid भेजे</string>
+    <string name="apps">ऐप्स</string>
     <string name="swap_no_peers_nearby">अदला-बदली के लिए आस पास के लोग नहीं खोज पाए|</string>
     <string name="swap_join_this_hotspot">हॉटस्पॉट से जुडने मैं अपने दोस्त की सहयता करें</string>
     <string name="swap">ऐप्स स्वैप करें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 8fbacb309..a4099593b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -229,6 +229,7 @@
     <string name="swap_wifi_device_name">Ime uređja</string>
     <string name="swap_cant_find_peers">Ne možete naći koga tražite?</string>
     <string name="swap_send_fdroid">Pošalji F-Droid</string>
+    <string name="apps">Programi</string>
     <string name="swap_no_peers_nearby">Nije uspjelo traženje ljudi u blizini.</string>
     <string name="swap_connecting">Povezivanje</string>
     <string name="swap_confirm">Potvrdi razmjenu</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b675a3fd8..22cd1a66d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -223,6 +223,7 @@
     <string name="swap_wifi_device_name">Eszköz neve</string>
     <string name="swap_cant_find_peers">Nem találja, amit keres?</string>
     <string name="swap_send_fdroid">Az F-Droid küldése</string>
+    <string name="apps">Alkalmazások</string>
     <string name="swap_connecting">Kapcsolódás</string>
     <string name="download_pending">Várakozás a letöltés elkezdésére…</string>
     <string name="installing">Telepítés…</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 1224eec98..99b01608d 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -220,6 +220,7 @@
     <string name="swap_wifi_device_name">Nama Perangkat</string>
     <string name="swap_cant_find_peers">Tidak bisa menemukan siapa yang Anda cari\?</string>
     <string name="swap_send_fdroid">Kirimkan F-Droid</string>
+    <string name="apps">Aplikasi</string>
     <string name="swap_no_peers_nearby">Tidak bisa menemukan orang untuk bertukar di sekitar.</string>
     <string name="swap_connecting">Menghubungkan</string>
     <string name="swap_confirm">Konfirmasi tukar</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 9ead97937..b68ce8313 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -175,6 +175,7 @@
     <string name="swap_wifi_device_name">Heiti tækis</string>
     <string name="swap_cant_find_peers">Finnurðu ekki það sem þú leitar að?</string>
     <string name="swap_send_fdroid">Senda F-Droid</string>
+    <string name="apps">Forrit</string>
     <string name="swap_no_peers_nearby">Gat ekki fundið neinn í nágrenninu til að býtta við.</string>
     <string name="swap_connecting">Tengist</string>
     <string name="swap_confirm">Staðfesta býtti</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 207235c0f..d094d80c6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -248,6 +248,7 @@
         browser.
     </string>
     <string name="swap_send_fdroid">Invia F-Droid</string>
+    <string name="apps">Applicazioni</string>
     <string name="swap_connection_misc_error">È avvenuto un errore durante la connessione al dispositivo, non sembra possibile effettuare lo scambio!</string>
     <string name="install_confirm_update_no_perms">Vuoi installare un aggiornamento di questa applicazione\? I tuoi dati non andranno persi. Non occorrono accessi speciali.</string>
     <string name="install_confirm_update_system_no_perms">Vuoi installare un aggiornamento di questa applicazione integrata\? I tuoi dati non andranno persi. Non occorrono accessi speciali.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1850d26b3..84697e36c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -178,6 +178,7 @@
     <string name="swap_wifi_device_name">端末名</string>
     <string name="swap_cant_find_peers">探している人が見つかりませんか？</string>
     <string name="swap_send_fdroid">F-Droidを送信</string>
+    <string name="apps">アプリ</string>
     <string name="swap_no_peers_nearby">交換できる近くにいる人が見つかりませんでした｡</string>
     <string name="swap_connecting">接続中</string>
     <string name="swap_confirm">交換の確認</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index c69791996..69f33ea81 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -164,6 +164,7 @@
     <string name="wifi">Wi-Fi</string>
     <string name="category_Sports_Health">Addal &amp; Tazmert</string>
     <string name="swap_send_fdroid">Azen F-Droid</string>
+    <string name="apps">Isnasen</string>
     <string name="crash_dialog_title">F-Droid yeγli</string>
     <string name="enable_nfc_send">Rmed Tuzna NFC …</string>
     <string name="unstable_updates">Ileqman ur yerkiden ara</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e0e96cbbf..8ac399d30 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -208,6 +208,7 @@
     <string name="swap_wifi_device_name">기기 이름</string>
     <string name="swap_cant_find_peers">찾고 있는 사람을 찾을 수 없습니까?</string>
     <string name="swap_send_fdroid">F-Droid 보내기</string>
+    <string name="apps">앱</string>
     <string name="swap_no_peers_nearby">근처에 교환할 수 있는 사람들을 찾을 수 없었습니다.</string>
     <string name="swap_connecting">연결 중</string>
     <string name="swap_confirm">교환 확인</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 24d571823..1f068c5c7 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -63,6 +63,7 @@
     <string name="category_Sports_Health">കായികവും ആരോഗ്യവും</string>
     <string name="category_System">ഉപകരണ സംബന്ധം</string>
     <string name="swap_send_fdroid">ഈ ആപ്പ് അയക്കുക</string>
+    <string name="apps">അപ്ലിക്കേഷനുകൾ</string>
     <string name="crash_dialog_title">എഫ്-ഡ്രോയ്ഡ് തകര്‍ന്നു</string>
     <string name="crash_dialog_text">പ്രയോഗം നിർത്തുന്നതില്‍ ഒരു അപ്രതീക്ഷിത പിശക് സംഭവിച്ചു. പ്രശ്നം പരിഹരിക്കാൻ സഹായിക്കുന്നതിന് വിശദാംശങ്ങൾ ഇ-മെയിൽ ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?</string>
     <string name="notification_title_single_update_available">പുതിയ പതിപ്പ് ലഭ്യമാണ്</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 4a0eab842..15f7e9f77 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -184,6 +184,7 @@
     <string name="swap_wifi_device_name">Enhetsnavn</string>
     <string name="swap_cant_find_peers">Finner du ikke den du leter etter?</string>
     <string name="swap_send_fdroid">Oversend F-Droid</string>
+    <string name="apps">Programmer</string>
     <string name="swap_connecting">Kobler til</string>
     <string name="loading">Laster inn …</string>
     <string name="install_confirm">tilgang til</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 5f7d91577..e4f08c838 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -63,6 +63,7 @@
     <string name="category_Sports_Health">Sport &amp; Gezondheid</string>
     <string name="category_System">Systeem</string>
     <string name="swap_send_fdroid">Verstuur F-Droid</string>
+    <string name="apps">Applicaties</string>
     <string name="crash_dialog_title">F-Droid is gecrasht</string>
     <string name="crash_dialog_text">Een onverwachte fout is opgetreden waardoor de app gestopt is. Wilt u de details over deze fout e-mailen om zo het probleem te helpen oplossen\?</string>
     <string name="notification_title_single_update_available">Update beschikbaar</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5d75c20bd..7ad5746c4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -190,6 +190,7 @@
     <string name="swap_wifi_device_name">Apparaatnaam</string>
     <string name="swap_cant_find_peers">Kunt u de persoon waar u naar zoekt niet vinden\?</string>
     <string name="swap_send_fdroid">Verstuur F-Droid</string>
+    <string name="apps">Apps</string>
     <string name="swap_no_peers_nearby">Kon geen mensen in de buurt vinden om mee uit te wisselen.</string>
     <string name="swap_connecting">Verbinding maken</string>
     <string name="swap_confirm">Bevestig uitwisseling</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 77649d125..6c9c9d557 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -63,6 +63,7 @@
     <string name="category_Sports_Health">Idrett og helse</string>
     <string name="category_System">System</string>
     <string name="swap_send_fdroid">Oversend F-Droid</string>
+    <string name="apps">Appar</string>
     <string name="crash_dialog_title">F-Droid har krasja</string>
     <string name="crash_dialog_text">Det oppstod ein feil som gjorde at programmet måtte stoppa. Vil du senda ein e-post med detaljar om dette, for å hjelpa til å retta problemet\?</string>
     <string name="notification_title_single_update_available">Oppdatering tilgjengeleg</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index de984fbc0..c0fb3a481 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -196,6 +196,7 @@
     <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="apps">Aplikacje</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/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 3822cb67b..017c6ffd9 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -4,6 +4,7 @@
     <string name="menu_video">وېډيو</string>
     <string name="menu_website">ګورتځی</string>
     <string name="swap_send_fdroid">اېف-ډراېډ واستوئ</string>
+    <string name="apps">کاریالونه</string>
     <string name="swap_scan_qr">کيوآر کوډ وځېرئ</string>
     <string name="swap_choose_apps">کاریالونه ټاکل</string>
     <string name="swap_wifi_device_name">د وزلې نوم</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 81095bfd2..f7b217aae 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -200,6 +200,7 @@
     <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="apps">Aplicativos</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/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index df730d2f7..72147a6e3 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -186,6 +186,7 @@
     <string name="swap_wifi_device_name">Nome do dispositivo</string>
     <string name="swap_cant_find_peers">Não encontra o que procura?</string>
     <string name="swap_send_fdroid">Enviar F-Droid</string>
+    <string name="apps">Aplicações</string>
     <string name="swap_connecting">A ligar</string>
     <string name="loading">A carregar…</string>
     <string name="newPerms">Novas</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 74d9d18db..8049a1ee9 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -63,6 +63,7 @@
     <string name="category_Sports_Health">Desporto e saúde</string>
     <string name="category_System">Sistema</string>
     <string name="swap_send_fdroid">Enviar F-Droid</string>
+    <string name="apps">Apps</string>
     <string name="crash_dialog_title">O F-Droid terminou abruptamente</string>
     <string name="crash_dialog_text">Ocorreu um erro inesperado e a app foi encerrada. Gostaria de nos enviar um e-mail com os detalhes do erro\?</string>
     <string name="notification_title_single_update_available">Atualização disponível</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 6a16e5600..181301e8a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -180,6 +180,7 @@
     <string name="swap_setting_up_wifi">Configurare Wi-Fi…</string>
     <string name="swap_connecting">Se conectează</string>
     <string name="swap_send_fdroid">Trimite F-Droid</string>
+    <string name="apps">Aplicații</string>
     <string name="crash_dialog_title">F-Droid s-a oprit</string>
     <string name="theme_light">Luminoasă</string>
     <string name="theme_dark">Întunecată</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 08863c183..106ab61eb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -244,6 +244,7 @@
     <string name="swap_not_visible_wifi">Не видимый через Wi-Fi</string>
     <string name="swap_cant_find_peers">Не можете найти того, кого ищете?</string>
     <string name="swap_send_fdroid">Отправить F-Droid</string>
+    <string name="apps">Каталог</string>
     <string name="swap_no_peers_nearby">Не удается найти людей поблизости.</string>
     <string name="swap_confirm">Подтвердить обмен</string>
     <string name="swap_qr_isnt_for_swap">QR-код, который вы отсканировали, не похож на код обмена.</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index dbb94cc0d..899f4a3b3 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -71,6 +71,7 @@
     <string name="swap_wifi_device_name">Emër Pajisjeje</string>
     <string name="swap_cant_find_peers">S’po gjeni atë çka kërkoni\?</string>
     <string name="swap_send_fdroid">Dërgoni F-Droid</string>
+    <string name="apps">Aplikacione</string>
     <string name="perm_costs_money">Kjo mund t’ju kushtojë para</string>
     <string name="download_error">Shkarkimi dështoi!</string>
     <string name="downloading">Po shkarkohet…</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ed7f1085c..6746772ee 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -166,6 +166,7 @@
     <string name="swap_setting_up_wifi">Подешавам бежични…</string>
     <string name="swap_wifi_device_name">Назив уређаја</string>
     <string name="swap_send_fdroid">Пошаљи Ф-дроид</string>
+    <string name="apps">Програми</string>
     <string name="swap_connecting">Повезивање</string>
     <string name="swap_confirm">Потврдите размену</string>
     <string name="loading">Учитава се…</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a16490ac0..a6c97fcc3 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -216,6 +216,7 @@
     <string name="swap_wifi_device_name">Enhetsnamn</string>
     <string name="swap_cant_find_peers">Det går inte att hitta den du söker?</string>
     <string name="swap_send_fdroid">Skicka F-Droid</string>
+    <string name="apps">Appar</string>
     <string name="swap_no_peers_nearby">Kunde inte hitta personer i närheten att utbyta med.</string>
     <string name="swap_connecting">Ansluter</string>
     <string name="swap_confirm">Bekräfta utbyte</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index f3ef31ab3..e7249f6b2 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -354,6 +354,7 @@
     <string name="crash_dialog_text">எதிர்பாராத பிழை ஏற்பட்டது, பயன்பாட்டை நிறுத்துமாறு கட்டாயப்படுத்தியது. சிக்கலைசரிசெய்ய உதவும் விவரங்களை மின்னஞ்சல் செய்ய விரும்புகிறீர்களா\?</string>
     <string name="crash_dialog_title">எஃப்-டிரயோடு செயலிழந்தது</string>
     <string name="swap_send_fdroid">அனுப்புக F-Droid</string>
+    <string name="apps">பயன்பாடுகள்</string>
     <string name="category_Sports_Health">விளையாட்டு மற்றும் சுகாதாரம்</string>
     <string name="category_Multimedia">மல்டிமீடியா</string>
     <string name="unverified">சரிபார்க்கப்படாதது</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c4bacf66c..012f8a64e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -206,6 +206,7 @@
     <string name="swap_wifi_device_name">Aygıt Adı</string>
     <string name="swap_cant_find_peers">Aradığınız kişiyi bulamadınız mı\?</string>
     <string name="swap_send_fdroid">F-Droid\'i gönder</string>
+    <string name="apps">Uygulamalar</string>
     <string name="swap_no_peers_nearby">Yakında takaslanabilecek kişi bulunamadı.</string>
     <string name="swap_connecting">Bağlanıyor</string>
     <string name="swap_confirm">Takası onaylayın</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index dfb247f96..d6ce2cd5b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -129,6 +129,7 @@
     <string name="swap_scan_qr">Сканувати QR-код</string>
     <string name="swap_wifi_device_name">Назва пристрою</string>
     <string name="swap_send_fdroid">Відправити F-Droid</string>
+    <string name="apps">Застосунки</string>
     <string name="swap_connecting">З\'єднання</string>
     <string name="loading">Завантаження…</string>
     <string name="newPerms">Нові</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index a95e86fe0..782309e35 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -199,6 +199,7 @@
     <string name="swap_wifi_device_name">Tên thiết bị</string>
     <string name="swap_cant_find_peers">Bạn không tìm được người cần tìm?</string>
     <string name="swap_send_fdroid">Gửi F-Droid</string>
+    <string name="apps">Ứng dụng</string>
     <string name="swap_no_peers_nearby">Không tìm thấy người lân cận để trao đổi.</string>
     <string name="swap_connecting">Đang kết nối</string>
     <string name="swap_confirm">Xác nhận trao đổi</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d4718a1fe..2ac2d1503 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -202,6 +202,7 @@
     <string name="swap_wifi_device_name">设备名称</string>
     <string name="swap_cant_find_peers">找不到你要找的人？</string>
     <string name="swap_send_fdroid">发送 F-Droid</string>
+    <string name="apps">应用</string>
     <string name="swap_no_peers_nearby">附近无法找到可与其交换应用的人。</string>
     <string name="swap_connecting">正在连接</string>
     <string name="swap_confirm">确认交换</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 62e4dcb79..29ec2d47e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -179,6 +179,7 @@
     <string name="swap_wifi_device_name">裝置名稱</string>
     <string name="swap_cant_find_peers">找不到您想找的人？</string>
     <string name="swap_send_fdroid">傳送 F-Droid</string>
+    <string name="apps">軟體</string>
     <string name="swap_no_peers_nearby">找不到附近的人以進行交換。</string>
     <string name="swap_confirm">確認交換</string>
     <string name="uninstall_confirm">你要解除安裝這個應用程式嗎？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bbf57db48..81c5e09f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -545,6 +545,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="swap_cant_find_peers">Can\'t find who you\'re looking for?</string>
     <!-- This is a button label, it must be the right size, or the layout gets messed up. It should be less than 15 characters. -->
     <string name="swap_send_fdroid">Send F-Droid</string>
+    <string name="apps">Apps</string>
     <string name="swap_no_peers_nearby">Could not find people nearby to swap with.</string>
     <!-- This is a screen title, it should be maximum 25 characters -->
     <string name="swap_connecting">Connecting</string>

From b49ac95befc6726c1597792750e6027b856a4bb8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 26 Aug 2021 13:18:19 +0200
Subject: [PATCH 4/5] shorten "Scan QR Code" string to make room on the screen

---
 app/src/main/res/values-af/strings.xml     | 2 +-
 app/src/main/res/values-ar/strings.xml     | 2 +-
 app/src/main/res/values-ast/strings.xml    | 2 +-
 app/src/main/res/values-be/strings.xml     | 2 +-
 app/src/main/res/values-bg/strings.xml     | 2 +-
 app/src/main/res/values-bn-rBD/strings.xml | 2 +-
 app/src/main/res/values-bn/strings.xml     | 2 +-
 app/src/main/res/values-ca/strings.xml     | 2 +-
 app/src/main/res/values-cs/strings.xml     | 2 +-
 app/src/main/res/values-cy/strings.xml     | 2 +-
 app/src/main/res/values-da/strings.xml     | 2 +-
 app/src/main/res/values-de/strings.xml     | 2 +-
 app/src/main/res/values-el/strings.xml     | 2 +-
 app/src/main/res/values-en-rGB/strings.xml | 2 +-
 app/src/main/res/values-eo/strings.xml     | 2 +-
 app/src/main/res/values-es-rAR/strings.xml | 2 +-
 app/src/main/res/values-es-rMX/strings.xml | 1 +
 app/src/main/res/values-es/strings.xml     | 2 +-
 app/src/main/res/values-et/strings.xml     | 2 +-
 app/src/main/res/values-eu/strings.xml     | 2 +-
 app/src/main/res/values-fa/strings.xml     | 2 +-
 app/src/main/res/values-fi/strings.xml     | 2 +-
 app/src/main/res/values-fr/strings.xml     | 2 +-
 app/src/main/res/values-gl/strings.xml     | 2 +-
 app/src/main/res/values-he/strings.xml     | 2 +-
 app/src/main/res/values-hi/strings.xml     | 2 +-
 app/src/main/res/values-hr/strings.xml     | 2 +-
 app/src/main/res/values-hu/strings.xml     | 2 +-
 app/src/main/res/values-hy/strings.xml     | 1 +
 app/src/main/res/values-id/strings.xml     | 2 +-
 app/src/main/res/values-is/strings.xml     | 2 +-
 app/src/main/res/values-it/strings.xml     | 2 +-
 app/src/main/res/values-ja/strings.xml     | 2 +-
 app/src/main/res/values-kab/strings.xml    | 2 +-
 app/src/main/res/values-kn/strings.xml     | 2 +-
 app/src/main/res/values-ko/strings.xml     | 2 +-
 app/src/main/res/values-lt/strings.xml     | 1 +
 app/src/main/res/values-lv/strings.xml     | 2 +-
 app/src/main/res/values-mk/strings.xml     | 1 +
 app/src/main/res/values-ml/strings.xml     | 2 +-
 app/src/main/res/values-mn/strings.xml     | 2 +-
 app/src/main/res/values-my/strings.xml     | 2 +-
 app/src/main/res/values-nb/strings.xml     | 2 +-
 app/src/main/res/values-ne/strings.xml     | 1 +
 app/src/main/res/values-nl-rBE/strings.xml | 2 +-
 app/src/main/res/values-nl/strings.xml     | 2 +-
 app/src/main/res/values-nn/strings.xml     | 2 +-
 app/src/main/res/values-pa/strings.xml     | 1 +
 app/src/main/res/values-pl/strings.xml     | 2 +-
 app/src/main/res/values-ps/strings.xml     | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 app/src/main/res/values-pt-rPT/strings.xml | 2 +-
 app/src/main/res/values-pt/strings.xml     | 2 +-
 app/src/main/res/values-ro/strings.xml     | 2 +-
 app/src/main/res/values-ru/strings.xml     | 2 +-
 app/src/main/res/values-sc/strings.xml     | 2 +-
 app/src/main/res/values-si/strings.xml     | 1 +
 app/src/main/res/values-sk/strings.xml     | 2 +-
 app/src/main/res/values-sl/strings.xml     | 2 +-
 app/src/main/res/values-sn/strings.xml     | 2 +-
 app/src/main/res/values-sq/strings.xml     | 2 +-
 app/src/main/res/values-sr/strings.xml     | 2 +-
 app/src/main/res/values-sv/strings.xml     | 2 +-
 app/src/main/res/values-ta/strings.xml     | 2 +-
 app/src/main/res/values-te/strings.xml     | 2 +-
 app/src/main/res/values-th/strings.xml     | 2 +-
 app/src/main/res/values-tr/strings.xml     | 2 +-
 app/src/main/res/values-uk/strings.xml     | 2 +-
 app/src/main/res/values-ur/strings.xml     | 1 +
 app/src/main/res/values-vi/strings.xml     | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 app/src/main/res/values-zh-rHK/strings.xml | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 2 +-
 74 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index e36618409..93eebde4b 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -214,7 +214,7 @@
     <string name="swap_confirm_connect">Wil jy programme vanaf %1$s nou kry?</string>
     <string name="swap_dont_show_again">Moenie dit weer wys nie</string>
     <string name="swap_choose_apps">Kies programme</string>
-    <string name="swap_scan_qr">Skandeer QR-kode</string>
+    <string name="swap_scan_qr">QR-kode</string>
     <string name="swap_people_nearby">Mense naby</string>
     <string name="swap_scanning_for_peers">Soek tans vir nabygeleë mense…</string>
     <string name="swap_nearby">Nabygeleë ruil</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index da7fb4b28..dde319e88 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -205,7 +205,7 @@
     <string name="swap_dont_show_again">عدم إظهار ذلك مرة أخرى</string>
     <string name="swap_scan_or_type_url">شخص واحد يحتاج إلى فحص الرمز، أو كتابة عنوان الرابط الآخر في المتصفح.</string>
     <string name="swap_choose_apps">اختر تطبيقات</string>
-    <string name="swap_scan_qr">امسح رمز الكيو آر</string>
+    <string name="swap_scan_qr">رمز QR</string>
     <string name="swap_people_nearby">أشخاص حولي</string>
     <string name="swap_scanning_for_peers">جارٍ البحث عن أشخاص بالقرب مني…</string>
     <string name="swap_nearby">المبادلة في مكان قريب</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index ff1d04c43..917b8e8b4 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -193,7 +193,7 @@
     <string name="swap_join_this_hotspot">Ayuda al to collaciu a xunise al puntu Wi-Fi</string>
     <string name="swap_scan_or_type_url">Una persona precisa escaniar el códigu o teclexar nun restolador la URL de la otra.</string>
     <string name="swap_choose_apps">Escoyeta d\'aplicaciones</string>
-    <string name="swap_scan_qr">Escaniar códigu QR</string>
+    <string name="swap_scan_qr">Códigu QR</string>
     <string name="swap_people_nearby">Xente cercano</string>
     <string name="swap_nearby">Intercambéu pela cercanía</string>
     <string name="swap_intro">Coneuta ya intercambia aplicaciones con xente cercano a ti.</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 3bf0d68d1..88cdb21a1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -213,7 +213,7 @@
     <string name="swap_dont_show_again">Не паказваць зноў</string>
     <string name="swap_scan_or_type_url">Адзін з вас мусіць адсканаваць код ці ўвесці URL іншага ў браўзеры.</string>
     <string name="swap_choose_apps">Абраць праграму</string>
-    <string name="swap_scan_qr">Сканаваць QR-код</string>
+    <string name="swap_scan_qr">QR-код</string>
     <string name="swap_people_nearby">Людзі паблізу</string>
     <string name="swap_scanning_for_peers">Пошук людзей паблізу…</string>
     <string name="swap_nearby">Абмен паблізу</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index d71c0a5d4..50aa8a0ce 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -179,7 +179,7 @@
     <string name="install_confirm_update_no_perms">Желаете ли обновяване на това приложение\? Съществуващите данни няма да бъдат загубени. Не изисква специален достъп.</string>
     <string name="install_confirm_update_system_no_perms">Желаете ли обновяване на това вградено приложение\? Съществуващите данни няма да бъдат загубени. Не изисква специален достъп.</string>
     <string name="swap_send_fdroid">Изпращане F-Droid</string>
-    <string name="swap_scan_qr">Сканиране на QR</string>
+    <string name="swap_scan_qr">QR код</string>
     <string name="swap_scanning_for_peers">Търсене на хора…</string>
     <string name="swap_no_wifi_network">Все още няма мрежа</string>
     <string name="swap_intro">Свързване и обмяна на приложения с хора около вас.</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 8a0f195cc..42ac5907a 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -479,7 +479,7 @@
     <string name="swap_nearby">কাছাকাছি অদলবদল</string>
     <string name="swap_scanning_for_peers">কাছাকাছি মানুষের জন্য অনুসন্ধান হচ্ছে…</string>
     <string name="swap_people_nearby">কাছাকাছি লোকজন</string>
-    <string name="swap_scan_qr">কিউআর কোড খুঁজো</string>
+    <string name="swap_scan_qr">কিউআর কোড</string>
     <string name="swap_choose_apps">অ্যাপ নির্বাচন</string>
     <string name="swap_scan_or_type_url">একজন সংকেতের পাঠোদ্ধার করবে অথবা সংষোগটি নিজের পরিব্রাজক(ব্রাউজারে) লিখবে।</string>
     <string name="swap_dont_show_again">আবার দেখাবে না</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 58c04b41b..8da6153ed 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -290,7 +290,7 @@
     <string name="swap_error_cannot_start_bluetooth">ব্লুটুথ শুরু করা যাচ্ছে না!</string>
     <string name="swap_setting_up_bluetooth">ব্লুটুথ শুরু হচ্ছে…</string>
     <string name="swap_visible_bluetooth">ব্লুটুথ দিয়ে দেখা যায়</string>
-    <string name="swap_scan_qr">কিউআর কোড খুঁজো</string>
+    <string name="swap_scan_qr">কিউআর কোড</string>
     <string name="open_qr_code_scanner">কিউআর স্ক্যানার খুলো</string>
     <string name="swap_setting_up_hotspot">হটস্পট শুরু হচ্ছে…</string>
     <string name="swap_visible_hotspot">হটস্পট দিয়ে দৃশ্যমান</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 8c7a1a786..7c4dc8337 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -212,7 +212,7 @@
     <string name="swap_dont_show_again">No tornis a mostrar això</string>
     <string name="swap_scan_or_type_url">Una persona ha d\'escanejar el codi, o escriure l\'URL de l\'altra al navegador.</string>
     <string name="swap_choose_apps">Trieu les aplicacions</string>
-    <string name="swap_scan_qr">Escaneja codi QR</string>
+    <string name="swap_scan_qr">Codi QR</string>
     <string name="swap_people_nearby">Persones a prop</string>
     <string name="swap_scanning_for_peers">S\'està cercant persones a prop…</string>
     <string name="swap_nearby">Intercanvi per proximitat</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4aa7ace51..b0d8166f7 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -189,7 +189,7 @@
     <string name="swap_active_hotspot">%1$s (tvůj hotspot)</string>
     <string name="swap_dont_show_again">Toto už nezobrazovat</string>
     <string name="swap_choose_apps">Vybrat aplikace</string>
-    <string name="swap_scan_qr">Skenovat QR kód</string>
+    <string name="swap_scan_qr">QR kód</string>
     <string name="swap_people_nearby">Lidé Nablízku</string>
     <string name="swap_scanning_for_peers">Hledání lidí v blízkosti…</string>
     <string name="swap_nearby">Výměna Nablízku</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 7326cc653..df367becc 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -297,7 +297,7 @@
     <string name="swap_confirm_connect">Wyt ti am gael yr apiau o %1$s nawr\?</string>
     <string name="swap_scan_or_type_url">Mae angen i un person sganio\'r cod neu deipio URL y llall mewn porwr.</string>
     <string name="swap_choose_apps">Dewis Apiau</string>
-    <string name="swap_scan_qr">Sganio Cod QR</string>
+    <string name="swap_scan_qr">Cod QR</string>
     <string name="swap_people_nearby">Pobol Gerllaw</string>
     <string name="swap_scanning_for_peers">Yn chwilio am bobol gerllaw…</string>
     <string name="swap_nearby">Cyfnewid Gerllaw</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index fa08af314..0329a4e12 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -191,7 +191,7 @@
     <string name="swap_dont_show_again">Vis ikke dette igen</string>
     <string name="swap_scan_or_type_url">En person skal skanne koden, eller skrive den andens URL i en browser.</string>
     <string name="swap_choose_apps">Vælg apps</string>
-    <string name="swap_scan_qr">Skan QR-kode</string>
+    <string name="swap_scan_qr">QR-kode</string>
     <string name="swap_people_nearby">Folk i nærheden</string>
     <string name="swap_scanning_for_peers">Leder efter folk i nærheden…</string>
     <string name="swap_nearby">Nærhedsudveksling</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a8915befd..4a0974e88 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -202,7 +202,7 @@
     <string name="swap_switch_to_wifi">Antippen, um zu einem WLAN-Netzwerk zu wechseln</string>
     <string name="swap_dont_show_again">Nicht wieder anzeigen</string>
     <string name="swap_choose_apps">Apps auswählen</string>
-    <string name="swap_scan_qr">QR-Code einlesen</string>
+    <string name="swap_scan_qr">QR-Code</string>
     <string name="swap_people_nearby">Leute in Ihrer Nähe</string>
     <string name="swap_scanning_for_peers">Nach Tauschpartnern suchen …</string>
     <string name="wifi_ap">Hotspot</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 80b50dba6..caae18ccf 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -195,7 +195,7 @@
         του άλλου σε ένα πρόγραμμα περιήγησης.
     </string>
     <string name="swap_choose_apps">Επιλέξτε εφαρμογές</string>
-    <string name="swap_scan_qr">Σάρωση κωδικού QR</string>
+    <string name="swap_scan_qr">κωδικού QR</string>
     <string name="swap_people_nearby">Άτομα σε κοντινή απόσταση</string>
     <string name="swap_scanning_for_peers">Αναζητώντας άτομα σε κοντινή απόσταση…</string>
     <string name="swap_nearby">Κοντινή ανταλλαγή</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index a6d4ceb3e..827db3328 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -132,7 +132,7 @@
     <string name="swap_nearby">Nearby Swap</string>
     <string name="swap_scanning_for_peers">Searching for nearby people…</string>
     <string name="swap_people_nearby">People Nearby</string>
-    <string name="swap_scan_qr">Scan QR Code</string>
+    <string name="swap_scan_qr">QR Code</string>
     <string name="swap_choose_apps">Choose Apps</string>
     <string name="swap_scan_or_type_url">One person needs to scan the code, or type the URL of the other in a browser.</string>
     <string name="swap_confirm_connect">Do you want to get apps from %1$s now\?</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 4b8d1e69e..73e91c9fe 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -205,7 +205,7 @@
     <string name="swap_dont_show_again">Ne montri ĉi tion denove</string>
     <string name="swap_scan_or_type_url">Unu persono devas skani la kodon aŭ enigi ligilon de la aliulo en la ret‑foliumilon.</string>
     <string name="swap_choose_apps">Elekti aplikaĵojn</string>
-    <string name="swap_scan_qr">Skani QR-kodon</string>
+    <string name="swap_scan_qr">QR-kodon</string>
     <string name="swap_people_nearby">Homoj proksime</string>
     <string name="swap_scanning_for_peers">Serĉado de proksimuloj…</string>
     <string name="swap_nearby">Proksima interŝanĝo</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 626c1febb..f4a121004 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -358,7 +358,7 @@
     <string name="swap_confirm_connect">¿Querés obtener aplicaciones desde %1$s ahora\?</string>
     <string name="swap_scan_or_type_url">Una persona debe escanear el código, o tipear la URL del otro en un navegador web.</string>
     <string name="swap_choose_apps">Elegir aplicaciones</string>
-    <string name="swap_scan_qr">Escanear código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_people_nearby">Personas cerca</string>
     <string name="swap_scanning_for_peers">Buscando personas cerca…</string>
     <string name="swap_nearby">Intercambio cercano</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 46354f38e..3766cb385 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -220,4 +220,5 @@
     <string name="send_version_and_uuid">Envíar versión y UUID a los servidores</string>
     <string name="keep_install_history_summary">Guardar un registro de todas las instalaciones y desinstalaciones de F-Droid</string>
     <string name="no_such_app">No se ha encontrado dicha aplicación.</string>
+    <string name="swap_scan_qr">Código QR</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2cff3d0cd..8487aa983 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -176,7 +176,7 @@
     <string name="swap_dont_show_again">No volver a mostrar esto</string>
     <string name="swap_scan_or_type_url">Una persona tiene que escanear el código o escribir el URL de la otra en un navegador.</string>
     <string name="swap_choose_apps">Elige las aplicaciones</string>
-    <string name="swap_scan_qr">Escanear código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_people_nearby">Gente cercana</string>
     <string name="swap_scanning_for_peers">Buscando gente cerca…</string>
     <string name="swap_nearby">Intercambio cercano</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 23562e8a9..50f0fcb28 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -213,7 +213,7 @@
     <string name="swap_dont_show_again">Ära seda enam näita</string>
     <string name="swap_scan_or_type_url">Üks inimene peab koodi skannima või sisestama teise URLi brauserisse.</string>
     <string name="swap_choose_apps">Vali rakendused</string>
-    <string name="swap_scan_qr">Skanni QR-kood</string>
+    <string name="swap_scan_qr">QR-kood</string>
     <string name="swap_people_nearby">Inimesed lähedal</string>
     <string name="swap_scanning_for_peers">Otsitakse lähedal asuvaid inimesi…</string>
     <string name="swap_nearby">Läheduses vahetus</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 76256299b..ddfcb3a3b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -206,7 +206,7 @@
         nabigatzailean sartu.
     </string>
     <string name="swap_choose_apps">Hautatu aplikazioak</string>
-    <string name="swap_scan_qr">Eskaneatu QR kodea</string>
+    <string name="swap_scan_qr">QR kodea</string>
     <string name="swap_people_nearby">Inguruko jendea</string>
     <string name="swap_scanning_for_peers">Inguruko jendearen bila…</string>
     <string name="swap_nearby">Ingurukoekin partekatu</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 5cab6f66a..eaaaa699d 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -170,7 +170,7 @@
     <string name="swap_dont_show_again">دیگر این را نشان نده</string>
     <string name="swap_scan_or_type_url">لازم است یک نفر رمز دیگری را پوییده، یا نشانی اینترنتیش را در مرورگری بنویسد.</string>
     <string name="swap_choose_apps">گزینش برنامه‌ها</string>
-    <string name="swap_scan_qr">پویش رمز QR</string>
+    <string name="swap_scan_qr">کد QR</string>
     <string name="swap_people_nearby">افراد نزدیک</string>
     <string name="swap_scanning_for_peers">در حال جست‌وجو برای افراد نزدیک…</string>
     <string name="swap_nearby">تبادل نزدیک</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e13e4aec3..ad305a4bc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -193,7 +193,7 @@
     <string name="category_Writing">Kirjoittaminen</string>
     <string name="swap_active_hotspot">%1$s (tukiasemasi)</string>
     <string name="swap_dont_show_again">Älä näytä tätä uudelleen</string>
-    <string name="swap_scan_qr">Skannaa QR-koodi</string>
+    <string name="swap_scan_qr">QR-koodi</string>
     <string name="loading">Ladataan…</string>
     <string name="keep_year">1 vuosi</string>
     <string name="keep_month">1 kuukausi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fe8943726..0ba093c15 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -203,7 +203,7 @@
     <string name="swap_active_hotspot">%1$s (votre point d\'accès)</string>
     <string name="swap_scan_or_type_url">Une personne doit balayer le code ou saisir l’URL de l’autre dans un navigateur.</string>
     <string name="swap_choose_apps">Sélectionnez des applis</string>
-    <string name="swap_scan_qr">Lire un code QR</string>
+    <string name="swap_scan_qr">Code QR</string>
     <string name="swap_people_nearby">Personnes à proximité</string>
     <string name="swap_scanning_for_peers">Recherche des personnes à proximité…</string>
     <string name="swap_nearby">Échange d\'applications</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 0d284c53a..b3805ccb0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -147,7 +147,7 @@
     <string name="swap_confirm_connect">Desexas obter aplicacións dende %1$s agora\?</string>
     <string name="swap_dont_show_again">Non amosar de novo</string>
     <string name="swap_choose_apps">Escoller as aplicacións</string>
-    <string name="swap_scan_qr">Escanear código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_visible_bluetooth">Visíbel por Bluetooth</string>
     <string name="swap_setting_up_bluetooth">Estase a configurar o Bluetooth…</string>
     <string name="swap_visible_wifi">Visíbel por Wi-Fi</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index b39ac395c..885c2eab4 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -169,7 +169,7 @@
     <string name="category_Time">זמן</string>
     <string name="category_Writing">כתיבה</string>
     <string name="swap_choose_apps">בחירת יישומונים</string>
-    <string name="swap_scan_qr">סריקת קוד QR</string>
+    <string name="swap_scan_qr">קוד QR</string>
     <string name="swap_people_nearby">אנשים בקרבת מקום</string>
     <string name="swap_scanning_for_peers">מתבצא חיפוש אחר אנשים בקרבת מקום…</string>
     <string name="swap_visible_bluetooth">גלוי דרך Bluetooth</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index fb907eace..67a04b2a7 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -99,7 +99,7 @@
     <string name="swap_dont_show_again">इसे फिर से ना दिखाएँ</string>
     <string name="swap_scan_or_type_url">एक व्यक्ति को ये कोड स्कैन करना होगा या यूआरएल को ब्राउज़र मैं टाइप करना होगा|</string>
     <string name="swap_choose_apps">ऐप्स चुने</string>
-    <string name="swap_scan_qr">QR कोड स्कैन करें</string>
+    <string name="swap_scan_qr">QR कोडें</string>
     <string name="swap_people_nearby">आसपास लोग</string>
     <string name="swap_scanning_for_peers">आसपास लोगो को खोज रहे हैं…</string>
     <string name="swap_nearby">आसपास अदला-बदली</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a4099593b..910862cd0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -214,7 +214,7 @@
         preglednik.
     </string>
     <string name="swap_choose_apps">Odaberi aplikacije</string>
-    <string name="swap_scan_qr">Skeniraj QR kod</string>
+    <string name="swap_scan_qr">QR kod</string>
     <string name="swap_people_nearby">Ljudi u blizini</string>
     <string name="swap_scanning_for_peers">Tražim ljude u blizini…</string>
     <string name="swap_nearby">Obližnja razmjena</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 22cd1a66d..ffdd0add5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -210,7 +210,7 @@
     <string name="swap_welcome">Üdvözli az F-Droid!</string>
     <string name="swap_dont_show_again">Ne mutassa ismét</string>
     <string name="swap_choose_apps">Alkalmazások kiválasztása</string>
-    <string name="swap_scan_qr">QR-kód beolvasása</string>
+    <string name="swap_scan_qr">QR-kód</string>
     <string name="swap_people_nearby">Emberek a közelben</string>
     <string name="swap_scanning_for_peers">Közeli emberek keresése…</string>
     <string name="swap_visible_bluetooth">Látható Bluetoothon</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index cda31b8c4..cd7c93c8f 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -275,4 +275,5 @@
     <string name="send_installed_apps">Կիսվել տեղադրված հավելվածներով</string>
     <string name="sort_search">Դասակարգել արդյունքները</string>
     <string name="antifeatures">Անցանկալի ֆունկցիաներ</string>
+    <string name="swap_scan_qr">QR կոդի</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 99b01608d..62baefecd 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -205,7 +205,7 @@
     <string name="swap_dont_show_again">Jangan tampilkan ini lagi</string>
     <string name="swap_scan_or_type_url">Salah satu orang harus memindai kode, atau mengetik URL-nya pada browser.</string>
     <string name="swap_choose_apps">Pilih Aplikasi</string>
-    <string name="swap_scan_qr">Pindai Kode QR</string>
+    <string name="swap_scan_qr">Kode QR</string>
     <string name="swap_people_nearby">Orang Di Sekitar</string>
     <string name="swap_scanning_for_peers">Menelusuri orang di sekitar…</string>
     <string name="swap_nearby">Bertukar Di Sekitar</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index b68ce8313..7bdbcddf4 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -161,7 +161,7 @@
     <string name="swap_confirm_connect">Viltu ná í forrit frá %1$s núna?</string>
     <string name="swap_dont_show_again">Ekki birta þetta aftur</string>
     <string name="swap_choose_apps">Veldu forrit</string>
-    <string name="swap_scan_qr">Skanna QR-kóða</string>
+    <string name="swap_scan_qr">QR-kóða</string>
     <string name="swap_people_nearby">Fólk sem er nálægt</string>
     <string name="swap_scanning_for_peers">Leita að fólki í nágrenninu…</string>
     <string name="swap_nearby">Býtti í nágrenninu</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d094d80c6..d76867955 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -181,7 +181,7 @@
     <string name="swap_dont_show_again">Non mostrare più</string>
     <string name="swap_switch_to_wifi">Tocca per passare ad una rete Wi-Fi</string>
     <string name="swap_choose_apps">Scegli le app</string>
-    <string name="swap_scan_qr">Scansiona QR code</string>
+    <string name="swap_scan_qr">Codice QR</string>
     <string name="swap_intro">Connettiti e scambia app con le persone vicine.</string>
     <string name="swap_no_peers_nearby">Non sono state trovate persone nelle vicinanze con cui scambiare app.</string>
     <string name="interval_1w">Cerca aggiornamenti ogni settimana</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 84697e36c..37121d03f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -164,7 +164,7 @@
     <string name="swap_dont_show_again">今後表示しない</string>
     <string name="swap_scan_or_type_url">どちらかがコードを読み取るか、URLをブラウザに入力する必要があります。</string>
     <string name="swap_choose_apps">アプリを選択</string>
-    <string name="swap_scan_qr">QRコードをスキャン</string>
+    <string name="swap_scan_qr">QRコード</string>
     <string name="swap_people_nearby">近くにいる人</string>
     <string name="swap_scanning_for_peers">近くの人を探しています</string>
     <string name="swap_nearby">近くの人と交換</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 69f33ea81..ffa8f55e2 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -219,7 +219,7 @@
     <string name="share_repository">Bḍu akufi</string>
     <string name="requires_features">Ilaq: %1$s</string>
     <string name="swap_no_wifi_network">Ulac tuqqna</string>
-    <string name="swap_scan_qr">Semḍen tangalt QR</string>
+    <string name="swap_scan_qr">Tangalt QR</string>
     <string name="swap_setting_up_bluetooth">Asbadu n Blutut…</string>
     <string name="app_size">Teγzi: %1$s</string>
     <string name="installed_apps__activity_title">Isnasen yettusbedden</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 53876130f..e820b17e1 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -408,7 +408,7 @@
     <string name="swap_not_visible_bluetooth">ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಗೋಚರಿಸುವುದಿಲ್ಲ</string>
     <string name="swap_intro">ನಿಮ್ಮ ಹತ್ತಿರದ ಜನರೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ವ್ಯಾಪಾರ ಮಾಡಿ.</string>
     <string name="swap_nearby">ಹತ್ತಿರದ ಸ್ವಾಪ್</string>
-    <string name="swap_scan_qr">ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <string name="swap_scan_qr">ಕ್ಯೂಆರ್ ಕೋಡ್</string>
     <string name="swap_scan_or_type_url">ಒಬ್ಬ ವ್ಯಕ್ತಿಯು ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ, ಅಥವಾ ಇನ್ನೊಬ್ಬರ URL ಅನ್ನು ಬ್ರೌಸರ್‌ನಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ.</string>
     <string name="swap_confirm_connect">ನೀವು ಈಗ %1$s ರಿಂದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಪಡೆಯಲು ಬಯಸುವಿರಾ\?</string>
     <string name="swap_join_same_wifi_desc">Wi-Fi ಬಳಸಿ ಸ್ವ್ಯಾಪ್ ಮಾಡಲು, ನೀವು ಒಂದೇ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಒಂದೇ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ನಿಮಗೆ ಪ್ರವೇಶವಿಲ್ಲದಿದ್ದರೆ, ನಿಮ್ಮಲ್ಲಿ ಒಬ್ಬರು ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ರಚಿಸಬಹುದು.</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8ac399d30..37cf2e6dd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -194,7 +194,7 @@
     <string name="swap_dont_show_again">다시 보지 않기</string>
     <string name="swap_scan_or_type_url">한 사람은 코드를 스캔하거나, 상대방의 URL을 브라우저에 입력하세요.</string>
     <string name="swap_choose_apps">앱 선택</string>
-    <string name="swap_scan_qr">QR 코드 스캔</string>
+    <string name="swap_scan_qr">QR 코드</string>
     <string name="swap_people_nearby">근처 사람들</string>
     <string name="swap_scanning_for_peers">근처 사람들을 검색 중…</string>
     <string name="swap_nearby">근처 교환하기</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 43383a196..98ba9b791 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -313,6 +313,7 @@
 \nAtnaujintos visos įdiegtos programos.</string>
     <string name="swap">Keitimasis programomis</string>
     <string name="swap_nfc_title">Spustelkite ir apsikeisit</string>
+    <string name="swap_scan_qr">QR kodo</string>
     <string name="nearby_splash__request_permission">Išbandykite</string>
     <string name="nearby_splash__find_people_button">Rasti įrenginius netoliese</string>
     <string name="nearby_splash__download_apps_from_people_nearby">Neturite interneto ryšio\? Gaukite programų iš įrenginių netoliese!</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index fb903d705..0c0f52f12 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -284,7 +284,7 @@
     <string name="swap_nearby">Dalīšanās Tuvumā</string>
     <string name="swap_scanning_for_peers">Meklē cilvēkus tuvumā…</string>
     <string name="swap_people_nearby">Cilvēki Tuvumā</string>
-    <string name="swap_scan_qr">Skenēt QR Kodu</string>
+    <string name="swap_scan_qr">QR Kodu</string>
     <string name="swap_choose_apps">Izvēlaties Lietotnes</string>
     <string name="swap_scan_or_type_url">Vienai personai vajag skenēt kodu, vai ierakstīt otra URL pārlūkprogrammā.</string>
     <string name="swap_confirm_connect">Vai vēlaties saņemt lietotnes no %1$s tagad\?</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 860cecf49..b632897ab 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -214,4 +214,5 @@
     <string name="over_wifi">Преку Wi-Fi</string>
     <string name="use_bluetooth">Користи Bluetooth</string>
     <string name="adding_apks_format">Додавање на %s во складиштето…</string>
+    <string name="swap_scan_qr">QR-код</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 1f068c5c7..65253a9e9 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -253,7 +253,7 @@
     <string name="swap_switch_to_wifi">ഒരു വൈഫൈ നെറ്റ്വർക്ക് മാറുന്നതിന് തൊടുക</string>
     <string name="open_qr_code_scanner">QR സ്കാനർ തുറക്കുക</string>
     <string name="swap_choose_apps">ആപ്പുകൾ തിരഞ്ഞെടുക്കുക</string>
-    <string name="swap_scan_qr">ക്യുആർ കോഡ് നോക്കു</string>
+    <string name="swap_scan_qr">QR കോഡ്</string>
     <string name="swap_people_nearby">അടുത്തുള്ള ആളുകൾ</string>
     <string name="swap_scanning_for_peers">സമീപത്തുള്ള ആളുകൾക്കായി തിരയുന്നു …</string>
     <string name="swap_visible_bluetooth">ബ്ലൂടൂത്ത് വഴി ദൃശ്യം</string>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index 71660ab1e..563cefdb3 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -149,7 +149,7 @@
     <string name="swap_nearby">Ойролцоох солилцоо</string>
     <string name="swap_scanning_for_peers">Ойролцоох хүмүүсийг хайж байна …</string>
     <string name="swap_people_nearby">Ойролцоох хүмүүс</string>
-    <string name="swap_scan_qr">QRкодыг сканнердах</string>
+    <string name="swap_scan_qr">QRкодыг</string>
     <string name="swap_choose_apps">Апп-г сонгоно уу</string>
     <string name="swap_scan_or_type_url">Нэг хүн кодыг сканнердах эсвэл нөгөөгийнхөө URL-г хөтөч дээр бичих шаардлагатай.</string>
     <string name="swap_confirm_connect">Та одоо %1$s-с програм авахыг хүсч байна уу\?</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index c822b9ff0..0d39951cf 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -162,7 +162,7 @@
     <string name="swap_confirm_connect">%1$s မွ app မ်ားကိုယခုရယူခ်င္ပါသလား?</string>
     <string name="swap_dont_show_again">ဒီဟာကိုေနာက္ထပ္မျပပါႏွင့္ေတာ့</string>
     <string name="swap_choose_apps">App မ်ားေရြးမည္</string>
-    <string name="swap_scan_qr">က်ဴအာကုဒ္ကိုစကန္ဖတ္မည္</string>
+    <string name="swap_scan_qr">QR ကုဒ်</string>
     <string name="swap_people_nearby">အနီးအနားရွိသူမ်ား</string>
     <string name="swap_scanning_for_peers">အနီးအနားရွိသူမ်ားကိုရွာေနသည္…</string>
     <string name="swap_visible_bluetooth">ဘလူးသုဒ္မွ ျမင္ႏိုင္ျခင္း</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 15f7e9f77..c711f8dda 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -172,7 +172,7 @@
         adresseopplysninger en nettleser.
     </string>
     <string name="swap_choose_apps">Velg programmer</string>
-    <string name="swap_scan_qr">Skann QR-kode</string>
+    <string name="swap_scan_qr">QR-kode</string>
     <string name="swap_people_nearby">Folk i nærheten</string>
     <string name="swap_scanning_for_peers">Søker etter folk i nærheten…</string>
     <string name="swap_visible_bluetooth">Synlig via Blåtann</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index c35565c30..e01733bcb 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -48,4 +48,5 @@
     <string name="yes">हो</string>
     <string name="ok">ठीक</string>
     <string name="app_name">एफ-ड्रोइड</string>
+    <string name="swap_scan_qr">QR कोड</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index e4f08c838..2d1e37a1b 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -311,7 +311,7 @@
     <string name="swap_confirm_connect">Wilt u nu apps van %1$s ontvangen\?</string>
     <string name="swap_scan_or_type_url">Eén iemand moet de code scannen, of de URL van de andere in een browser openen.</string>
     <string name="swap_choose_apps">Kies apps</string>
-    <string name="swap_scan_qr">Scan QR-code</string>
+    <string name="swap_scan_qr">QR-code</string>
     <string name="swap_people_nearby">Mensen in de buurt</string>
     <string name="swap_scanning_for_peers">Aan het zoeken naar mensen in de buurt…</string>
     <string name="swap_nearby">Nabije uitwisseling</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7ad5746c4..76f648d21 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -176,7 +176,7 @@
         openen.
     </string>
     <string name="swap_choose_apps">Kies apps</string>
-    <string name="swap_scan_qr">Scan QR-code</string>
+    <string name="swap_scan_qr">QR-code</string>
     <string name="swap_people_nearby">Mensen in de buurt</string>
     <string name="swap_scanning_for_peers">Aan het zoeken naar personen in de buurt…</string>
     <string name="swap_nearby">Uitwisseling nabij</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 6c9c9d557..690306c3d 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -351,7 +351,7 @@
     <string name="swap_confirm_connect">Vil du henta appar frå %1$s no\?</string>
     <string name="swap_scan_or_type_url">Nokon må skanna koden eller skriva inn adressa i ein nettlesar.</string>
     <string name="swap_choose_apps">Vel appar</string>
-    <string name="swap_scan_qr">Skann QR-kode</string>
+    <string name="swap_scan_qr">QR-kode</string>
     <string name="swap_people_nearby">Folk i nærleiken</string>
     <string name="swap_scanning_for_peers">Søkjer etter folk i nærleiken …</string>
     <string name="swap_nearby">\t</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index e300781d4..0716f3592 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -94,4 +94,5 @@
     <string name="menu_source">ਸਰੋਤ ਕੋਡ</string>
     <string name="menu_bitcoin">ਬਿੱਟ-ਕੁਆਇਨ</string>
     <string name="main_menu__swap_nearby">ਨੇੜੇ-ਤੇੜੇ</string>
+    <string name="swap_scan_qr">QR ਕੋਡ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c0fb3a481..f90d281aa 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -182,7 +182,7 @@
         URL drugiego urządzenia.
     </string>
     <string name="swap_choose_apps">Wybierz aplikacje</string>
-    <string name="swap_scan_qr">Skanuj kod QR</string>
+    <string name="swap_scan_qr">Kod QR</string>
     <string name="swap_people_nearby">Ludzie w okolicy</string>
     <string name="swap_scanning_for_peers">Wyszukiwanie ludzi w tej okolicy…</string>
     <string name="swap_nearby">Wymiana w pobliżu</string>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 017c6ffd9..0b09dd36e 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -5,7 +5,7 @@
     <string name="menu_website">ګورتځی</string>
     <string name="swap_send_fdroid">اېف-ډراېډ واستوئ</string>
     <string name="apps">کاریالونه</string>
-    <string name="swap_scan_qr">کيوآر کوډ وځېرئ</string>
+    <string name="swap_scan_qr">د QR کوډ</string>
     <string name="swap_choose_apps">کاریالونه ټاکل</string>
     <string name="swap_wifi_device_name">د وزلې نوم</string>
     <string name="swap_welcome">اېف-ډروېډ ته ښه راغلاست!</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f7b217aae..4a68ba7fa 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -186,7 +186,7 @@
         navegador.
     </string>
     <string name="swap_choose_apps">Escolher os aplicativos</string>
-    <string name="swap_scan_qr">Escanear código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_people_nearby">Pessoas próximas</string>
     <string name="swap_scanning_for_peers">Procurando por pessoas próximas…</string>
     <string name="swap_nearby">Permuta próxima</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 72147a6e3..9ca26011d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -206,7 +206,7 @@
     <string name="theme_dark">Escuro</string>
     <string name="swap_confirm_connect">Deseja obter agora as aplicações de %1$s\?</string>
     <string name="swap_scan_or_type_url">Uma pessoa tem que digitalizar o código ou digitar o URL da outra no navegador de Internet.</string>
-    <string name="swap_scan_qr">Analisar código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_people_nearby">Pessoas próximas</string>
     <string name="swap_scanning_for_peers">A pesquisar pessoas próximas…</string>
     <string name="swap_nearby">Troca por proximidade</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8049a1ee9..3438ff928 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -351,7 +351,7 @@
     <string name="swap_confirm_connect">Deseja obter agora as aplicações de %1$s\?</string>
     <string name="swap_scan_or_type_url">Uma pessoa tem que digitalizar o código ou digitar o URL da outra no navegador de Internet.</string>
     <string name="swap_choose_apps">Escolher aplicações</string>
-    <string name="swap_scan_qr">Analisar código QR</string>
+    <string name="swap_scan_qr">Código QR</string>
     <string name="swap_people_nearby">Pessoas próximas</string>
     <string name="swap_scanning_for_peers">A pesquisar pessoas próximas…</string>
     <string name="swap_nearby">Troca por proximidade</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 181301e8a..fcaf3b482 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -173,7 +173,7 @@
     <string name="swap_welcome">Bine ați venit la F-Droid!</string>
     <string name="open_qr_code_scanner">Deschide scaner QR</string>
     <string name="swap_choose_apps">Selectează aplicații</string>
-    <string name="swap_scan_qr">Scanează cod QR</string>
+    <string name="swap_scan_qr">Cod QR</string>
     <string name="swap_scanning_for_peers">Căutare persoane în apropiere…</string>
     <string name="swap_visible_bluetooth">Vizibil prin Bluetooth</string>
     <string name="swap_visible_wifi">Vizibil prin Wi-Fi</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 106ab61eb..1029f2b9b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -199,7 +199,7 @@
     <string name="empty_search_available_app_list">Нет подходящих приложений.</string>
     <string name="swap_dont_show_again">Больше не показывать</string>
     <string name="swap_choose_apps">Выберите приложения</string>
-    <string name="swap_scan_qr">Сканировать QR-код</string>
+    <string name="swap_scan_qr">QR-код</string>
     <string name="swap_wifi_device_name">Имя устройства</string>
     <string name="swap_connecting">Подключение</string>
     <string name="loading">Загрузка…</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 7aff48497..8b1335568 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -191,7 +191,7 @@
         unu navigadore.
     </string>
     <string name="swap_choose_apps">Issèbera aplicatziones</string>
-    <string name="swap_scan_qr">Iscansi còdighe QR</string>
+    <string name="swap_scan_qr">Còdighe QR</string>
     <string name="swap_people_nearby">Pessones a curtzu</string>
     <string name="swap_scanning_for_peers">Chirchende pro pessones a curtzu…</string>
     <string name="swap_nearby">Cumpartzidura a curtzu</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index cf925b0c9..17da01fa5 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -16,4 +16,5 @@
     <string name="updates__tts__download_app">බාගන්න</string>
     <string name="app_list__name__successfully_installed">%1$s ස්ථාපිතයි</string>
     <string name="app_list__name__downloading_in_progress">%1$s බාගත වෙමින්</string>
+    <string name="swap_scan_qr">QR කේතය</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index b420f9590..50ccecb3f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -184,7 +184,7 @@
     <string name="swap_active_hotspot">%1$s (váš hotspot)</string>
     <string name="swap_dont_show_again">Nabudúce nezobrazovať</string>
     <string name="swap_choose_apps">Vybrať aplikácie</string>
-    <string name="swap_scan_qr">Skenovať QR kód</string>
+    <string name="swap_scan_qr">QR kód</string>
     <string name="swap_visible_bluetooth">Viditeľný cez Bluetooth</string>
     <string name="swap_setting_up_bluetooth">Nastavujem Bluetooth…</string>
     <string name="swap_visible_wifi">Viditeľný cez Wi-fi</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d03898032..5b259847c 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -267,7 +267,7 @@
     <string name="swap_confirm_connect">Želite dobiti aplikacije iz lokacije %1$s zdaj?</string>
     <string name="swap_scan_or_type_url">Ena izmed oseb mora skenirati kodo ali vtipkati URL druge osebe v brskalnik.</string>
     <string name="swap_choose_apps">Izberi aplikacije</string>
-    <string name="swap_scan_qr">Skeniraj QR kodo</string>
+    <string name="swap_scan_qr">QR kodo</string>
     <string name="swap_people_nearby">Ljudje v bližini</string>
     <string name="swap_scanning_for_peers">Iščem ljudi v bližini…</string>
     <string name="swap_nearby">Izmenjava v bližini</string>
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index 74e314381..19f5e4687 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -281,7 +281,7 @@
         mubrowser.
     </string>
     <string name="swap_choose_apps">Sarudza maApps</string>
-    <string name="swap_scan_qr">Nzvera Murau weQR</string>
+    <string name="swap_scan_qr">Murau weQR</string>
     <string name="swap_people_nearby">Vanhu vari pedyo</string>
     <string name="swap_scanning_for_peers">Kutsvaga vanhu vari pedyo…</string>
     <string name="swap_nearby">Kutsinhana kuri pedyo</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 899f4a3b3..69467fdf5 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -449,7 +449,7 @@
         <item quantity="other">%1$d Aplikacione të Instaluar</item>
     </plurals>
     <string name="swap_stopping">Po ndalet…</string>
-    <string name="swap_scan_qr">Skanoni Kod QR</string>
+    <string name="swap_scan_qr">Kod QR</string>
     <string name="swap_success">Sukses shkëmbimi!</string>
     <string name="install_error_notify_title">Gabim në instalimin e %s</string>
     <string name="swap">Shkëmbeni aplikacione</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6746772ee..5011b8139 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -183,7 +183,7 @@
     <string name="interval_2w">Провери надградње сваке 2 седмице</string>
     <string name="theme_light">Светла</string>
     <string name="theme_dark">Тамна</string>
-    <string name="swap_scan_qr">Очитај бар-кôд</string>
+    <string name="swap_scan_qr">QR-код</string>
     <string name="local_repo_name_summary">Објављени назив месне ризнице: %s</string>
     <string name="install_error_unknown">Уградња није успела услед непознате грешке</string>
     <string name="uninstall_error_unknown">Уклањање није успело услед непознате грешке</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a6c97fcc3..e5d0e9b20 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -202,7 +202,7 @@
     <string name="swap_dont_show_again">Visa inte detta igen</string>
     <string name="swap_scan_or_type_url">En person behöver skanna koden eller skriva in adressen för den andra i en webbläsare.</string>
     <string name="swap_choose_apps">Välj appar</string>
-    <string name="swap_scan_qr">Skanna QR-kod</string>
+    <string name="swap_scan_qr">QR-kod</string>
     <string name="swap_people_nearby">Personer i närheten</string>
     <string name="swap_scanning_for_peers">Söker efter personer i närheten…</string>
     <string name="swap_intro">Anslut och byt ut appar med personer nära dig.</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index e7249f6b2..d995efd21 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -474,7 +474,7 @@
     <string name="swap_nearby">அருகிலுள்ள இடமாற்று</string>
     <string name="swap_scanning_for_peers">அருகிலுள்ளவர்களைத் தேடுகிறது…</string>
     <string name="swap_people_nearby">அருகிலிருக்கும் நபர்கள்</string>
-    <string name="swap_scan_qr">ஸ்கேன் QR குறியீடு</string>
+    <string name="swap_scan_qr">QR குறியீடு</string>
     <string name="swap_choose_apps">பயன்பாடுகளைத் தேர்வுசெய்க</string>
     <string name="swap_scan_or_type_url">ஒரு நபர் குறியீட்டை ஸ்கேன் செய்ய வேண்டும், அல்லது மற்றவரின் URL ஐ உலாவியில் தட்டச்சு செய்ய வேண்டும்.</string>
     <string name="swap_confirm_connect">நீங்கள் இப்போது %1$s இருந்து பயன்பாடுகள் பெற விரும்புகிறீர்களா\?</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 16f5fae10..ff09d6f6d 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -222,7 +222,7 @@
     <string name="open_qr_code_scanner">QR స్కానర్ను తెరవండి</string>
     <string name="swap_confirm_connect">మీరు ఇప్పుడు %1$s నుండి అనువర్తనాలను పొందాలనుకుంటున్నారా?</string>
     <string name="swap_choose_apps">అనువర్తనాలను ఎంచుకోండి</string>
-    <string name="swap_scan_qr">QR కోడ్ను స్కాన్ చేయండి</string>
+    <string name="swap_scan_qr">QR కోడ్ను</string>
     <string name="swap_people_nearby">సమీపంలోవున్న ప్రజలు</string>
     <string name="swap_scanning_for_peers">సమీపంలోని వ్యక్తుల కోసం శోధిస్తోంది …</string>
     <string name="swap_visible_bluetooth">బ్లూటూత్ ద్వారా కనిపిస్తుంది</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 9c897252d..d7fbce20c 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -220,7 +220,7 @@
     <string name="swap_switch_to_wifi">เปลี่ยนไปใช้เครือข่าย Wi-Fi</string>
     <string name="open_qr_code_scanner">เปิดตัวอ่าน QR Code</string>
     <string name="swap_choose_apps">เลือกโปรแกรม</string>
-    <string name="swap_scan_qr">สแกน QR Code</string>
+    <string name="swap_scan_qr">คิวอาร์โค้ด</string>
     <string name="swap_people_nearby">ผู้คนข้างเคียง</string>
     <string name="swap_scanning_for_peers">กำลังค้นหาผู้คนข้างเคียง…</string>
     <string name="swap_intro">เชื่อมต่อและแลกเปลี่ยนโปรแกรมกับผู้คนรอบๆ คุณ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 012f8a64e..4037034d4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -192,7 +192,7 @@
     <string name="swap_dont_show_again">Bunu bir daha gösterme</string>
     <string name="swap_scan_or_type_url">Birisinin kodu taraması veya bağlantıyı tarayıcıya girmesi gerekir.</string>
     <string name="swap_choose_apps">Uygulama Seç</string>
-    <string name="swap_scan_qr">Karekod Tara</string>
+    <string name="swap_scan_qr">QR kod</string>
     <string name="swap_people_nearby">Yakındaki Kişiler</string>
     <string name="swap_scanning_for_peers">Yakın kişiler aranıyor…</string>
     <string name="swap_nearby">Yakınımda Takas</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d6ce2cd5b..5334a8016 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -126,7 +126,7 @@
     <string name="open_qr_code_scanner">Відкрити QR-сканер</string>
     <string name="swap_welcome">Вітаємо у F-Droid!</string>
     <string name="swap_choose_apps">Виберіть застосунки</string>
-    <string name="swap_scan_qr">Сканувати QR-код</string>
+    <string name="swap_scan_qr">QR-код</string>
     <string name="swap_wifi_device_name">Назва пристрою</string>
     <string name="swap_send_fdroid">Відправити F-Droid</string>
     <string name="apps">Застосунки</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index b7f8f71ad..79fdf5af1 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -92,4 +92,5 @@
     <string name="skip">چھوڈ دو</string>
     <string name="details_notinstalled">انسٹال نہیں ہے</string>
     <string name="preference_manage_installed_apps">انستال ہوے ایپس کو مینیج کریں</string>
+    <string name="swap_scan_qr">QR کوڈ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 782309e35..12ae2892c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -185,7 +185,7 @@
     <string name="swap_dont_show_again">Không hiện lại</string>
     <string name="swap_scan_or_type_url">Một người phải quét mã, hoặc nhập URL của người kia vào trình duyệt.</string>
     <string name="swap_choose_apps">Chọn ứng dụng</string>
-    <string name="swap_scan_qr">Quét mã QR</string>
+    <string name="swap_scan_qr">Mã QR</string>
     <string name="swap_people_nearby">Những người lân cận</string>
     <string name="swap_scanning_for_peers">Đang tìm kiếm những người lân cận…</string>
     <string name="swap_intro">Kết nối và trao đổi ứng dụng với những người ở gần bạn.</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2ac2d1503..bfe95bf73 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -188,7 +188,7 @@
     <string name="swap_dont_show_again">不再显示</string>
     <string name="swap_scan_or_type_url">别人需要扫描此二维码，或在浏览器输入对方的 URL 。</string>
     <string name="swap_choose_apps">选择应用</string>
-    <string name="swap_scan_qr">扫描二维码</string>
+    <string name="swap_scan_qr">二维码</string>
     <string name="swap_people_nearby">附近的人</string>
     <string name="swap_scanning_for_peers">正在搜索附近的人…</string>
     <string name="swap_nearby">附近交换</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 791fa90f2..cfc50e797 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -165,7 +165,7 @@
     <string name="swap_connecting">連線中</string>
     <string name="swap_send_fdroid">傳送 F-Droid</string>
     <string name="swap_wifi_device_name">裝置名稱</string>
-    <string name="swap_scan_qr">掃描 QR 碼</string>
+    <string name="swap_scan_qr">QR 碼</string>
     <string name="swap_people_nearby">附近的人</string>
     <string name="swap_scanning_for_peers">正在尋找附近的人…</string>
     <string name="swap_choose_apps">選擇程式</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 29ec2d47e..e5d323f66 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -109,7 +109,7 @@
     <string name="open_qr_code_scanner">開啟 QR Code 掃描器</string>
     <string name="swap_welcome">歡迎使用 F-Droid！</string>
     <string name="swap_dont_show_again">不再顯示</string>
-    <string name="swap_scan_qr">掃描 QR Code</string>
+    <string name="swap_scan_qr">二維碼</string>
     <string name="menu_manage">軟體庫</string>
     <string name="menu_add_repo">新增軟體庫</string>
     <string name="local_repo">本地軟體庫</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81c5e09f7..f5a3bc2e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -524,7 +524,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <!-- This is a screen title, it should be maximum 25 characters -->
     <string name="swap_choose_apps">Choose Apps</string>
     <!-- This is a button label, it must be the right size, or the layout gets messed up. It should be less than 15 characters. -->
-    <string name="swap_scan_qr">Scan QR Code</string>
+    <string name="swap_scan_qr">QR Code</string>
     <string name="swap_people_nearby">People Nearby</string>
     <string name="swap_scanning_for_peers">Searching for nearby people…</string>
     <!-- This is a screen title, it should be maximum 25 characters -->

From f7c594b0450b6a761f4f9e0c600bfe035b88f459 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 26 Aug 2021 18:22:50 +0200
Subject: [PATCH 5/5] show warning if VPN is active while trying to use nearby
 swap

refs #1386
---
 .../fdroid/fdroid/nearby/BonjourManager.java  | 34 +++++++++++++++++--
 .../fdroid/nearby/SwapWorkflowActivity.java   |  4 ++-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
index 43dd234e2..056d5baa1 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
@@ -2,7 +2,11 @@ package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
@@ -48,6 +52,7 @@ public class BonjourManager {
     public static final int STATUS_STOPPED = 3;
     public static final int STATUS_VISIBLE = 4;
     public static final int STATUS_NOT_VISIBLE = 5;
+    public static final int STATUS_VPN_CONFLICT = 6;
     public static final int STATUS_ERROR = 0xffff;
 
     public static final String HTTP_SERVICE_TYPE = "_http._tcp.local.";
@@ -56,6 +61,7 @@ public class BonjourManager {
     private static final int STOP = 5709;
     private static final int VISIBLE = 4151873;
     private static final int NOT_VISIBLE = 144151873;
+    private static final int VPN_CONFLICT = 72346752;
 
     private static WeakReference<Context> context;
     private static Handler handler;
@@ -89,7 +95,9 @@ public class BonjourManager {
             Log.e(TAG, "handlerThread is stopped, not changing visibility!");
             return;
         }
-        if (visible) {
+        if (isVpnActive(context)) {
+            handler.sendEmptyMessage(VPN_CONFLICT);
+        } else if (visible) {
             handler.sendEmptyMessage(VISIBLE);
         } else {
             handler.sendEmptyMessage(NOT_VISIBLE);
@@ -160,6 +168,9 @@ public class BonjourManager {
                     case NOT_VISIBLE:
                         handleNotVisible();
                         break;
+                    case VPN_CONFLICT:
+                        handleVpnConflict();
+                        break;
                     case STOP:
                         handleStop();
                         break;
@@ -202,6 +213,10 @@ public class BonjourManager {
                 sendBroadcast(STATUS_NOT_VISIBLE, null);
             }
 
+            private void handleVpnConflict() {
+                sendBroadcast(STATUS_VPN_CONFLICT, null);
+            }
+
             private void handleStop() {
                 if (multicastLock != null) {
                     multicastLock.release();
@@ -284,4 +299,19 @@ public class BonjourManager {
             sendBroadcast(ACTION_FOUND, serviceEvent.getInfo());
         }
     }
-}
+
+    /**
+     * {@link ConnectivityManager#getActiveNetwork()} is only available
+     * starting on {@link Build.VERSION_CODES#M}, so for now, just return false
+     * if the device is too old.
+     */
+    public static boolean isVpnActive(Context context) {
+        if (Build.VERSION.SDK_INT < 23) {
+            return false;
+        }
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        Network activeNetwork = cm.getActiveNetwork();
+        NetworkCapabilities caps = cm.getNetworkCapabilities(activeNetwork);
+        return caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN);
+    }
+}
\ No newline at end of file
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index e476464e7..883278911 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -1039,7 +1039,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                 return;
             }
             int status = intent.getIntExtra(BonjourManager.EXTRA_STATUS, -1);
-            Log.i(TAG, "BonjourManager.EXTRA_STATUS: " + status);
             switch (status) {
                 case BonjourManager.STATUS_STARTING:
                     textWifiVisible.setText(R.string.swap_setting_up_wifi);
@@ -1053,6 +1052,9 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     peopleNearbyText.setVisibility(View.VISIBLE);
                     peopleNearbyProgress.setVisibility(View.VISIBLE);
                     break;
+                case BonjourManager.STATUS_VPN_CONFLICT:
+                    textWifiVisible.setText(R.string.swap_wifi_vpn_conflict);
+                    break;
                 case BonjourManager.STATUS_NOT_VISIBLE:
                     textWifiVisible.setText(R.string.swap_not_visible_wifi);
                     peopleNearbyText.setText(R.string.swap_scanning_for_peers);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5a3bc2e3..c5632eb4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -541,6 +541,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="swap_setting_up_wifi">Setting up Wi-Fi…</string>
     <string name="swap_stopping_wifi">Stopping Wi-Fi…</string>
     <string name="swap_not_visible_wifi">Not visible via Wi-Fi</string>
+    <string name="swap_wifi_vpn_conflict">Conflicts with active VPN!</string>
     <string name="swap_wifi_device_name">Device Name</string>
     <string name="swap_cant_find_peers">Can\'t find who you\'re looking for?</string>
     <!-- This is a button label, it must be the right size, or the layout gets messed up. It should be less than 15 characters. -->