diff --git a/F-Droid/res/drawable-hdpi/ic_attach_money_white.png b/F-Droid/res/drawable-hdpi/ic_attach_money_white.png
deleted file mode 100644
index ac3963e53..000000000
Binary files a/F-Droid/res/drawable-hdpi/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-hdpi/ic_cancel_white.png b/F-Droid/res/drawable-hdpi/ic_cancel_white.png
deleted file mode 100644
index faa409f80..000000000
Binary files a/F-Droid/res/drawable-hdpi/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-mdpi/ic_attach_money_white.png b/F-Droid/res/drawable-mdpi/ic_attach_money_white.png
deleted file mode 100644
index b0f1e5567..000000000
Binary files a/F-Droid/res/drawable-mdpi/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-mdpi/ic_cancel_white.png b/F-Droid/res/drawable-mdpi/ic_cancel_white.png
deleted file mode 100644
index e9e9c7a53..000000000
Binary files a/F-Droid/res/drawable-mdpi/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png
deleted file mode 100644
index 385422f14..000000000
Binary files a/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xhdpi/ic_cancel_white.png
deleted file mode 100644
index b9b6c0b3d..000000000
Binary files a/F-Droid/res/drawable-xhdpi/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png
deleted file mode 100644
index edb895799..000000000
Binary files a/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png
deleted file mode 100644
index 215c3b386..000000000
Binary files a/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png
deleted file mode 100644
index 6bdb19da3..000000000
Binary files a/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png
deleted file mode 100644
index bef7e17fe..000000000
Binary files a/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable/ic_attach_money_white.png b/F-Droid/res/drawable/ic_attach_money_white.png
deleted file mode 100644
index b0f1e5567..000000000
Binary files a/F-Droid/res/drawable/ic_attach_money_white.png and /dev/null differ
diff --git a/F-Droid/res/drawable/ic_cancel_white.png b/F-Droid/res/drawable/ic_cancel_white.png
deleted file mode 100644
index e9e9c7a53..000000000
Binary files a/F-Droid/res/drawable/ic_cancel_white.png and /dev/null differ
diff --git a/F-Droid/res/layout-v11/select_local_apps_list_item.xml b/F-Droid/res/layout-v11/select_local_apps_list_item.xml
index 716e0fa25..a3147fd50 100644
--- a/F-Droid/res/layout-v11/select_local_apps_list_item.xml
+++ b/F-Droid/res/layout-v11/select_local_apps_list_item.xml
@@ -32,6 +32,7 @@
         tools:src="@drawable/ic_launcher"
         tools:ignore="ContentDescription" />
 
+    <!-- Suppress InconsistentLayout because the lower API levels use a checkbox rather than this -->p
     <ImageView
         android:id="@+id/checked"
         android:layout_width="32dip"
@@ -41,6 +42,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        tools:suppress="InconsistentLayout"
         android:src="@drawable/ic_add_circle_outline_white" />
 
     <TwoLineListItem
diff --git a/F-Droid/res/layout-v14/simple_list_item_3.xml b/F-Droid/res/layout-v14/simple_list_item_3.xml
deleted file mode 100644
index c1cb020cf..000000000
--- a/F-Droid/res/layout-v14/simple_list_item_3.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-    This file was modified for F-Droid to include an additional text item beyond
-    simple_list_item_3. Thought we may as well make it as much as possible the
-    same as the original, and so should essentially build on the original one
-    from the Android SDK.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
->
-    
-	<TextView android:id="@android:id/text1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:layout_marginTop="8dip"
-		android:textAppearance="?android:attr/textAppearanceListItem"
-	/>
-		
-	<TextView android:id="@android:id/text2"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-
-	<TextView android:id="@+id/text3"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-
-</LinearLayout>
diff --git a/F-Droid/res/layout-v17/select_local_apps_list_item.xml b/F-Droid/res/layout-v17/select_local_apps_list_item.xml
index b0ebeac96..815f72b40 100644
--- a/F-Droid/res/layout-v17/select_local_apps_list_item.xml
+++ b/F-Droid/res/layout-v17/select_local_apps_list_item.xml
@@ -30,6 +30,7 @@
         tools:src="@drawable/ic_launcher"
         tools:ignore="ContentDescription" />
 
+    <!-- Suppress InconsistentLayout because the lower API levels use a checkbox rather than this -->
     <ImageView
         android:id="@+id/checked"
         android:layout_width="32dip"
@@ -37,6 +38,7 @@
         android:layout_marginEnd="?android:attr/listPreferredItemPaddingStart"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        tools:suppress="InconsistentLayout"
         android:src="@drawable/ic_add_circle_outline_white" />
 
     <TwoLineListItem
diff --git a/F-Droid/res/layout/repodiscoveryitem.xml b/F-Droid/res/layout/repodiscoveryitem.xml
deleted file mode 100644
index b621839d7..000000000
--- a/F-Droid/res/layout/repodiscoveryitem.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-       <TextView
-          android:id="@+id/reposcanitemname"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:maxLines="1"
-          android:paddingLeft="8sp"
-          android:paddingStart="8sp"
-          android:textSize="16sp"
-          android:textStyle="bold" />
-
-       <TextView
-          android:id="@+id/reposcanitemaddress"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_below="@+id/reposcanitemname"
-          android:layout_marginTop="2dp"
-          android:paddingLeft="8sp"
-          android:paddingStart="8sp"
-          android:maxLines="1"
-          android:text="@string/waiting_for_ipaddress"
-          android:textSize="14sp" />
-
-</RelativeLayout>
diff --git a/F-Droid/res/layout/repodiscoverylist.xml b/F-Droid/res/layout/repodiscoverylist.xml
deleted file mode 100644
index 694d07897..000000000
--- a/F-Droid/res/layout/repodiscoverylist.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="24dp"
-    android:paddingStart="24dp"
-    android:paddingRight="24dp"
-    android:paddingEnd="24dp"
-    android:paddingTop="20dp" >
-
-	<LinearLayout
-	    android:id="@+id/reposcanprogresslayout"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_alignParentTop="true"
-	    android:layout_alignParentLeft="true"
-	    android:layout_alignParentStart="true"
-	    android:layout_centerHorizontal="true"
-	    android:paddingTop="8sp" >
-
-	    <ProgressBar
-	        android:id="@+id/reposcaningspinner"
-	        style="?android:attr/progressBarStyle"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="center_horizontal"
-	        android:layout_marginRight="5dp"
-	        android:layout_marginEnd="5dp"
-	        android:indeterminate="true" />
-
-	    <TextView
-	        android:id="@+id/reposcaninglabel"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="center_horizontal"
-	        android:padding="8sp"
-	        android:text="@string/local_repos_scanning"
-	        android:textSize="15sp" />
-
-	</LinearLayout>
-
-	<ListView
-		android:id="@+id/reposcanlist"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_below="@+id/reposcanprogresslayout"
-		android:padding="8sp"
-	/>
-
-</RelativeLayout>
diff --git a/F-Droid/res/layout/simple_list_item_3.xml b/F-Droid/res/layout/simple_list_item_3.xml
deleted file mode 100644
index fdde261f8..000000000
--- a/F-Droid/res/layout/simple_list_item_3.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-    This file was modified for F-Droid to include an additional text item beyond
-    simple_list_item_3. Thought we may as well make it as much as possible the
-    same as the original, and so should essentially build on the original one
-    from the Android SDK.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
->
-    
-	<TextView android:id="@android:id/text1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:layout_marginTop="8dip"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-	/>
-		
-	<TextView android:id="@android:id/text2"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-
-	<TextView android:id="@+id/text3"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-
-</LinearLayout>
diff --git a/F-Droid/res/layout/swap_activity.xml b/F-Droid/res/layout/swap_activity.xml
index 09530ced4..8bda77a4c 100644
--- a/F-Droid/res/layout/swap_activity.xml
+++ b/F-Droid/res/layout/swap_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -12,7 +13,8 @@
         android:titleTextAppearance="@style/SwapTheme.Wizard.Text"
         titleTextAppearance="@style/SwapTheme.Wizard.Text"
         android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary" />
