diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java
index 34455797f..8142f62e4 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java
@@ -875,7 +875,7 @@ public class AppDetails extends AppCompatActivity {
         DownloaderService.queue(this, apk.packageName, activeDownloadUrlString);
     }
 
-    public void removeApk(String packageName) {
+    private void removeApk(String packageName) {
         try {
             installer.deletePackage(packageName);
         } catch (InstallFailedException e) {
@@ -969,11 +969,11 @@ public class AppDetails extends AppCompatActivity {
         }
     }
 
-    public App getApp() {
+    private App getApp() {
         return app;
     }
 
-    public ApkListAdapter getApks() {
+    private ApkListAdapter getApks() {
         return adapter;
     }
 
@@ -1527,6 +1527,10 @@ public class AppDetails extends AppCompatActivity {
         }
 
         public void updateViews(View view) {
+            if (view == null) {
+                Log.e(TAG, "AppDetailsHeaderFragment.updateViews(): view == null. Oops.");
+                return;
+            }
             App app = appDetails.getApp();
             TextView statusView = (TextView) view.findViewById(R.id.status);
             btMain.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/fdroid/fdroid/CleanCacheService.java b/app/src/main/java/org/fdroid/fdroid/CleanCacheService.java
index 0838b6770..463af770d 100644
--- a/app/src/main/java/org/fdroid/fdroid/CleanCacheService.java
+++ b/app/src/main/java/org/fdroid/fdroid/CleanCacheService.java
@@ -20,7 +20,7 @@ import java.io.File;
  * {@link FDroidApp#onCreate()}
  */
 public class CleanCacheService extends IntentService {
-    public static final String TAG = "CleanCacheService";
+    private static final String TAG = "CleanCacheService";
 
     /**
      * Schedule or cancel this service to update the app index, according to the
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 955ffa960..2e7ceb163 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -344,6 +344,9 @@ public final class Utils {
      * @param secondsAgo The number of seconds old that marks a file for deletion.
      */
     public static void clearOldFiles(File dir, long secondsAgo) {
+        if (dir == null) {
+            return;
+        }
         long olderThan = System.currentTimeMillis() - (secondsAgo * 1000L);
         for (File f : dir.listFiles()) {
             if (f.isDirectory()) {
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
index 44c6ae8cb..cb8726a53 100644
--- a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
+++ b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
@@ -124,20 +124,4 @@ public class FileCompat {
 
     }
 
-    @TargetApi(9)
-    public static boolean setExecutable(SanitizedFile file, boolean executable, boolean ownerOnly) {
-
-        if (Build.VERSION.SDK_INT >= 9) {
-            return file.setExecutable(executable, ownerOnly);
-        }
-        String mode;
-        if (executable) {
-            mode = ownerOnly ? "0700" : "0711";
-        } else {
-            mode = ownerOnly ? "0600" : "0600";
-        }
-        return setMode(file, mode);
-
-    }
-
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
index d483d36e4..b8d93c0d0 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
@@ -80,9 +80,9 @@ import java.util.HashMap;
  * @see android.os.AsyncTask
  */
 public class DownloaderService extends Service {
-    public static final String TAG = "DownloaderService";
+    private static final String TAG = "DownloaderService";
 
-    static final String EXTRA_PACKAGE_NAME = "org.fdroid.fdroid.net.DownloaderService.extra.PACKAGE_NAME";
+    private static final String EXTRA_PACKAGE_NAME = "org.fdroid.fdroid.net.DownloaderService.extra.PACKAGE_NAME";
 
     private static final String ACTION_QUEUE = "org.fdroid.fdroid.net.DownloaderService.action.QUEUE";
     private static final String ACTION_CANCEL = "org.fdroid.fdroid.net.DownloaderService.action.CANCEL";
diff --git a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
index f6a41c4fd..11d87a8b3 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
@@ -26,8 +26,8 @@ public class HttpDownloader extends Downloader {
     protected static final String HEADER_IF_NONE_MATCH = "If-None-Match";
     protected static final String HEADER_FIELD_ETAG = "ETag";
 
-    public final String username;
-    public final String password;
+    private final String username;
+    private final String password;
     protected HttpURLConnection connection;
     private int statusCode = -1;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
index 13f297170..b48108682 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
@@ -111,15 +111,6 @@ public class AppSecurityPermissions {
             return context.getDrawable(R.drawable.ic_perm_device_info);
         }
 
-        public int flags() {
-            if (Build.VERSION.SDK_INT < 17) return 0;
-            return flags;
-        }
-
-        public int priority() {
-            if (Build.VERSION.SDK_INT < 17) return 0;
-            return priority;
-        }
     }
 
     // PermissionInfo implements Parcelable but its Parcel constructor is private and thus cannot be extended.
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index e484b14aa..2222fc3da 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Desaniciar</string>
   <string name="enable_nfc_send">Habilitar unviu per NFC…</string>
   <string name="cache_downloaded">Caltener aplicaciones na caché</string>
-  <string name="cache_downloaded_on">Caltién nel preséu los ficheros APK baxaos</string>
   <string name="updates">Anovamientos</string>
   <string name="other">Otru</string>
   <string name="update_interval">Intervalu automáticu d\'anovaminetu</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 5e07e9a91..4ef791053 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Изтриване</string>
   <string name="enable_nfc_send">Активирай NFC изпращане…</string>
   <string name="cache_downloaded">Кеширане на приложенията</string>
-  <string name="cache_downloaded_on">Записва свалените .apk файлове на устройствто</string>
   <string name="updates">Актуализации</string>
   <string name="other">Други</string>
   <string name="update_interval">Проверка за актуализации</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b1e954999..fce78a14e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -6,7 +6,6 @@
   <string name="version">Versió</string>
   <string name="delete">Esborrar</string>
   <string name="cache_downloaded">Memòria cau de paquets</string>
-  <string name="cache_downloaded_on">Manté els paquets descarregats al dispositiu</string>
   <string name="updates">Actualitzacions</string>
   <string name="other">Altres</string>
   <string name="update_interval">Període d\'actualització automàtica</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bacf58906..c1dda99d3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -6,7 +6,6 @@
   <string name="version">Verze</string>
   <string name="delete">Smazat</string>
   <string name="enable_nfc_send">Povolit posílání po NFC…</string>
-  <string name="cache_downloaded_on">Ponechat stažené apk soubory na SD kartě</string>
   <string name="updates">Aktualizace</string>
   <string name="other">Ostatní</string>
   <string name="update_interval">Interval automatických aktualizací</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 1a9d23a25..f1b4c86c3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -8,7 +8,6 @@
     <string name="delete">Slet</string>
     <string name="enable_nfc_send">Aktiver NFC Send…</string>
     <string name="cache_downloaded">Cache pakker</string>
-    <string name="cache_downloaded_on">Behold hentede pakkefiler på enheden</string>
     <string name="updates">Opdateringer</string>
     <string name="unstable_updates">Ustabile opdateringer</string>
     <string name="unstable_updates_summary">Foreslå opdateringer til ustabile versioner</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2cf7e625d..a78cb7850 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Löschen</string>
   <string name="enable_nfc_send">NFC-Transfer aktivieren …</string>
   <string name="cache_downloaded">Zwischengespeicherte Apps behalten</string>
-  <string name="cache_downloaded_on">Heruntergeladene Programmpakete auf dem Gerät behalten</string>
   <string name="updates">Aktualisierungen</string>
   <string name="other">Andere</string>
   <string name="update_interval">Automatisches Aktualisierungsintervall</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c6d9823e7..07c4b65b6 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Διαγραφή</string>
   <string name="enable_nfc_send">Ενεργοποίηση Αποστολής NFC…</string>
   <string name="cache_downloaded">Αποθήκευση πακέτων</string>
-  <string name="cache_downloaded_on">Διατήρηση ληφθέντων αρχείων εφαρμογών στην συσκευή</string>
   <string name="updates">Ενημερώσεις</string>
   <string name="other">Άλλα</string>
   <string name="update_interval">Συχνότητα ενημέρωσης</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index ceffd4cd0..69cadbc2b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -2,7 +2,6 @@
 <resources>
   <string name="version">Versio</string>
   <string name="delete">Forigi</string>
-  <string name="cache_downloaded_on">Konservas elŝutitajn apk-dosierojn en la memorejo</string>
   <string name="updates">Ĝisdatigoj</string>
   <string name="other">Aliaj</string>
   <string name="automatic_scan_wifi">Nur per sendrata reto</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2abd3a4f7..f612ad03f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Borrar</string>
   <string name="enable_nfc_send">Habilitar envío NFC…</string>
   <string name="cache_downloaded">Mantener las aplicaciones en caché</string>
-  <string name="cache_downloaded_on">Mantener los paquetes APK descargados en el dispositivo</string>
   <string name="updates">Actualizaciones</string>
   <string name="other">Otros</string>
   <string name="update_interval">Intervalo de actualización automática</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ae9fcb277..e576693a5 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -9,7 +9,6 @@
     <string name="delete">Kustuta</string>
     <string name="enable_nfc_send">Luba NFC andmevahetus…</string>
     <string name="cache_downloaded">Jäta alles puhverdatud paketid</string>
-    <string name="cache_downloaded_on">Talleta alla laaditud APK failid seadmes</string>
     <string name="updates">Uuendused</string>
     <string name="unstable_updates">Ebastabiilsed uuendused</string>
     <string name="unstable_updates_summary">Soovita uuendamist ebastabiilsetele versioonidele</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 054aa2b24..f451dccee 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -5,7 +5,6 @@
   <string name="delete">Ezabatu</string>
   <string name="enable_nfc_send">Gaitu NFC bidez bidaltzea…</string>
   <string name="cache_downloaded">Gorde cache-an deskargatutako paketeak</string>
-  <string name="cache_downloaded_on">Mantendu deskargatutako pakete fitxategiak gailuan</string>
   <string name="updates">Eguneraketak</string>
   <string name="automatic_scan_wifi">Wi-Fi bidez soilik</string>
   <string name="automatic_scan_wifi_on">Eguneratu aplikazioen zerrendak automatikoki Wi-Fi bidez soilik</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6421cda4a..c0b21b332 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -4,7 +4,6 @@
   <string name="installDowngrade">شما در حال قدیمی‌کردن و کاهش درجهٔ این برنامه هستید. انجام چنین کاری ممکن منجر به خرابی یا از دست رفتن داده‌های شما شود. آیا می‌خواهید سعی کنید این برنامه را به هر قیمتی قدیمی کنید؟</string>
   <string name="delete">حذف</string>
   <string name="cache_downloaded">نگه‌داری کاره‌های انبار شده</string>
-  <string name="cache_downloaded_on">نگه‌داشتن پروندهٔ apk بارگیری شده، روی افزاره</string>
   <string name="updates">به‌روزرسانی‌ها</string>
   <string name="other">دیگر</string>
   <string name="update_interval">به‌روزرسانی دوره‌ای خودکار</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9951f9a88..8ddf21c54 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Poista</string>
   <string name="enable_nfc_send">Ota NFC-lähetys käyttöön…</string>
   <string name="cache_downloaded">Säilytä ladatut sovellukset välimuistissa</string>
-  <string name="cache_downloaded_on">Säilytä ladatut pakettitiedostot laitteessa</string>
   <string name="updates">Päivitykset</string>
   <string name="other">Muu</string>
   <string name="update_interval">Automaattisen päivityksen tiheys</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 525128067..efaf06779 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Supprimer</string>
   <string name="enable_nfc_send">Activer l\'envoi via NFC…</string>
   <string name="cache_downloaded">Stockage des paquets</string>
-  <string name="cache_downloaded_on">Conserver les paquets téléchargés sur l\'appareil</string>
   <string name="updates">Mises à jour</string>
   <string name="other">Autres</string>
   <string name="update_interval">Intervalle de mise à jour automatique</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 70fde14b0..15df09ab4 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -77,7 +77,6 @@
 
     <string name="delete">Eliminar</string>
     <string name="enable_nfc_send">Activar envío NFC…</string>
-    <string name="cache_downloaded_on">Manter os ficheiros dos paquetes descargados no dispositivo</string>
     <string name="unstable_updates">Actualizacións inestables</string>
     <string name="update_interval">Intervalo de actualización automática</string>
     <string name="automatic_scan_wifi_on">Actualizar automáticamente o listado de apps só mediante Wi-Fi</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index bfcb896d1..b932c0db1 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -6,7 +6,6 @@
     <string name="delete">מחק</string>
     <string name="enable_nfc_send">אפשר NFC Send…</string>
     <string name="cache_downloaded">הטמן חבילות</string>
-    <string name="cache_downloaded_on">שמור קבצי חבילה מורדים על גבי התקן</string>
     <string name="updates">עדכונים</string>
     <string name="other">אחר</string>
 
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 22b807249..4320bafd4 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -3,7 +3,6 @@
     <string name="delete">नष्ट करे</string>
     <string name="enable_nfc_send">NFC द्वारा भेजे …</string>
     <string name="version">संस्करण</string>
-    <string name="cache_downloaded_on">दौन्लोदिद फ़ाइलें यंत्र पर रखे</string>
     <string name="updates">नवीनतम बनाये</string>
     <string name="unstable_updates">अस्थिर अपडेट</string>
     <string name="unstable_updates_summary">अस्थिर अपडेट के सुझाव दे</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0c37b8983..b94fed3e6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -5,7 +5,6 @@
   <string name="installDowngrade">Ön megpróbálta régebbivel felülírni az alkalmazást. Ez hibás működést és az adatok elvesztését okozhatja. Ennek ellenére is megpróbálja telepíteni?</string>
   <string name="version">Verzió</string>
   <string name="cache_downloaded">Csomagok gyorsítótárazása</string>
-  <string name="cache_downloaded_on">A letöltött csomagfájlokat megtartja a készüléken</string>
   <string name="updates">Frissítések</string>
   <string name="other">egyéb</string>
   <string name="update_interval">Auto. frissítés intervalluma</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 0c65d381d..7aabaa278 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -7,7 +7,6 @@
     <string name="delete">Hapus</string>
     <string name="enable_nfc_send">Aktifkan Pengirimian NFC…</string>
     <string name="cache_downloaded">Simpan hasil unduhan</string>
-    <string name="cache_downloaded_on">Simpan berkas APK terunduh diperangkat</string>
     <string name="updates">Pembaruan</string>
     <string name="unstable_updates">Pembaruan tidak stabil</string>
     <string name="unstable_updates_summary">Sarankan pembaruan ke versi tidak stabil</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3b7d6f904..9cf9d56f8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Elimina</string>
   <string name="enable_nfc_send">Attiva invio NFC…</string>
   <string name="cache_downloaded">Cache dei pacchetti</string>
-  <string name="cache_downloaded_on">Conserva sul dispositivo i file dei pacchetti scaricati</string>
   <string name="updates">Aggiornamenti</string>
   <string name="other">Altro</string>
   <string name="update_interval">Intervallo degli aggiornamenti automatici</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f656d03b3..f87b80964 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">削除</string>
   <string name="enable_nfc_send">NFC 送信を有効…</string>
   <string name="cache_downloaded">ｷｬｯｼｭしたｱﾌﾟﾘを残す</string>
-  <string name="cache_downloaded_on">ﾀﾞｳﾝﾛｰﾄﾞしたAPKﾌｧｲﾙを端末に残します</string>
   <string name="updates">更新</string>
   <string name="other">その他</string>
   <string name="update_interval">自動更新間隔</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 867e11935..ddf9e544f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">삭제</string>
   <string name="enable_nfc_send">NFC 전송 사용…</string>
   <string name="cache_downloaded">패키지 보관</string>
-  <string name="cache_downloaded_on">다운로드된 패키지 파일을 기기에 보관</string>
   <string name="updates">업데이트</string>
   <string name="other">기타</string>
   <string name="update_interval">자동 업데이트 간격</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f701a66e2..66700d61b 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -3,7 +3,6 @@
   <string name="version">Versija</string>
   <string name="delete">Šalinti</string>
   <string name="cache_downloaded">Atsiųstų programų podėlis</string>
-  <string name="cache_downloaded_on">Laikyti atsiųstus apk failus SD kortelėje</string>
   <string name="updates">Atnaujinimai</string>
   <string name="other">Kita</string>
   <string name="update_interval">Automatinis programų sąrašų naujinimas</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index eee483509..c5aa3c26c 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -4,7 +4,6 @@
   <string name="delete">Dzēst</string>
   <string name="enable_nfc_send">Ieslēgt sūtīšanu caur NFC…</string>
   <string name="cache_downloaded">Programmu kešs</string>
-  <string name="cache_downloaded_on">Saglabāt novilktos apk failus SD kartē</string>
   <string name="updates">Atjauninājumi</string>
   <string name="other">Cits</string>
   <string name="update_interval">Atjauninājumu intervāls</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a446837a2..9c463b475 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Slett</string>
   <string name="enable_nfc_send">Skru på NFC-sending…</string>
   <string name="cache_downloaded">Lagre nedlastede programmer i mellomlager</string>
-  <string name="cache_downloaded_on">Behold nedlastede apk-filer på enheten</string>
   <string name="updates">Oppdateringer</string>
   <string name="other">Andre</string>
   <string name="update_interval">Intervall for automatisk oppdatering</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dcedd4298..558c0ea07 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Verwijderen</string>
   <string name="enable_nfc_send">Versturen via NFC aanzetten…</string>
   <string name="cache_downloaded">Bewaar gedownloade apps</string>
-  <string name="cache_downloaded_on">Bewaar gedownloade appbestanden op apparaat</string>
   <string name="updates">Updates</string>
   <string name="other">Overig</string>
   <string name="update_interval">Automatische vernieuwingsinterval</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8290f4293..fac350049 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -141,7 +141,6 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
 
     <string name="SignatureMismatch">Nowa wersja jest podpisana cyfrowo z innym kluczem niż obecna wersja. Aby zainstalować nową wersję, obecna musi zostać najpierw odinstalowana (odinstalowanie aplikacji spowoduje usunięcie jej danych i ustawień)</string>
     <string name="installDowngrade">Próbujesz zainstalować starszą wersję tej aplikacji. Wykonanie tej operacji może powodować błędy w jej działaniu lub utratę danych. Czy chcesz kontynuować?</string>
-    <string name="cache_downloaded_on">Trzyma pobrane pliki .apk na urządzeniu by móc je potem używać w trybie offline</string>
     <string name="update_interval">Okres pomiędzy sprawdzaniem aktualizacji</string>
     <string name="automatic_scan_wifi">Aktualizuj tylko przez Wi-Fi</string>
     <string name="automatic_scan_wifi_on">Aktualizuj listę aplikacji tylko przez Wi-Fi (oszczędza dane mobilne)</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index eb241bebd..fdcabd647 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Apagar</string>
   <string name="enable_nfc_send">Habilitar envio NFC…</string>
   <string name="cache_downloaded">Manter aplicativos em cache</string>
-  <string name="cache_downloaded_on">Manter os arquivos APK baixados no dispositivo</string>
   <string name="updates">Atualizações</string>
   <string name="other">Outros</string>
   <string name="update_interval">Intervalo de atualização automática</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index aff444ed0..59c070b4c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -8,7 +8,6 @@
     <string name="delete">Apagar</string>
     <string name="enable_nfc_send">Ativar o envio NFC…</string>
     <string name="cache_downloaded">Pacotes em cache</string>
-    <string name="cache_downloaded_on">Manter pacotes descarregados no dispositivo</string>
     <string name="updates">Atualizações</string>
     <string name="unstable_updates">Atualizações instáveis</string>
     <string name="unstable_updates_summary">Sugerir atualizações para versões instáveis</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ab68ad793..7a06bb3a0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -64,7 +64,6 @@
     <string name="login_title">Necesita autentificare</string>
     <string name="local_repo_https">Foloseste conexiune privata</string>
     <string name="system_installer">Extensie privilegiata</string>
-    <string name="cache_downloaded_on">Pastreaza pachetele aplicatiilor descarcate</string>
     <string name="unstable_updates_summary">Sugereaza actualizari si la versiunile instabile</string>
     <string name="update_interval_zero">Nu actualiza automat lista de pachete</string>
     <string name="repo_error_empty_username">Nume utilizator gol, autentificare neschimbata</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 301d5fe4b..5850100a9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Удалить</string>
   <string name="enable_nfc_send">Включить отправку по NFC…</string>
   <string name="cache_downloaded">Кэшировать пакеты</string>
-  <string name="cache_downloaded_on">Хранить загруженные файлы пакетов на устройстве</string>
   <string name="updates">Обновления</string>
   <string name="other">Прочее</string>
   <string name="update_interval">Интервал автоматического обновления</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 1e27f55c2..7aaffaa77 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Burra</string>
   <string name="enable_nfc_send">Abìlita imbiu NFC…</string>
   <string name="cache_downloaded">Pachetos cache</string>
-  <string name="cache_downloaded_on">Mantene sos documentos de sos pachetos iscarrigados in s\'ischeda SD</string>
   <string name="updates">Agiornamentos</string>
   <string name="other">Àteru</string>
   <string name="update_interval">Intervallu agiornamentu automàticu</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6a982b151..3ddff4263 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Vymazať</string>
   <string name="enable_nfc_send">Zapnúť odoslanie cez NFC …</string>
   <string name="cache_downloaded">Balíky ukladať balíky do vyr. pamäte</string>
-  <string name="cache_downloaded_on">Ponechať stiahnuté apk súbory v zariadení</string>
   <string name="updates">Aktualizácie</string>
   <string name="other">Iné</string>
   <string name="update_interval">Interval automat. aktualizácií</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 60d024e09..2104e7b78 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -44,7 +44,6 @@
     <string name="installDowngrade">Poskušate namestiti starejšo različico aplikacije od trenutno nameščene. To lahko povzroči napake ali pa izgubo podatkov. ali želite kljub temu nadaljevati?</string>
     <string name="delete">Izbriši</string>
     <string name="enable_nfc_send">Omogoči NFC pošiljanje</string>
-    <string name="cache_downloaded_on">Ohrani prenesene paketne datoteke na napravi</string>
     <string name="unstable_updates">Nestabilne posodobitve</string>
     <string name="unstable_updates_summary">Predlagaj posodabljanje na nestabilne verzije</string>
     <string name="other">Ostalo</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 0146cc76a..dff23c6ec 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -5,7 +5,6 @@
     <string name="installIncompatible">Mesa duket kjo paketë nuk përputhet me pajisjen tuaj. Dëshironi të provoni ta instaloni sidoqoftë?</string>
     <string name="version">Versioni</string>
     <string name="delete">Fshi</string>
-    <string name="cache_downloaded_on">Mbaj në pajisje skedarët e paketave të shkarkuara</string>
     <string name="updates">Përditësime</string>
     <string name="other">Tjetër</string>
 
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ec695e1a3..3c5857b8c 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Обриши</string>
   <string name="enable_nfc_send">Омогући слање преко НФЦ-а…</string>
   <string name="cache_downloaded">Чувај кеширане апликације</string>
-  <string name="cache_downloaded_on">Чувај преузете АПК фајлове на уређају</string>
   <string name="updates">Надоградње</string>
   <string name="other">Остало</string>
   <string name="update_interval">Међувреме самосталног освежавања</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index af4200124..27b98326f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Ta bort</string>
   <string name="enable_nfc_send">Aktivera NFC-sändning…</string>
   <string name="cache_downloaded">Cachade appar</string>
-  <string name="cache_downloaded_on">Behåll hämtade paket på enheten</string>
   <string name="updates">Uppdateringar</string>
   <string name="other">Andra</string>
   <string name="update_interval">Automatiskt uppdateringsintervall</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ff6b069b5..a3e133fef 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Sil</string>
   <string name="enable_nfc_send">NFC göndermesini etkinleştir…</string>
   <string name="cache_downloaded">Uygulamaları önbelleğe kaydet</string>
-  <string name="cache_downloaded_on">İndirilen uygulama dosyalarını cihazda tut</string>
   <string name="updates">Güncellemeler</string>
   <string name="other">Diğer</string>
   <string name="update_interval">Otomatik güncelleme aralığı</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c50e0b501..44f6d99b3 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -48,7 +48,6 @@
     <string name="installIncompatible">Схоже, ця програма не сумісна з вашим пристроєм. Спробувати встановити її все одно?</string>
     <string name="installDowngrade">Ви збираєтесь встановити більш стару версію програми. Це можете призвести до некоректної робити і навіть втрати ваших даних. Встановити більш стару версію?</string>
     <string name="delete">Видалити</string>
-    <string name="cache_downloaded_on">Зберігати завантажені пакети у пам\'яті пристрою</string>
     <string name="other">Інше</string>
     <string name="update_interval">Інтервал автооновлення</string>
     <string name="update_interval_zero">Не оновлювати список програм автоматично</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index bfe434b89..274e2232f 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -9,7 +9,6 @@
     <string name="delete">حذف کریں</string>
     <string name="enable_nfc_send">این ایف سی ارسال فعال کریں…</string>
     <string name="cache_downloaded">کیشے پیکج</string>
-    <string name="cache_downloaded_on">ڈاؤن لوڈ کیے گئے پیکج آلے پر محفوظ رکھیں</string>
     <string name="updates">تازہ کاریاں</string>
     <string name="unstable_updates">غیر مستحکم اپ ڈیٹس</string>
     <string name="unstable_updates_summary">غیر مستحکم ورژن کی تازہ کاریاں تجویز کریں</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4908ff888..1a65d9643 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">Xoá</string>
   <string name="enable_nfc_send">Kích hoạt gửi qua NFC…</string>
   <string name="cache_downloaded">Lưu tập tin gói</string>
-  <string name="cache_downloaded_on">Lưu các tập tin gói đã tải trong thẻ nhớ</string>
   <string name="updates">Cập nhật</string>
   <string name="other">Khác</string>
   <string name="update_interval">Tự động cập nhật định kì</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 090396cf0..772c26767 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -7,7 +7,6 @@
   <string name="delete">删除</string>
   <string name="enable_nfc_send">启用NFC发送…</string>
   <string name="cache_downloaded">保留应用安装包</string>
-  <string name="cache_downloaded_on">在设备上保留已下载的 APK 文件</string>
   <string name="updates">升级</string>
   <string name="other">其它</string>
   <string name="update_interval">自动更新周期</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 141b9172d..8179325db 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -4,7 +4,6 @@
   <string name="delete">刪除</string>
   <string name="enable_nfc_send">啟用 NFC 傳送…</string>
   <string name="cache_downloaded">軟件包快取</string>
-  <string name="cache_downloaded_on">在裝置上保留已下載的軟件包檔案</string>
   <string name="updates">更新</string>
   <string name="other">其他</string>
   <string name="update_interval">自動更新頻率</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index df21542b1..ca65a34fc 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,6 @@
     <string name="delete">刪除</string>
     <string name="enable_nfc_send">啟用 NFC 傳送功能……</string>
     <string name="cache_downloaded">對下載下來的軟體包進行快取</string>
-    <string name="cache_downloaded_on">將下載下來的軟體包檔案保留在裝置上</string>
     <string name="updates">更新</string>
     <string name="unstable_updates">非穩定版本的軟體更新</string>
     <string name="unstable_updates_summary">建議更新至不穩定的應用軟體版本</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d8062f77..ed6276b96 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,6 @@
     <string name="delete">Delete</string>
     <string name="enable_nfc_send">Enable NFC Send…</string>
     <string name="cache_downloaded">Keep cached apps</string>
-    <string name="cache_downloaded_on">Keep downloaded APK files on device</string>
     <string name="updates">Updates</string>
     <string name="unstable_updates">Unstable updates</string>
     <string name="unstable_updates_summary">Suggest updates to unstable versions</string>