+        android:background="?attr/colorPrimary"
+        tools:ignore="UnusedAttribute" />
 
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/F-Droid/res/layout/swap_app_list_item.xml b/F-Droid/res/layout/swap_app_list_item.xml
index 3abfdd9ef..c0ae3911c 100644
--- a/F-Droid/res/layout/swap_app_list_item.xml
+++ b/F-Droid/res/layout/swap_app_list_item.xml
@@ -14,8 +14,10 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="6dip"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         tools:src="@drawable/ic_launcher" />
 
     <LinearLayout
@@ -23,10 +25,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_centerInParent="true"
         android:orientation="vertical"
         android:gravity="end"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd">
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:layout_marginRight="10dp">
 
         <Button
             android:id="@+id/btn_install"
@@ -35,7 +39,8 @@
             android:backgroundTint="@color/swap_light_blue"
             app:backgroundTint="@color/swap_light_blue"
             android:textColor="@android:color/white"
-            android:text="@string/menu_install"/>
+            android:text="@string/menu_install"
+            tools:ignore="UnusedAttribute" />
 
         <TextView
             android:id="@+id/status_installed"
@@ -64,10 +69,13 @@
     <TextView
         android:id="@+id/name"
         android:layout_toEndOf="@android:id/icon"
+        android:layout_toRightOf="@android:id/icon"
         android:layout_toStartOf="@+id/button_or_text"
+        android:layout_toLeftOf="@+id/button_or_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/F-Droid/res/layout/swap_blank.xml b/F-Droid/res/layout/swap_blank.xml
index 13092597b..771eaa89f 100644
--- a/F-Droid/res/layout/swap_blank.xml
+++ b/F-Droid/res/layout/swap_blank.xml
@@ -48,10 +48,12 @@
                 android:paddingLeft="30dp"
                 android:paddingRight="30dp"
                 android:paddingEnd="30dp"
+                android:gravity="center"
                 android:textAlignment="center"
                 android:text="@string/swap_intro"
                 android:textColor="@color/white"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                tools:ignore="UnusedAttribute" />
 
         </RelativeLayout>
 
@@ -69,12 +71,13 @@
                 android:src="@drawable/ic_bluetooth_white" />
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingLeft="15dp"
                 android:paddingStart="15dp"
-                android:layout_weight="1.00">
+                android:layout_weight="1.00"
+                tools:ignore="RtlSymmetry">
 
                 <TextView
                     android:id="@+id/bluetooth_visible"
@@ -113,12 +116,13 @@
                 android:src="@drawable/ic_network_wifi_white" />
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingLeft="15dp"
                 android:paddingStart="15dp"
-                android:layout_weight="1.00">
+                android:layout_weight="1.00"
+                tools:ignore="RtlSymmetry">
 
                 <TextView
                     android:id="@+id/wifi_visible"
@@ -188,6 +192,9 @@
             android:layout_height="wrap_content"
             android:text="@string/swap_cant_find_peers"
             android:paddingLeft="20dp"
+            android:paddingStart="20dp"
+            android:paddingRight="20dp"
+            android:paddingEnd="20dp"
             android:paddingTop="20dp"
             android:textColor="@color/swap_light_text" />
 
diff --git a/F-Droid/res/layout/swap_confirm_receive.xml b/F-Droid/res/layout/swap_confirm_receive.xml
index fb119ea81..7ff094915 100644
--- a/F-Droid/res/layout/swap_confirm_receive.xml
+++ b/F-Droid/res/layout/swap_confirm_receive.xml
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="25dp"
                 android:layout_marginRight="25dp"
-                />
+                tools:ignore="UnusedAttribute" />
 
         <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Confirm" -->
         <Button
@@ -72,7 +72,7 @@
                 app:backgroundTint="@color/swap_light_blue"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                />
+                tools:ignore="UnusedAttribute" />
 
     </LinearLayout>
 
diff --git a/F-Droid/res/layout/swap_connecting.xml b/F-Droid/res/layout/swap_connecting.xml
index f7cea9d89..3675a358c 100644
--- a/F-Droid/res/layout/swap_connecting.xml
+++ b/F-Droid/res/layout/swap_connecting.xml
@@ -16,7 +16,8 @@
             android:textSize="20sp"
             android:padding="30dp"
             android:textAlignment="center"
-            tools:text="Connecting with Nexus 4" />
+            tools:text="Connecting with Nexus 4"
+            tools:ignore="UnusedAttribute" />
 
         <ProgressBar
             android:layout_width="wrap_content"
@@ -32,7 +33,8 @@
             android:textAlignment="center"
             android:text="@string/swap_connection_misc_error"
             android:visibility="gone"
-            android:padding="30dp" />
+            android:padding="30dp"
+            tools:ignore="UnusedAttribute" />
 
         <Button
             android:layout_width="wrap_content"
@@ -43,6 +45,7 @@
             android:textColor="@android:color/white"
             android:layout_gravity="center_horizontal"
             android:visibility="gone"
-            android:text="@string/back" />
+            android:text="@string/back"
+            tools:ignore="UnusedAttribute" />
 
 </org.fdroid.fdroid.views.swap.SwapConnecting>
\ No newline at end of file
diff --git a/F-Droid/res/layout/swap_success_header.xml b/F-Droid/res/layout/swap_success_header.xml
deleted file mode 100644
index eba6032df..000000000
--- a/F-Droid/res/layout/swap_success_header.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-    <TextView
-            android:id="@+id/text_title"
-            android:text="@string/swap_success"
-            style="@style/SwapTheme.AppList.SwapSuccess"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
-
-    <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/swap_success"
-            android:layout_gravity="center_horizontal" />
-
-    <TextView
-            android:id="@+id/text_description"
-            android:text="@string/swap_tap_for_details_and_install"
-            style="@style/SwapTheme.AppList.SwapSuccessDetails"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/F-Droid/res/menu/swap_scan.xml b/F-Droid/res/menu/swap_scan.xml
deleted file mode 100644
index ae932ccd2..000000000
--- a/F-Droid/res/menu/swap_scan.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_scan"
-        android:title="Scan for devices"
-        android:titleCondensed="Scan"/>
-
-    <item
-        android:id="@+id/action_cancel"
-        android:title="Cancel scan"
-        android:titleCondensed="@string/cancel"
-        android:visible="false"/>
-
-</menu>
\ No newline at end of file
diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index fb8d05f8e..b422ca5ec 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -52,7 +52,6 @@
   <string name="menu_search">Търсене</string>
   <string name="menu_add_repo">Ново хранилище</string>
   <string name="menu_rem_repo">Премахни хранилище</string>
-  <string name="menu_scan_repo">Намиране на локални хранилища</string>
   <string name="menu_share">Сподели</string>
   <string name="menu_install">Инсталирай</string>
   <string name="menu_website">Уебсайт</string>
@@ -72,8 +71,6 @@
   <string name="category_all">Всички</string>
   <string name="category_whatsnew">Какво ново</string>
   <string name="local_repo">Локално хранилище</string>
-  <string name="local_repos_title">Локални FDroid хранилища</string>
-  <string name="local_repos_scanning">Откриване на локални FDroid хранилища…</string>
   <string name="waiting_for_ipaddress">изчакване за IP адрес…</string>
   <string name="updating">Обновяване…</string>
   <string name="deleting_repo">Изтриване на хранилището…</string>
diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index ece623ba0..bb3bb1d37 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -64,7 +64,6 @@ La voleu actualitzar?</string>
   <string name="menu_search">Cerca</string>
   <string name="menu_add_repo">Nou dipòsit</string>
   <string name="menu_rem_repo">Suprimeix el dipòsit</string>
-  <string name="menu_scan_repo">Cerca dipòsits locals</string>
   <string name="menu_launch">Executa</string>
   <string name="menu_share">Comparteix</string>
   <string name="menu_install">Instal·la</string>
diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml
index 2a2f07eca..9d5e33dba 100644
--- a/F-Droid/res/values-cs/strings.xml
+++ b/F-Droid/res/values-cs/strings.xml
@@ -71,7 +71,6 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="menu_search">Hledat</string>
   <string name="menu_add_repo">Nový repozitář</string>
   <string name="menu_rem_repo">Odstranit repozitář</string>
-  <string name="menu_scan_repo">Najít místní repozitáře</string>
   <string name="menu_launch">Spustit</string>
   <string name="menu_share">Sdílet</string>
   <string name="menu_install">Instalovat</string>
@@ -115,7 +114,6 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="failed_to_create_index">Nezdařilo se vytvořit index repozitáře!</string>
   <string name="linking_apks">Linkuji APK do repozitáře…</string>
   <string name="copying_icons">Kopíruji ikony aplikací do repozitáře…</string>
-  <string name="updated_local_repo">Místní repozitář byl aktualizován</string>
   <string name="no_applications_found">Žádné aplikace nenalezeny</string>
   <string name="icon">ikona</string>
   <string name="fingerprint">Fingerprint:</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index 440cddcce..050dbce55 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -90,7 +90,6 @@ Sollen diese aktualisiert werden?</string>
   <string name="menu_search">Suchen</string>
   <string name="menu_add_repo">Paketquelle hinzufügen</string>
   <string name="menu_rem_repo">Paketquelle entfernen</string>
-  <string name="menu_scan_repo">Lokale Paketquellen finden</string>
   <string name="menu_launch">Starten</string>
   <string name="menu_share">Empfehlen</string>
   <string name="menu_install">Installieren</string>
@@ -127,8 +126,6 @@ Sollen diese aktualisiert werden?</string>
   <string name="category_whatsnew">Was gibt es Neues</string>
   <string name="category_recentlyupdated">Kürzlich Aktualisiert</string>
   <string name="local_repo">Lokale Paketquelle</string>
-  <string name="local_repos_title">Lokale F-Droid-Paketquellen</string>
-  <string name="local_repos_scanning">Lokale F-Droid-Paketquellen entdecken …</string>
   <string name="local_repo_running">F-Droid ist bereit zum Tauschen</string>
   <string name="waiting_for_ipaddress">Auf IP-Adresse wird gewartet …</string>
   <string name="setup_repo">Lokale Paketquelle einrichten</string>
@@ -143,7 +140,6 @@ Sollen diese aktualisiert werden?</string>
   <string name="failed_to_create_index">Paketquellenverzeichnis konnte nicht erstellt werden!</string>
   <string name="linking_apks">APKs werden mit der Paketquelle verknüpft …</string>
   <string name="copying_icons">Anwendungssymbole werden in die Paketquelle kopiert …</string>
-  <string name="updated_local_repo">Aktualisierung der lokalen Paketquelle abgeschlossen</string>
   <string name="no_applications_found">Keine Anwendungen gefunden</string>
   <string name="icon">Symbol</string>
   <string name="fingerprint">Fingerabdruck:</string>
diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml
index 9a4323044..b6240bfd5 100644
--- a/F-Droid/res/values-el/strings.xml
+++ b/F-Droid/res/values-el/strings.xml
@@ -82,7 +82,6 @@
   <string name="menu_search">Αναζήτηση</string>
   <string name="menu_add_repo">Νέο Αποθετήριο</string>
   <string name="menu_rem_repo">Αφαίρεση Αποθετηρίου</string>
-  <string name="menu_scan_repo">Εύρεση τοπικών αποθετηρίων</string>
   <string name="menu_launch">Εκτέλεση</string>
   <string name="menu_share">Διαμοιρασμός</string>
   <string name="menu_install">Εγκατάσταση</string>
@@ -118,8 +117,6 @@
   <string name="category_all">Όλα</string>
   <string name="category_whatsnew">Τι νέο υπάρχει</string>
   <string name="category_recentlyupdated">Πρόσφατα Ενημερωμένες</string>
-  <string name="local_repos_title">Τοπικά αποθετήρια FDroid</string>
-  <string name="local_repos_scanning">Αναζήτηση για τοπικά αποθετήρια FDroid…</string>
   <string name="status_download">Λήψη
 %2$s / %3$s (%4$d%%) από
 %1$s</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 57e18ea72..cf6bd3b80 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -89,7 +89,6 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
   <string name="menu_search">Buscar</string>
   <string name="menu_add_repo">Repositorio nuevo</string>
   <string name="menu_rem_repo">Borrar Repositorio</string>
-  <string name="menu_scan_repo">Buscar repos locales</string>
   <string name="menu_launch">Ejecutar</string>
   <string name="menu_share">Compartir</string>
   <string name="menu_install">Instalar</string>
@@ -126,8 +125,6 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
   <string name="category_whatsnew">Novedades</string>
   <string name="category_recentlyupdated">Recientemente actualizados</string>
   <string name="local_repo">Repo Local</string>
-  <string name="local_repos_title">Repos de FDroid locales</string>
-  <string name="local_repos_scanning">Descubriendo repos locales de FDroid…</string>
   <string name="local_repo_running">F-Droid está preparado para intercambiar</string>
   <string name="waiting_for_ipaddress">Esperando la dirección IP…</string>
   <string name="setup_repo">Configurar Repositorio Local</string>
@@ -142,7 +139,6 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
   <string name="failed_to_create_index">Fallo al crear el indice de repositorios</string>
   <string name="linking_apks">Enlazando APKs en el repositorio…</string>
   <string name="copying_icons">Copiando iconos de aplicaciones en el repositorio…</string>
-  <string name="updated_local_repo">Finalizada la actualización del repositorio local</string>
   <string name="no_applications_found">No se ha encontrado la aplicasión</string>
   <string name="icon">icono</string>
   <string name="fingerprint">Huella digital:</string>
diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml
index 1e5182296..ca8f26487 100644
--- a/F-Droid/res/values-eu/strings.xml
+++ b/F-Droid/res/values-eu/strings.xml
@@ -62,7 +62,6 @@ Eguneratu nahi dituzu?</string>
   <string name="menu_search">Bilatu</string>
   <string name="menu_add_repo">Biltegi berria</string>
   <string name="menu_rem_repo">Ezabatu biltegia</string>
-  <string name="menu_scan_repo">Bilatu biltegi lokalak</string>
   <string name="menu_launch">Exekutatu</string>
   <string name="menu_share">Partekatu</string>
   <string name="menu_install">Instalatu</string>
@@ -89,7 +88,6 @@ Eguneratu nahi dituzu?</string>
   <string name="category_all">Guztia</string>
   <string name="category_whatsnew">Zer da berria</string>
   <string name="category_recentlyupdated">Azkenaldian eguneratua</string>
-  <string name="local_repos_title">FDroid biltegi lokalak</string>
   <string name="status_connecting_to_repo">%1$s(e)ra
 konektatzen</string>
   <string name="status_checking_compatibility">Aplikazioak zure gailuarekin bateragarriak diren egiaztatzen…</string>
diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml
index 177cbaa8a..9b85ba728 100644
--- a/F-Droid/res/values-fi/strings.xml
+++ b/F-Droid/res/values-fi/strings.xml
@@ -114,7 +114,6 @@ Tahdotko päivittää ne?</string>
   <string name="failed_to_create_index">Säilöhakemiston luonti epäonnistui!</string>
   <string name="linking_apks">Linkitetään AKP-tiedostoja säilöön…</string>
   <string name="copying_icons">Kopioidaan sovelluskuvakkeita säilöön…</string>
-  <string name="updated_local_repo">Paikallisen säilön päivitys valmis</string>
   <string name="no_applications_found">Sovelluksia ei löytynyt</string>
   <string name="icon">kuvake</string>
   <string name="fingerprint">Sormenjälki:</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 08533f61c..8f453ec0c 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -86,7 +86,6 @@ Voulez-vous les mettre à jour?</string>
   <string name="menu_search">Rechercher</string>
   <string name="menu_add_repo">Nouveau dépôt</string>
   <string name="menu_rem_repo">Supprimer un dépôt</string>
-  <string name="menu_scan_repo">Trouver des dépôts locaux</string>
   <string name="menu_launch">Lancer</string>
   <string name="menu_share">Partager</string>
   <string name="menu_install">Installer</string>
@@ -123,8 +122,6 @@ Voulez-vous les mettre à jour?</string>
   <string name="category_whatsnew">Quoi de neuf ?</string>
   <string name="category_recentlyupdated">Mis à jour récemment</string>
   <string name="local_repo">Dépôt local</string>
-  <string name="local_repos_title">Dépôts FDroid locaux</string>
-  <string name="local_repos_scanning">Découverte des dépôts FDroid locaux…</string>
   <string name="local_repo_running">F-Droid est prêt à être échangé</string>
   <string name="waiting_for_ipaddress">Attente de l\'adresse IP…</string>
   <string name="setup_repo">Configurer le dépôt local</string>
@@ -139,7 +136,6 @@ Voulez-vous les mettre à jour?</string>
   <string name="failed_to_create_index">Échec à la création d\'un index de dépôt!</string>
   <string name="linking_apks">Création de liens pour les APKs dans le dépôt…</string>
   <string name="copying_icons">Copie des icônes des apps dans le dépôt…</string>
-  <string name="updated_local_repo">Fin de la mise à jour du dépôt local</string>
   <string name="no_applications_found">Aucune application trouvée</string>
   <string name="icon">icône</string>
   <string name="fingerprint">Empreinte:</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index 30639d2c5..d6d448785 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -89,7 +89,6 @@ Vuoi aggiornarlo?</string>
   <string name="menu_search">Cerca</string>
   <string name="menu_add_repo">Nuovo Repository</string>
   <string name="menu_rem_repo">Rimuovi Repository</string>
-  <string name="menu_scan_repo">Trova dei Repository locali</string>
   <string name="menu_launch">Avvia</string>
   <string name="menu_share">Condividi</string>
   <string name="menu_install">Installa</string>
@@ -126,8 +125,6 @@ Vuoi aggiornarlo?</string>
   <string name="category_whatsnew">Novità</string>
   <string name="category_recentlyupdated">Aggiornate di Recente</string>
   <string name="local_repo">Repo Locale</string>
-  <string name="local_repos_title">Repo FDroid Locali</string>
-  <string name="local_repos_scanning">Rilevazione repo FDroid locali…</string>
   <string name="local_repo_running">F-Droid è pronto per inviare con swap</string>
   <string name="waiting_for_ipaddress">attendo un indirizzo IP…</string>
   <string name="setup_repo">Prepara una Repo locale</string>
@@ -142,7 +139,6 @@ Vuoi aggiornarlo?</string>
   <string name="failed_to_create_index">Creazione dell\'indice della repo fallita!</string>
   <string name="linking_apks">Collego gli APK nella repo…</string>
   <string name="copying_icons">Copio le icone delle app nella repo…</string>
-  <string name="updated_local_repo">Aggiornamento della repo locale completato</string>
   <string name="no_applications_found">Nessuna applicazione trovata</string>
   <string name="icon">icona</string>
   <string name="fingerprint">Impronta:</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 31bed2bca..7bf22fff5 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -91,7 +91,6 @@ GNU GPLv3 ﾗｲｾﾝｽに基づいてﾘﾘｰｽされました.</string>
   <string name="menu_search">検索</string>
   <string name="menu_add_repo">新しいﾘﾎﾟｼﾞﾄﾘ</string>
   <string name="menu_rem_repo">ﾘﾎﾟｼﾞﾄﾘを削除</string>
-  <string name="menu_scan_repo">ﾛｰｶﾙ･ﾘﾎﾟｼﾞﾄﾘを検索</string>
   <string name="menu_launch">実行</string>
   <string name="menu_share">共有</string>
   <string name="menu_install">ｲﾝｽﾄｰﾙ</string>
@@ -128,8 +127,6 @@ GNU GPLv3 ﾗｲｾﾝｽに基づいてﾘﾘｰｽされました.</string>
   <string name="category_whatsnew">新着</string>
   <string name="category_recentlyupdated">最近の更新</string>
   <string name="local_repo">ﾛｰｶﾙﾘﾎﾟｼﾞﾄﾘ</string>
-  <string name="local_repos_title">ﾛｰｶﾙFDroidﾘﾎﾟｼﾞﾄﾘ</string>
-  <string name="local_repos_scanning">ﾛｰｶﾙFDroidﾘﾎﾟｼﾞﾄﾘの検索中…</string>
   <string name="local_repo_running">F-Droidは切り替え準備ができました</string>
   <string name="waiting_for_ipaddress">IPｱﾄﾞﾚｽを待機中…</string>
   <string name="setup_repo">ﾛｰｶﾙﾘﾎﾟｼﾞﾄﾘを設定</string>
@@ -144,7 +141,6 @@ GNU GPLv3 ﾗｲｾﾝｽに基づいてﾘﾘｰｽされました.</string>
   <string name="failed_to_create_index">ﾘﾎﾟｼﾞﾄﾘの索引の作成に失敗しました</string>
   <string name="linking_apks">ﾘﾎﾟｼﾞﾄﾘにAPKをﾘﾝｸ中…</string>
   <string name="copying_icons">ﾘﾎﾟｼﾞﾄﾘにｱﾌﾟﾘｹｰｼｮﾝのｱｲｺﾝを複製中…</string>
-  <string name="updated_local_repo">ﾛｰｶﾙﾘﾎﾟｼﾞﾄﾘの更新が完了しました</string>
   <string name="no_applications_found">ｱﾌﾟﾘｹｰｼｮﾝが見つかりません｡</string>
   <string name="icon">ｱｲｺﾝ</string>
   <string name="fingerprint">ﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄ:</string>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index 221d80989..fcc60fa73 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -86,7 +86,6 @@ Lisensiert GNU GPLv3.</string>
   <string name="menu_search">Søk</string>
   <string name="menu_add_repo">Nytt register</string>
   <string name="menu_rem_repo">Fjern register</string>
-  <string name="menu_scan_repo">Finn lokale register</string>
   <string name="menu_launch">Kjør</string>
   <string name="menu_share">Del</string>
   <string name="menu_install">Installer</string>
@@ -123,8 +122,6 @@ Lisensiert GNU GPLv3.</string>
   <string name="category_whatsnew">Det som er nytt</string>
   <string name="category_recentlyupdated">Nylig oppdatert</string>
   <string name="local_repo">Lokal pakkebrønn</string>
-  <string name="local_repos_title">Lokale F-Droid register</string>
-  <string name="local_repos_scanning">Oppdager lokale FDroid register…</string>
   <string name="local_repo_running">Sirkulering av programmer kan begynne</string>
   <string name="waiting_for_ipaddress">venter på IP-adresse:</string>
   <string name="setup_repo">Sett opp lokal pakkebrønn</string>
@@ -139,7 +136,6 @@ Lisensiert GNU GPLv3.</string>
   <string name="failed_to_create_index">Klarte ikke å indeksere pakkebrønn!</string>
   <string name="linking_apks">Lenker APK-er inn i pakkebrønn…</string>
   <string name="copying_icons">Kopierer program-ikoner til pakkebrønnen…</string>
-  <string name="updated_local_repo">Ferdig med oppdatering av lokal pakkebrønn</string>
   <string name="no_applications_found">Ingen applikasjoner funnet</string>
   <string name="icon">ikon</string>
   <string name="fingerprint">Fingeravtrykk:</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 3d7868cd6..b998520ac 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -84,7 +84,6 @@ Wilt u ze vernieuwen?</string>
   <string name="menu_search">Zoeken</string>
   <string name="menu_add_repo">Nieuwe bron</string>
   <string name="menu_rem_repo">Verwijder bron</string>
-  <string name="menu_scan_repo">Vind lokale oplagplaatsen</string>
   <string name="menu_launch">Start</string>
   <string name="menu_share">Delen</string>
   <string name="menu_install">Installeren</string>
@@ -120,7 +119,6 @@ Wilt u ze vernieuwen?</string>
   <string name="category_all">Alles</string>
   <string name="category_whatsnew">Wat is nieuw</string>
   <string name="category_recentlyupdated">Recentelijk vernieuwd</string>
-  <string name="local_repos_title">Lokale FDroid opslagplaatsen</string>
   <string name="status_download">Downloaden
 %2$s / %3$s (%4$d%%) van
 %1$s</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index 2865801d8..3fab2a3c6 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -104,7 +104,6 @@ Czy chcesz je zaktualizować?</string>
   <string name="failed_to_create_index">Błąd przy tworzeniu indeksu repozytorium!</string>
   <string name="linking_apks">Linkowanie APK do repozytorium…</string>
   <string name="copying_icons">Kopiowanie ikon aplikacji do repozytorium…</string>
-  <string name="updated_local_repo">Zakończono aktualizację repozytorium lokalnego</string>
   <string name="no_applications_found">Nie znaleziono aplikacji</string>
   <string name="icon">ikona</string>
   <string name="fingerprint">Odcisk palca:</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index bcdcaac2d..3031b6c31 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -110,7 +110,6 @@ Você deseja atualizá-los?</string>
   <string name="failed_to_create_index">Falha ao criar o índice do repositório!</string>
   <string name="linking_apks">Vinculando APKs no repositório…</string>
   <string name="copying_icons">Copiando ícones de aplicativos no repositório…</string>
-  <string name="updated_local_repo">Atualização do repositório local concluída</string>
   <string name="no_applications_found">Nenhuma aplicação encontrada</string>
   <string name="icon">ícone</string>
   <string name="fingerprint">Fingerprint:</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index 45c77c90c..67c20b140 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -91,7 +91,6 @@
   <string name="menu_search">Поиск</string>
   <string name="menu_add_repo">Новый репозиторий</string>
   <string name="menu_rem_repo">Удалить репозиторий</string>
-  <string name="menu_scan_repo">Найти локальные репозитории</string>
   <string name="menu_launch">Запустить</string>
   <string name="menu_share">Поделиться</string>
   <string name="menu_install">Установить</string>
@@ -128,8 +127,6 @@
   <string name="category_whatsnew">Что Нового</string>
   <string name="category_recentlyupdated">Недавно обновлённые</string>
   <string name="local_repo">Локальный репозиторий</string>
-  <string name="local_repos_title">Локальные репозитории FDroid</string>
-  <string name="local_repos_scanning">Обнаружение локальных репозиториев FDroid…</string>
   <string name="local_repo_running">F-Droid готов для обмена</string>
   <string name="waiting_for_ipaddress">ожидание IP-адреса…</string>
   <string name="setup_repo">Настройка локального репозитория</string>
@@ -143,7 +140,6 @@
   <string name="failed_to_create_index">Произошла ошибка во время формирования индекса репозитория!</string>
   <string name="linking_apks">Включение APK-файлов в репозиторий…</string>
   <string name="copying_icons">Копирование иконок приложений в репозиторий…</string>
-  <string name="updated_local_repo">Обновление репозитория завершено</string>
   <string name="no_applications_found">Приложения не найдены</string>
   <string name="icon">иконка</string>
   <string name="fingerprint">Отпечаток:</string>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index db0400963..bc4d359c2 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -58,7 +58,6 @@
   <string name="failed_to_create_index">Sa creatzione de s\'inditze de sos depòsitos est faddida!</string>
   <string name="linking_apks">Cullegande sos APK in su depòsitu…</string>
   <string name="copying_icons">Copiande sas iconas de sos aplicos in su depòsitu…</string>
-  <string name="updated_local_repo">Agiornamentu depòsitu locale finidu</string>
   <string name="no_applications_found">Perunu aplicu agatadu</string>
   <string name="icon">icona</string>
   <string name="fingerprint">Arrastu/imprenta:</string>
diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml
index e5a68d7fe..e90cf6ed5 100644
--- a/F-Droid/res/values-sk/strings.xml
+++ b/F-Droid/res/values-sk/strings.xml
@@ -25,7 +25,6 @@
   <string name="failed_to_create_index">Nepodarilo sa vytvoriť index repa!</string>
   <string name="linking_apks">Odkazujeme súbory APK do repa…</string>
   <string name="copying_icons">Kopírujeme ikony do repa…</string>
-  <string name="updated_local_repo">Aktualizácie miestneho repa dokončené</string>
   <string name="no_applications_found">Aplikácie sa nenašli</string>
   <string name="icon">ikona</string>
   <string name="fingerprint">Odtlačok:</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index a7c4e99ef..00dcff6d4 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -90,7 +90,6 @@
   <string name="menu_search">Тражи</string>
   <string name="menu_add_repo">Нова ризница</string>
   <string name="menu_rem_repo">Уклони ризницу</string>
-  <string name="menu_scan_repo">Нађи локалне ризнице</string>
   <string name="menu_launch">Покрени</string>
   <string name="menu_share">Дели</string>
   <string name="menu_install">Инсталирај</string>
@@ -127,8 +126,6 @@
   <string name="category_whatsnew">Ново</string>
   <string name="category_recentlyupdated">Недавно надограђено</string>
   <string name="local_repo">Локална ризница</string>
-  <string name="local_repos_title">Локалне ризнице</string>
-  <string name="local_repos_scanning">Откривам локалне ризнице…</string>
   <string name="local_repo_running">Ф-дроид је спреман за размену</string>
   <string name="waiting_for_ipaddress">чекам ИП адресу…</string>
   <string name="setup_repo">Постави локалну ризницу</string>
@@ -143,7 +140,6 @@
   <string name="failed_to_create_index">Неуспех стварања индекса ризнице!</string>
   <string name="linking_apks">Повезујем АПК фајлове у ризницу…</string>
   <string name="copying_icons">Копирам иконе апликација у ризницу…</string>
-  <string name="updated_local_repo">Завршено ажурирање локалне ризнице</string>
   <string name="no_applications_found">Нема апликација</string>
   <string name="icon">икона</string>
   <string name="fingerprint">Отисак:</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index c54c98905..7ad60930a 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -89,7 +89,6 @@ Vill du uppdatera dem?</string>
   <string name="menu_search">Sök</string>
   <string name="menu_add_repo">Nytt förråd</string>
   <string name="menu_rem_repo">Ta bort förråd</string>
-  <string name="menu_scan_repo">Hitta lokala förråd</string>
   <string name="menu_launch">Kör</string>
   <string name="menu_share">Dela</string>
   <string name="menu_install">Installera</string>
@@ -126,8 +125,6 @@ Vill du uppdatera dem?</string>
   <string name="category_whatsnew">Nyheter</string>
   <string name="category_recentlyupdated">Nyss uppdaterade</string>
   <string name="local_repo">Lokalt förråd</string>
-  <string name="local_repos_title">Lokala FDroid-förråd</string>
-  <string name="local_repos_scanning">Upptäcker lokala FDroid-förråd…</string>
   <string name="local_repo_running">F-Droid är redo att byta</string>
   <string name="waiting_for_ipaddress">väntar på IP-adress…</string>
   <string name="setup_repo">Initiera lokalt förråd</string>
@@ -142,7 +139,6 @@ Vill du uppdatera dem?</string>
   <string name="failed_to_create_index">Kunde inte skapa förrådsindex!</string>
   <string name="linking_apks">Länkar APK:er till förrådet…</string>
   <string name="copying_icons">Kopierar appikoner till förrådet…</string>
-  <string name="updated_local_repo">Lokalt förråd uppdaterades</string>
   <string name="no_applications_found">Inga program hittades</string>
   <string name="icon">ikon</string>
   <string name="fingerprint">Fingeravtryck:</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index 42ba57953..cbaf31131 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -86,7 +86,6 @@ Güncellemek ister misiniz?</string>
   <string name="menu_search">Arama</string>
   <string name="menu_add_repo">Yeni Depo</string>
   <string name="menu_rem_repo">Depoyu kaldır</string>
-  <string name="menu_scan_repo">Yerel depoları bul</string>
   <string name="menu_launch">Çalıştır</string>
   <string name="menu_share">Paylaş</string>
   <string name="menu_install">Kur</string>
@@ -123,8 +122,6 @@ Güncellemek ister misiniz?</string>
   <string name="category_whatsnew">Yeni olanlar</string>
   <string name="category_recentlyupdated">Yakın geçmişte güncellenen</string>
   <string name="local_repo">Yerel Depo</string>
-  <string name="local_repos_title">Yerel FDroid depoları</string>
-  <string name="local_repos_scanning">Yerel FDroid depoları keşfediliyor…</string>
   <string name="local_repo_running">F-Droid değiş-tokuşa hazır</string>
   <string name="waiting_for_ipaddress">IP adres bekleniyor…</string>
   <string name="touch_to_turn_off_local_repo">Yerel deponu kapatmak için dokunun.</string>
@@ -133,7 +130,6 @@ Güncellemek ister misiniz?</string>
   <string name="deleting_repo">Mevcut depo siliniyor…</string>
   <string name="adding_apks_format">%s depoya ekleniyor…</string>
   <string name="linking_apks">APK\'ler depo içine bağlanıyor</string>
-  <string name="updated_local_repo">Yerel depo güncellemesi bitti</string>
   <string name="no_applications_found">Uygulama bulunamadı</string>
   <string name="wifi_network">WiFi Ağı:</string>
   <string name="enable_wifi">WiFi Etkinleştir</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index 018c3fc78..c65f5dac5 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -85,7 +85,6 @@ https://f-droid.org/repo</string>
   <string name="menu_search">搜索</string>
   <string name="menu_add_repo">添加新软件源</string>
   <string name="menu_rem_repo">移除软件源</string>
-  <string name="menu_scan_repo">查找本地软件仓库</string>
   <string name="menu_launch">运行</string>
   <string name="menu_share">分享</string>
   <string name="menu_install">安装</string>
@@ -121,8 +120,6 @@ https://f-droid.org/repo</string>
   <string name="category_whatsnew">新鲜货</string>
   <string name="category_recentlyupdated">最近更新</string>
   <string name="local_repo">本地软件源</string>
-  <string name="local_repos_title">本地FDoid软件仓库</string>
-  <string name="local_repos_scanning">发现本地FDroid软件仓库…</string>
   <string name="updating">更新中…</string>
   <string name="update_repo">更新软件源</string>
   <string name="deleting_repo">正在删除当前软件源…</string>
diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml
index eafcd2024..8476f096f 100644
--- a/F-Droid/res/values-zh-rHK/strings.xml
+++ b/F-Droid/res/values-zh-rHK/strings.xml
@@ -80,7 +80,6 @@
   <string name="category_all">所有</string>
   <string name="category_whatsnew">最新</string>
   <string name="category_recentlyupdated">最近更新</string>
-  <string name="local_repos_title">本地的F-Droid Repo</string>
   <string name="status_connecting_to_repo">正在連接至%1$s</string>
   <string name="status_checking_compatibility">正在檢查應用程式與裝置的相容性…</string>
   <string name="status_inserting">儲存應用程式詳情中（%1$d%%）</string>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 545e9cb01..b3fee4969 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -160,8 +160,6 @@
 	<string name="category_recentlyupdated">Recently Updated</string>
 
 	<string name="local_repo">Local Repo</string>
-	<string name="local_repos_title">Local F-Droid Repos</string>
-	<string name="local_repos_scanning">Discovering local F-Droid repos&#8230;</string>
 	<string name="local_repo_running">F-Droid is ready to swap</string>
 	<string name="waiting_for_ipaddress">waiting for IP address…</string>
 	<string name="setup_repo">Setup Local Repo</string>
@@ -176,7 +174,6 @@
 	<string name="failed_to_create_index">Failed to create the repo index!</string>
 	<string name="linking_apks">Linking APKs into the repo&#8230;</string>
 	<string name="copying_icons">Copying app icons into the repo&#8230;</string>
-	<string name="updated_local_repo">Finished updating local repo</string>
 	<string name="no_applications_found">No applications found</string>
 	<string name="icon">icon</string>
 	<string name="fingerprint">Fingerprint:</string>
@@ -322,7 +319,6 @@
     <string name="swap_wifi_help">Learn more about Wifi</string>
     <string name="menu_swap">Swap apps</string>
     <string name="swap">Swap apps</string>
-    <string name="swap_repo_name">Swap</string>
     <string name="swap_success">Swap success!</string>
     <string name="swap_no_wifi_network">No network yet</string>
     <string name="swap_active_hotspot">Your hotspot is active</string>
@@ -335,40 +331,29 @@
     <string name="swap_reciprocate_failed">An error occurred while attempting to swap with another device. We will still try to get apps from them, but they may not be able to get apps from us.</string>
     <string name="swap_tap_to_select_apps">Tap to select the apps you want to swap.</string>
     <string name="swap_dont_show_again">Don\'t show this again</string>
-    <string name="swap_tap_for_details_and_install">Tap an app for details and to install.</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_choose_apps">Choose Apps</string>
-	<string name="swap_scan_qr">Scan QR Code</string>
-	<string name="swap_people_nearby">People Nearby</string>
-	<string name="swap_scanning_for_peers">Searching for nearby people…</string>
-	<string name="swap_nearby">Nearby Swap</string>
-	<string name="swap_intro">Connect and trade apps with people near you.</string>
-	<string name="swap_visible_bluetooth">Visible via Bluetooth</string>
-	<string name="swap_setting_up_bluetooth">Setting up Bluetooth…</string>
-	<string name="swap_not_visible_bluetooth">Not visible via Bluetooth</string>
-	<string name="swap_visible_wifi">Visible via WiFi</string>
-	<string name="swap_setting_up_wifi">Setting up WiFi…</string>
-	<string name="swap_not_visible_wifi">Not visible via WiFi</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>
-	<string name="swap_send_fdroid">SEND F-DROID</string>
-	<string name="swap_scan_qr_code">SCAN QR CODE</string>
-	<string name="swap_no_peers_nearby">Could not find people nearby to swap with.</string>
-	<string name="swap_connecting">Connecting</string>
-	<string name="swap_confirm">Confirm swap</string>
+    <string name="swap_choose_apps">Choose Apps</string>
+    <string name="swap_scan_qr">Scan QR Code</string>
+    <string name="swap_people_nearby">People Nearby</string>
+    <string name="swap_scanning_for_peers">Searching for nearby people…</string>
+    <string name="swap_nearby">Nearby Swap</string>
+    <string name="swap_intro">Connect and trade apps with people near you.</string>
+    <string name="swap_visible_bluetooth">Visible via Bluetooth</string>
+    <string name="swap_setting_up_bluetooth">Setting up Bluetooth…</string>
+    <string name="swap_not_visible_bluetooth">Not visible via Bluetooth</string>
+    <string name="swap_visible_wifi">Visible via WiFi</string>
+    <string name="swap_setting_up_wifi">Setting up WiFi…</string>
+    <string name="swap_not_visible_wifi">Not visible via WiFi</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>
+    <string name="swap_send_fdroid">SEND F-DROID</string>
+    <string name="swap_scan_qr_code">SCAN QR CODE</string>
+    <string name="swap_no_peers_nearby">Could not find people nearby to swap with.</string>
+    <string name="swap_connecting">Connecting</string>
+    <string name="swap_confirm">Confirm swap</string>
+    <string name="swap_qr_isnt_for_swap">The QR code you scanned doesn\'t look like a swap code.</string>
 
     <!-- WiFi AP status for Swap flow -->
-    <string name="wifi_ap_public">Public</string>
-    <string name="wifi_ap_private">Private</string>
-    <string name="wifi_ap_personal">Hotspot</string>
-    <string name="wifi_warning_public">May work</string>
-    <string name="wifi_warning_private">Promising</string>
-    <string name="wifi_warning_personal">Best bet</string>
-    <string name="swap_bluetooth_your_device">Your device is</string>
-    <string name="swap_bluetooth_select_or_scan">Select from devices below, or press \"Scan\" from the menu to find more devices.</string>
-    <string name="swap_bluetooth_bonded_device">Bonded</string>
-    <string name="swap_bluetooth_bonding_device">Currently bonding…</string>
-    <string name="swap_bluetooth_unknown_device">Unknown device</string>
     <string name="loading">Loading…</string>
     <string name="swap_attempt_install">TRY TO INSTALL</string>
     <string name="swap_connection_misc_error">An error occurred while connecting to device, we can\'t seem to swap with it :(</string>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index bdf47ea26..5ffa064c7 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -20,7 +20,6 @@
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
     </style>
 
-    <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="red">#FFFF0000</color>
 
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
index 2efbbfe67..45a5f2c2b 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
@@ -60,6 +60,11 @@ import java.util.TimerTask;
  * Central service which manages all of the different moving parts of swap which are required
  * to enable p2p swapping of apps.
  *
+ * The following UI elements don't do anything:
+ *  + TODO: Change wifi by touching network name during swap start screen
+ *  + TODO: The "?" button in the top right of the swap start screen doesn't do anything
+ *  + TODO: The "Send F-Droid" button doesn't do anything
+ *
  * TODO: Show "Waiting for other device to finish setting up swap" when only F-Droid shown in swap
  * TODO: Handle "not connected to wifi" more gracefully. For example, Bonjour discovery falls over.
  * TODO: When unable to reach the swap repo, but viewing apps to swap, show relevant feedback when attempting to download and install.
@@ -67,7 +72,6 @@ import java.util.TimerTask;
  * TODO: Feedback for "Setting up (wifi|bluetooth)" in start swap view is not as immediate as I had hoped.
  * TODO: Turn off bluetooth after cancelling/timing out if we turned it on.
  * TODO: Disable the Scan QR button unless visible via something. Could equally show relevant feedback.
- * TODO: Implement "Send F-Droid" on the main page.
  *
  * TODO: Starting wifi after cancelling swap and beginning again doesn't work properly
  * TODO: Scan QR hangs when updating repoo. Swapper was 2.3.3 and Swappee was 5.0
diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
index 50bd6ed85..2a6ef90bb 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
@@ -14,6 +14,7 @@ import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class Response {
@@ -73,7 +74,7 @@ public class Response {
     public int getFileSize() {
         if (headers != null) {
             for (Map.Entry<String, String> entry : headers.entrySet()) {
-                if (entry.getKey().toLowerCase().equals("content-length")) {
+                if (entry.getKey().toLowerCase(Locale.ENGLISH).equals("content-length")) {
                     try {
                         return Integer.parseInt(entry.getValue());
                     } catch (NumberFormatException e) {
diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java
index 30327021c..1a529099d 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java
@@ -2,6 +2,8 @@ package org.fdroid.fdroid.net.bluetooth.httpish.headers;
 
 import org.fdroid.fdroid.net.bluetooth.FileDetails;
 
+import java.util.Locale;
+
 public abstract class Header {
 
     private static Header[] VALID_HEADERS = {
@@ -13,7 +15,7 @@ public abstract class Header {
     protected abstract void handle(FileDetails details, String value);
 
     public static void process(FileDetails details, String header, String value) {
-        header = header.toLowerCase();
+        header = header.toLowerCase(Locale.ENGLISH);
         for (Header potentialHeader : VALID_HEADERS) {
             if (potentialHeader.getName().equals(header)) {
                 potentialHeader.handle(details, value);
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
index 844a2bd8f..b74b4539f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
@@ -10,7 +10,6 @@ import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
@@ -21,11 +20,11 @@ import android.widget.TextView;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.localrepo.SwapService;
-import org.fdroid.fdroid.localrepo.peers.Peer;
 
 // TODO: Use this for the "Preparing local repo" dialog also.
 public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity.InnerView {
 
+    @SuppressWarnings("unused")
     private final static String TAG = "SwapConnecting";
 
     public SwapConnecting(Context context) {
@@ -36,6 +35,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
         super(context, attrs);
     }
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public SwapConnecting(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
@@ -154,7 +154,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
             TextView errorText    = ((TextView) findViewById(R.id.error));
             Button   backButton   = ((Button) findViewById(R.id.back));
 
-            String message = null;
+            String message;
             if (intent.hasExtra(getMessageExtra())) {
                 message = intent.getStringExtra(getMessageExtra());
                 if (message != null) {
@@ -177,7 +177,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
                 onComplete();
             }
         }
-    };
+    }
 
     @Override
     public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index e86d21eaf..6cdacbbcc 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -486,7 +486,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     confirmSwapConfig = repoConfig;
                     showRelevantView();
                 } else {
-                    Toast.makeText(this, "The QR code you scanned doesn't look like a swap code.", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, R.string.swap_qr_isnt_for_swap, Toast.LENGTH_SHORT).show();
                 }
             }
         } else if (requestCode == CONNECT_TO_SWAP && resultCode == Activity.RESULT_OK) {