From ce1756db625b4d7d99351ea0fa84af6e6ba1759c Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 27 Sep 2018 12:05:01 +0900
Subject: [PATCH 1/6] use new design for other badge instances

---
 .../drawable/app_version_item_status_new.xml  |  5 +++++
 .../app_version_item_status_suggested.xml     |  2 +-
 .../main/res/layout-v14/app_status_new.xml    | 19 ++++---------------
 .../res/layout-v14/app_status_suggested.xml   |  6 ++++++
 .../res/layout/app_details2_version_item.xml  |  7 ++-----
 app/src/main/res/layout/app_status_new.xml    | 16 ----------------
 6 files changed, 18 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/res/drawable/app_version_item_status_new.xml
 create mode 100644 app/src/main/res/layout-v14/app_status_suggested.xml
 delete mode 100644 app/src/main/res/layout/app_status_new.xml

diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml
new file mode 100644
index 000000000..95ed5d276
--- /dev/null
+++ b/app/src/main/res/drawable/app_version_item_status_new.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:width="1dp" android:color="#429fff" />
+    <corners android:radius="2dp" />
+</shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/app/src/main/res/drawable/app_version_item_status_suggested.xml
index 95ed5d276..6f6f0410f 100644
--- a/app/src/main/res/drawable/app_version_item_status_suggested.xml
+++ b/app/src/main/res/drawable/app_version_item_status_suggested.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#429fff" />
+    <stroke android:width="1dp" android:color="#777777" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/layout-v14/app_status_new.xml b/app/src/main/res/layout-v14/app_status_new.xml
index 0b0e68f04..ade122b9e 100644
--- a/app/src/main/res/layout-v14/app_status_new.xml
+++ b/app/src/main/res/layout-v14/app_status_new.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/app_version_item_status_new"
     android:text="@string/app__newly_added"
-    android:textSize="12sp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:paddingStart="10dp"
-    android:paddingLeft="10dp"
-    android:paddingEnd="10dp"
-    android:paddingRight="10dp"
-    android:textAllCaps="true"
-    android:textColor="@color/fdroid_blue"
-    android:background="@drawable/app_tag_new_background"
-    />
\ No newline at end of file
+    android:textColor="#429fff"
+    style="@style/AppVersionStatus" />
\ No newline at end of file
diff --git a/app/src/main/res/layout-v14/app_status_suggested.xml b/app/src/main/res/layout-v14/app_status_suggested.xml
new file mode 100644
index 000000000..e96aa7255
--- /dev/null
+++ b/app/src/main/res/layout-v14/app_status_suggested.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/app_version_item_status_suggested"
+    android:text="@string/app_suggested"
+    android:textColor="#777777"
+    style="@style/AppVersionStatus" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index f0e2b7945..794110c1e 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -41,11 +41,8 @@
                     android:layout_height="match_parent"
                     android:paddingTop="3dp">
 
-                    <TextView android:id="@+id/status_suggested"
-                        style="@style/AppVersionStatus"
-                        android:background="@drawable/app_version_item_status_suggested"
-                        android:textColor="#429fff"
-                        android:text="@string/app_suggested" />
+                    <include layout="@layout/app_status_suggested"
+                        android:id="@+id/status_suggested" />
 
                     <TextView android:id="@+id/status_installed"
                         style="@style/AppVersionStatus"
diff --git a/app/src/main/res/layout/app_status_new.xml b/app/src/main/res/layout/app_status_new.xml
deleted file mode 100644
index 796aa6229..000000000
--- a/app/src/main/res/layout/app_status_new.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/app__newly_added"
-    android:textSize="12sp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:paddingStart="10dp"
-    android:paddingLeft="10dp"
-    android:paddingEnd="10dp"
-    android:paddingRight="10dp"
-    android:textColor="@color/fdroid_blue"
-    android:background="@drawable/app_tag_new_background"
-    />
\ No newline at end of file

From fef3309714cfe646f5173bf837fe8a880c0812de Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 27 Sep 2018 12:06:42 +0900
Subject: [PATCH 2/6] slight changes to update header

---
 .../updates/items/UpdateableAppsHeader.java   |  4 +-
 .../res/layout/updateable_app_list_item.xml   | 30 +++------
 app/src/main/res/layout/updates_header.xml    | 62 ++++++++++---------
 3 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
index 5e5b6a971..beebd062d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
@@ -69,16 +69,16 @@ public class UpdateableAppsHeader extends AppUpdateData {
         private UpdateableAppsHeader header;
 
         private final TextView updatesAvailable;
-        private final ImageView downloadAll;
         private final TextView appsToUpdate;
+        private final Button downloadAll;
         private final Button toggleAppsToUpdate;
 
         public ViewHolder(View itemView) {
             super(itemView);
 
             updatesAvailable = (TextView) itemView.findViewById(R.id.text_updates_available);
-            downloadAll = (ImageView) itemView.findViewById(R.id.button_download_all);
             appsToUpdate = (TextView) itemView.findViewById(R.id.text_apps_to_update);
+            downloadAll = (Button) itemView.findViewById(R.id.button_download_all);
             toggleAppsToUpdate = (Button) itemView.findViewById(R.id.button_toggle_apps_to_update);
 
             toggleAppsToUpdate.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/app/src/main/res/layout/updateable_app_list_item.xml
index 4e7c1c59e..618ede394 100644
--- a/app/src/main/res/layout/updateable_app_list_item.xml
+++ b/app/src/main/res/layout/updateable_app_list_item.xml
@@ -5,25 +5,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="24dp"
-    android:paddingLeft="24dp"
     tools:ignore="RtlSymmetry">
 
     <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
          when it will inevitably read out the name of the app straight after (via the @+id/app_name). -->
     <ImageView
         android:id="@+id/icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="32dp"
         android:layout_height="32dp"
         tools:src="@drawable/ic_launcher"
         android:scaleType="fitCenter"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        tools:ignore="ContentDescription" />
+        android:layout_margin="16dp"
+        tools:ignore="ContentDescription"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/app_name"
@@ -34,10 +29,7 @@
         android:textColor="?attr/installedApps"
         android:lines="1"
         android:ellipsize="end"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_margin="8dp"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/install"
         app:layout_constraintTop_toTopOf="@+id/icon"
@@ -46,15 +38,11 @@
     <ImageView
         android:id="@+id/install"
         tools:src="@drawable/ic_download"
-        android:scaleType="fitXY"
+        android:scaleType="fitCenter"
         android:contentDescription="@string/updates__tts__download_app"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:elevation="2dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/icon"
         app:layout_constraintBottom_toBottomOf="@+id/icon" />
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 4cff7123f..88edde404 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="?appDetailsCardBackground">
 
     <TextView
         android:id="@+id/text_updates_available"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/button_download_all"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        tools:text="Download updates for 3 apps" />
-
-    <ImageView
-        android:id="@+id/button_download_all"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_download_progress_0"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:contentDescription="@string/updates__tts__download_updates_for_all_apps"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_updates_available" />
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        tools:text="Download updates for 3 apps"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/button_download_all"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/text_apps_to_update"
@@ -40,24 +30,36 @@
         android:ellipsize="end"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button_download_all"
         app:layout_constraintTop_toBottomOf="@+id/text_updates_available" />
 
+    <Button
+        android:id="@+id/button_download_all"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:text="Update all"
+        android:textAllCaps="true"
+        android:contentDescription="@string/updates__tts__download_updates_for_all_apps"
+        style="@style/DetailsPrimaryButtonStyle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_updates_available"
+        app:layout_constraintBottom_toBottomOf="@+id/text_apps_to_update" />
+
     <Button
         android:id="@+id/button_toggle_apps_to_update"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_apps_to_update"
         android:background="?attr/selectableItemBackground"
-        android:textColor="@color/fdroid_blue"
-        android:padding="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:padding="10dp"
         tools:text="Show apps"
-        android:textAllCaps="true" />
-
+        android:textColor="@color/fdroid_blue"
+        android:textAllCaps="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_apps_to_update" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 3f00b2a4fbf7aaf947dda034974eb8cfc2127dde Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Fri, 28 Sep 2018 09:31:33 +0900
Subject: [PATCH 3/6] standardize version properties

---
 .../fdroid/views/AppDetailsRecyclerViewAdapter.java       | 4 ++--
 app/src/main/res/layout/updates_header.xml                | 4 ++--
 app/src/main/res/values/strings.xml                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 5375ac403..a92bb8875 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -1093,7 +1093,7 @@ public class AppDetailsRecyclerViewAdapter
             Repo repo = RepoProvider.Helper.findById(context, apk.repoId);
             if (repo != null) {
                 repository.setVisibility(View.VISIBLE);
-                repository.setText(repo.getName());
+                repository.setText("Repository: " + repo.getName());
             } else {
                 repository.setVisibility(View.INVISIBLE);
             }
@@ -1170,7 +1170,7 @@ public class AppDetailsRecyclerViewAdapter
         }
 
         private String getApiText(final Apk apk) {
-            String apiText = "Android ";
+            String apiText = "Version: ";
             if (apk.minSdkVersion > 0 && apk.maxSdkVersion < Apk.SDK_VERSION_MAX_VALUE) {
                 apiText += context.getString(R.string.minsdk_up_to_maxsdk,
                         Utils.getAndroidVersionName(apk.minSdkVersion),
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 88edde404..b7542efc8 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -52,10 +52,10 @@
 
     <Button
         android:id="@+id/button_toggle_apps_to_update"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="8dp"
         android:background="?attr/selectableItemBackground"
-        android:padding="10dp"
         tools:text="Show apps"
         android:textColor="@color/fdroid_blue"
         android:textAllCaps="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a1792c27..330a97126 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,13 +90,13 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="app_suggested">Suggested</string>
     <string name="app_incompatible">Incompatible</string>
     <string name="app_installed">Installed</string>
+    <string name="app__newly_added">New</string>
     <string name="app_not_installed">Not Installed</string>
     <string name="app_inst_known_source">Installed (from %s)</string>
     <string name="app_inst_unknown_source">Installed (from unknown source)</string>
     <string name="app_version_x_available">Version %1$s available</string>
     <string name="app_version_x_installed">Version %1$s</string>
     <string name="app_recommended_version_installed">Version %1$s (Recommended)</string>
-    <string name="app__newly_added">New</string>
     <string name="added_on">Added on %s</string>
     <string name="app__tts__cancel_download">Cancel download</string>
     <string name="app__install_downloaded_update">Update</string>
@@ -355,9 +355,9 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="repo_added">Saved package repository %1$s.</string>
     <string name="repo_searching_address">Looking for package repository at\n%1$s</string>
     <string name="share_repository">Share Repository</string>
-    <string name="minsdk_or_later">%s or later</string>
-    <string name="up_to_maxsdk">Up to %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s up to %2$s</string>
+    <string name="minsdk_or_later">%s+</string>
+    <string name="up_to_maxsdk">1.0-%s</string>
+    <string name="minsdk_up_to_maxsdk">%1$s-%2$s</string>
     <string name="not_on_same_wifi">Your device is not on the same Wi-Fi as the local repo you just added! Try joining
         this network: %s
     </string>

From 24a4da9d8909408aa0eed2745538e596fb48419b Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 17 Oct 2018 02:53:30 +0900
Subject: [PATCH 4/6] some layout modifications to Updates and AppDetails
 headers

---
 .../main/java/org/fdroid/fdroid/data/App.java | 17 ++--
 .../views/AppDetailsRecyclerViewAdapter.java  | 14 ++-
 .../fdroid/views/updates/UpdatesAdapter.java  |  1 +
 .../res/drawable/app_tag_new_background.xml   |  5 --
 .../details_panel_donate_background_dark.xml  |  1 -
 .../details_panel_donate_background_light.xml |  1 -
 .../details_panel_donate_background_night.xml |  1 -
 .../main/res/layout/app_details2_header.xml   | 81 +++++++----------
 .../res/layout/app_details2_version_item.xml  |  6 +-
 .../res/layout/updateable_app_status_item.xml | 89 +++++++++----------
 app/src/main/res/layout/updates_header.xml    | 15 ++--
 app/src/main/res/values/strings.xml           |  9 +-
 app/src/main/res/values/styles_detail.xml     |  4 +-
 13 files changed, 106 insertions(+), 138 deletions(-)
 delete mode 100644 app/src/main/res/drawable/app_tag_new_background.xml

diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index a10d03512..555cf815e 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -396,16 +396,6 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         return app;
     }
 
-    /**
-     * In order to format all in coming descriptions before they are written
-     * out to the database and used elsewhere, this is needed to intercept
-     * the setting of {@link App#description} to insert the format method.
-     */
-    @JsonProperty("description")
-    private void setDescription(String description) { // NOPMD
-        this.description = formatDescription(description);
-    }
-
     /**
      * Parses the {@code localized} block in the incoming index metadata,
      * choosing the best match in terms of locale/language while filling as
@@ -508,8 +498,11 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
             }
         }
 
-        whatsNew = getLocalizedEntry(localized, localesToUse, "whatsNew");
-        String value = getLocalizedEntry(localized, localesToUse, "video");
+        String value = getLocalizedEntry(localized, localesToUse, "whatsNew");
+        if (!TextUtils.isEmpty(value)) {
+            whatsNew = value;
+        }
+        value = getLocalizedEntry(localized, localesToUse, "video");
         if (!TextUtils.isEmpty(value)) {
             video = value.split("\n", 1)[0];
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index a92bb8875..1ff8a6b7f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -505,7 +505,7 @@ public class AppDetailsRecyclerViewAdapter
                         suggestedApk.versionName).toUpperCase(locale));
                 sbWhatsNew.append("\n\n");
                 sbWhatsNew.append(app.whatsNew);
-                whatsNewView.setText(sbWhatsNew);
+                whatsNewView.setText(trimTrailingNewlines(sbWhatsNew));
                 whatsNewView.setVisibility(View.VISIBLE);
 
                 // Set focus on the header section to prevent auto scrolling to
@@ -540,17 +540,15 @@ public class AppDetailsRecyclerViewAdapter
             });
             if (app.antiFeatures != null && app.antiFeatures.length > 0) {
                 StringBuilder sb = new StringBuilder();
-                sb.append("<ul>");
                 for (String af : app.antiFeatures) {
                     String afdesc = descAntiFeature(af);
-                    sb.append("<li><div><a href=\"https://f-droid.org/wiki/page/Antifeature:")
+                    sb.append("<p><a href=\"https://f-droid.org/wiki/page/Antifeature:")
                             .append(af)
                             .append("\">")
                             .append(afdesc)
-                            .append("</a></div></li>");
+                            .append("</a></p>");
                 }
-                sb.append("</ul>");
-                antiFeaturesView.setText(Html.fromHtml(sb.toString()));
+                antiFeaturesView.setText(trimTrailingNewlines(Html.fromHtml(sb.toString())));
                 antiFeaturesView.setMovementMethod(LinkMovementMethod.getInstance());
             } else {
                 antiFeaturesView.setVisibility(View.GONE);
@@ -1093,7 +1091,7 @@ public class AppDetailsRecyclerViewAdapter
             Repo repo = RepoProvider.Helper.findById(context, apk.repoId);
             if (repo != null) {
                 repository.setVisibility(View.VISIBLE);
-                repository.setText("Repository: " + repo.getName());
+                repository.setText(String.format(repo.getName(), context.getString(R.string.app_repository)));
             } else {
                 repository.setVisibility(View.INVISIBLE);
             }
@@ -1170,7 +1168,7 @@ public class AppDetailsRecyclerViewAdapter
         }
 
         private String getApiText(final Apk apk) {
-            String apiText = "Version: ";
+            String apiText = "Android: ";
             if (apk.minSdkVersion > 0 && apk.maxSdkVersion < Apk.SDK_VERSION_MAX_VALUE) {
                 apiText += context.getString(R.string.minsdk_up_to_maxsdk,
                         Utils.getAndroidVersionName(apk.minSdkVersion),
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
index 15cf1b6d6..5a93e3e93 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
@@ -138,6 +138,7 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     public void toggleAllUpdateableApps() {
         showAllUpdateableApps = !showAllUpdateableApps;
         populateItems();
+        notifyDataSetChanged();
     }
 
     /**
diff --git a/app/src/main/res/drawable/app_tag_new_background.xml b/app/src/main/res/drawable/app_tag_new_background.xml
deleted file mode 100644
index 1819a007e..000000000
--- a/app/src/main/res/drawable/app_tag_new_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="4dp" />
-    <solid android:color="#ffeff4f9" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/details_panel_donate_background_dark.xml b/app/src/main/res/drawable/details_panel_donate_background_dark.xml
index 722e251c6..34aefb95a 100644
--- a/app/src/main/res/drawable/details_panel_donate_background_dark.xml
+++ b/app/src/main/res/drawable/details_panel_donate_background_dark.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
     <solid android:color="#3c3c3e" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/details_panel_donate_background_light.xml b/app/src/main/res/drawable/details_panel_donate_background_light.xml
index aed890e90..229c42b8b 100644
--- a/app/src/main/res/drawable/details_panel_donate_background_light.xml
+++ b/app/src/main/res/drawable/details_panel_donate_background_light.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
     <solid android:color="#eff4f9" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/details_panel_donate_background_night.xml b/app/src/main/res/drawable/details_panel_donate_background_night.xml
index 544639559..261466f71 100644
--- a/app/src/main/res/drawable/details_panel_donate_background_night.xml
+++ b/app/src/main/res/drawable/details_panel_donate_background_night.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
     <solid android:color="#262627" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index b525cd58e..fb0805bc2 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -12,13 +12,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="8dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
@@ -77,7 +77,6 @@
                         android:textAppearance="@style/DetailsLastUpdatedStyle"
                         android:textColor="@android:color/darker_gray"
                         tools:text="Update released 12 days ago" />
-
                 </LinearLayout>
             </RelativeLayout>
 
@@ -86,10 +85,6 @@
                 android:id="@+id/progress_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/icon_and_name"
                 tools:visibility="gone">
 
@@ -120,7 +115,7 @@
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/progress_cancel"
                     android:layout_toStartOf="@id/progress_cancel"
-                    android:text=""
+                    tools:text="500%"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
                 <ProgressBar
@@ -141,10 +136,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/icon_and_name"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
                 android:paddingBottom="2dp"
                 android:clipToPadding="false"
                 android:visibility="visible"
@@ -178,32 +169,48 @@
             android:id="@+id/whats_new"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:layout_marginTop="8dp"
             android:paddingStart="8dp"
             android:paddingLeft="8dp"
             android:paddingEnd="8dp"
             android:paddingRight="8dp"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:background="?attr/detailPanel"
             tools:text="NEW IN VERSION 1.0.2233\n\nA lot has happened since the last build:\n\n\t• Improved UI\n\t• Bug fixes" />
 
         <TextView
             android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:scrollbars="none"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textIsSelectable="true"
             tools:text="This is the app description of this awezome app. It can be several lines long, but will be truncated at just a few if it is. A 'read more' button will appear so that you can expand the view and view the full text, if you wish. Yes, it will be blue and beautiful." />
 
+        <TextView
+            android:id="@+id/anti_features_warning"
+            style="@style/DetailsAntiFeaturesWarningStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:text="@string/antifeatureswarning"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:drawableStart="?attr/antiFeaturesWarning"
+            android:drawableLeft="?attr/antiFeaturesWarning"
+            android:drawablePadding="10dp"
+            android:gravity="center_vertical" />
+
         <TextView
             android:id="@+id/label_anti_features"
             android:layout_width="match_parent"
@@ -214,10 +221,10 @@
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
             android:scrollbars="none"
+            android:text="@string/antifeatures"
             android:textStyle="bold"
             android:textAllCaps="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:text="@string/antifeatures" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
         <TextView
             android:id="@+id/text_anti_features"
@@ -229,39 +236,17 @@
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
             android:scrollbars="none"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            tools:text="\t• This app tracks and reports your activity." />
+            tools:text="\t• This app tracks and reports your activity."
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
         <android.support.v7.widget.AppCompatTextView
             android:id="@+id/description_more"
-            style="@style/DetailsMoreButtonStyle"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:gravity="end"
+            android:gravity="center"
             android:text="@string/more"
             android:textAllCaps="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            tools:text="more" />
-
-        <TextView
-            android:id="@+id/anti_features_warning"
-            style="@style/DetailsAntiFeaturesWarningStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:drawableStart="?attr/antiFeaturesWarning"
-            android:drawableLeft="?attr/antiFeaturesWarning"
-            android:gravity="center_vertical"
-            android:drawablePadding="10dp"
-            android:text="@string/antifeatureswarning" />
-
+            style="@style/DetailsMoreButtonStyle" />
     </LinearLayout>
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 794110c1e..8bd5fc2a7 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -41,9 +41,6 @@
                     android:layout_height="match_parent"
                     android:paddingTop="3dp">
 
-                    <include layout="@layout/app_status_suggested"
-                        android:id="@+id/status_suggested" />
-
                     <TextView android:id="@+id/status_installed"
                         style="@style/AppVersionStatus"
                         android:background="@drawable/app_version_item_status_installed"
@@ -51,6 +48,9 @@
                         android:textStyle="bold"
                         android:text="@string/app_installed" />
 
+                    <include layout="@layout/app_status_suggested"
+                        android:id="@+id/status_suggested" />
+
                     <TextView android:id="@+id/status_incompatible"
                         style="@style/AppVersionStatus"
                         android:background="@drawable/app_version_item_status_incompatible"
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index 00c855c45..a29eea61f 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -4,85 +4,84 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?appDetailsCardBackground">
 
     <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
          when it will inevitably read out the name of the app straight after. -->
     <ImageView
         android:id="@+id/icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        tools:src="@drawable/ic_launcher"
-        android:scaleType="fitCenter"
-        android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        tools:ignore="ContentDescription" />
+        android:layout_marginBottom="8dp"
+        android:scaleType="fitCenter"
+        tools:src="@drawable/ic_launcher"
+        tools:ignore="ContentDescription"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
-    <TextView
-        android:id="@+id/app_name"
+    <LinearLayout
+        android:id="@+id/text_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:text="F-Droid Application manager with a long name that will wrap and then ellipsize"
-        android:textSize="16sp"
-        android:textColor="?attr/installedApps"
-        android:maxLines="2"
-        android:ellipsize="end"
+        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/action_button"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintVertical_bias="0.333" />
+        app:layout_constraintBottom_toTopOf="@id/progress_bar"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="@string/app_list_download_ready"
-        style="@style/AppListItemStatusText"
-        app:layout_constraintTop_toBottomOf="@+id/app_name"
-        app:layout_constraintStart_toEndOf="@+id/icon"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:visibility="gone"
-        tools:visibility="visible"/>
+        <TextView
+            android:id="@+id/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="F-Droid Application manager with a long name that will wrap and then ellipsize"
+            android:textSize="16sp"
+            android:textColor="?attr/installedApps"
+            android:maxLines="2"
+            android:ellipsize="end" />
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="@string/app_list_download_ready"
+            style="@style/AppListItemStatusText"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/progress_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:visibility="gone"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintTop_toBottomOf="@+id/app_name"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/cancel_button"
-        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:visibility="visible" />
 
     <ImageButton
         android:id="@+id/cancel_button"
-        android:contentDescription="@string/cancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_cancel"
+        android:contentDescription="@string/cancel"
         android:background="@android:color/transparent"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/progress_bar"
         app:layout_constraintBottom_toBottomOf="@+id/progress_bar"
-        android:visibility="gone"
         tools:visibility="visible" />
 
     <Button
@@ -94,9 +93,9 @@
         android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Update" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index b7542efc8..158198273 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -25,13 +25,13 @@
         android:id="@+id/text_apps_to_update"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:text="SAnd, Birthday Droid, Dados D, Other app, Another app"
-        android:maxLines="1"
-        android:ellipsize="end"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        tools:text="SAnd, Birthday Droid, Dados D, Other app, Another app"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button_download_all"
         app:layout_constraintTop_toBottomOf="@+id/text_updates_available" />
@@ -40,11 +40,10 @@
         android:id="@+id/button_download_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:text="Update all"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:textAllCaps="true"
-        android:contentDescription="@string/updates__tts__download_updates_for_all_apps"
+        android:text="@string/updates__tts__download_updates_for_all_apps"
         style="@style/DetailsPrimaryButtonStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_updates_available"
@@ -52,7 +51,7 @@
 
     <Button
         android:id="@+id/button_toggle_apps_to_update"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 330a97126..ec4252413 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="app__install_downloaded_update">Update</string>
     <string name="app_installed_media">File installed to %s</string>
     <string name="app_permission_storage">F-Droid needs the storage permission to install this to storage. Please allow it on the next screen to proceed with installation.</string>
+    <string name="app_repository">Repository: %1$s</string>
     <string name="app_size">Size: %1$s</string>
 
     <string name="app_list__name__downloading_in_progress">Downloading %1$s</string>
@@ -116,15 +117,15 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="send_installed_apps_csv">Apps installed by F-Droid as CSV file</string>
     <string name="installed_app__updates_ignored">Updates ignored</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Updates ignored for Version %1$s</string>
-    <!-- The inline download button shown in the "Updates" screen only uses an icon and so requires
-    some descriptive text for the TTS engine -->
-    <string name="updates__tts__download_app">Download</string>
-    <string name="updates__tts__download_updates_for_all_apps">Download all updates</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">We found a vulnerability with %1$s. We recommend uninstalling this app immediately.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">We found a vulnerability with %1$s. We recommend upgrading to the newest version immediately.</string>
     <string name="updates__app_with_known_vulnerability__ignore">Ignore</string>
 
+    <!-- The inline download button shown in the "Updates" screen only uses an icon and so requires
+    some descriptive text for the TTS engine -->
+    <string name="updates__tts__download_app">Download</string>
+    <string name="updates__tts__download_updates_for_all_apps">Update all</string>
     <string name="updates__hide_updateable_apps">Hide apps</string>
     <string name="updates__show_updateable_apps">Show apps</string>
     <plurals name="updates__download_updates_for_apps">
diff --git a/app/src/main/res/values/styles_detail.xml b/app/src/main/res/values/styles_detail.xml
index e53871d17..41d339cb7 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -29,8 +29,8 @@
     </style>
 
     <style name="DetailsMoreButtonStyle">
-        <item name="android:padding">5dp</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/fdroid_blue</item>
     </style>

From 85ed0d46abcf5a4c8f9b6464a35de21d809acef3 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 17 Oct 2018 03:31:04 +0900
Subject: [PATCH 5/6] string changes

---
 app/src/main/res/layout-v14/app_status_new.xml | 2 +-
 app/src/main/res/layout/updates_header.xml     | 2 +-
 app/src/main/res/values-af/strings.xml         | 7 ++-----
 app/src/main/res/values-ar/strings.xml         | 7 ++-----
 app/src/main/res/values-ast/strings.xml        | 7 ++-----
 app/src/main/res/values-be/strings.xml         | 7 ++-----
 app/src/main/res/values-bg/strings.xml         | 7 ++-----
 app/src/main/res/values-bo/strings.xml         | 7 ++-----
 app/src/main/res/values-ca/strings.xml         | 7 ++-----
 app/src/main/res/values-cs/strings.xml         | 7 ++-----
 app/src/main/res/values-da/strings.xml         | 7 ++-----
 app/src/main/res/values-de/strings.xml         | 7 ++-----
 app/src/main/res/values-el/strings.xml         | 7 ++-----
 app/src/main/res/values-eo/strings.xml         | 7 ++-----
 app/src/main/res/values-es/strings.xml         | 7 ++-----
 app/src/main/res/values-et/strings.xml         | 7 ++-----
 app/src/main/res/values-eu/strings.xml         | 7 ++-----
 app/src/main/res/values-fa/strings.xml         | 7 ++-----
 app/src/main/res/values-fi/strings.xml         | 7 ++-----
 app/src/main/res/values-fr/strings.xml         | 7 ++-----
 app/src/main/res/values-gl/strings.xml         | 7 ++-----
 app/src/main/res/values-he/strings.xml         | 7 ++-----
 app/src/main/res/values-hr/strings.xml         | 3 ---
 app/src/main/res/values-hu/strings.xml         | 7 ++-----
 app/src/main/res/values-hy/strings.xml         | 4 +---
 app/src/main/res/values-id/strings.xml         | 7 ++-----
 app/src/main/res/values-is/strings.xml         | 7 ++-----
 app/src/main/res/values-it/strings.xml         | 7 ++-----
 app/src/main/res/values-ja/strings.xml         | 7 ++-----
 app/src/main/res/values-kab/strings.xml        | 4 +---
 app/src/main/res/values-kn/strings.xml         | 2 +-
 app/src/main/res/values-ko/strings.xml         | 7 ++-----
 app/src/main/res/values-lt/strings.xml         | 4 ++--
 app/src/main/res/values-lv/strings.xml         | 2 +-
 app/src/main/res/values-ml/strings.xml         | 7 ++-----
 app/src/main/res/values-my/strings.xml         | 7 ++-----
 app/src/main/res/values-nb/strings.xml         | 7 ++-----
 app/src/main/res/values-nl-rBE/strings.xml     | 7 ++-----
 app/src/main/res/values-nl/strings.xml         | 7 ++-----
 app/src/main/res/values-pl/strings.xml         | 7 ++-----
 app/src/main/res/values-pt-rBR/strings.xml     | 7 ++-----
 app/src/main/res/values-pt-rPT/strings.xml     | 7 ++-----
 app/src/main/res/values-ro/strings.xml         | 9 +++------
 app/src/main/res/values-ru/strings.xml         | 7 ++-----
 app/src/main/res/values-sc/strings.xml         | 7 ++-----
 app/src/main/res/values-sk/strings.xml         | 7 ++-----
 app/src/main/res/values-sl/strings.xml         | 6 ++----
 app/src/main/res/values-sn/strings.xml         | 7 ++-----
 app/src/main/res/values-sq/strings.xml         | 7 ++-----
 app/src/main/res/values-sr/strings.xml         | 7 ++-----
 app/src/main/res/values-sv/strings.xml         | 7 ++-----
 app/src/main/res/values-te/strings.xml         | 7 ++-----
 app/src/main/res/values-th/strings.xml         | 3 ---
 app/src/main/res/values-tr/strings.xml         | 7 ++-----
 app/src/main/res/values-ug/strings.xml         | 4 ++--
 app/src/main/res/values-uk/strings.xml         | 7 ++-----
 app/src/main/res/values-vi/strings.xml         | 7 ++-----
 app/src/main/res/values-zh-rCN/strings.xml     | 7 ++-----
 app/src/main/res/values-zh-rHK/strings.xml     | 7 ++-----
 app/src/main/res/values-zh-rTW/strings.xml     | 7 ++-----
 app/src/main/res/values/donottranslate.xml     | 3 +++
 app/src/main/res/values/strings.xml            | 7 ++-----
 62 files changed, 116 insertions(+), 275 deletions(-)

diff --git a/app/src/main/res/layout-v14/app_status_new.xml b/app/src/main/res/layout-v14/app_status_new.xml
index ade122b9e..e62430417 100644
--- a/app/src/main/res/layout-v14/app_status_new.xml
+++ b/app/src/main/res/layout-v14/app_status_new.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@drawable/app_version_item_status_new"
-    android:text="@string/app__newly_added"
+    android:text="@string/app_new"
     android:textColor="#429fff"
     style="@style/AppVersionStatus" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 158198273..788db5f76 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -43,7 +43,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
         android:textAllCaps="true"
-        android:text="@string/updates__tts__download_updates_for_all_apps"
+        android:text="@string/update_all"
         style="@style/DetailsPrimaryButtonStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_updates_available"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 0c9c7359b..8198829bd 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -197,9 +197,6 @@
     <string name="repo_searching_address">Op soek na F-Droid argief by
         %1$s
     </string>
-    <string name="minsdk_or_later">%s of later</string>
-    <string name="up_to_maxsdk">Tot %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s tot %2$s</string>
     <string name="not_on_same_wifi">"Jou toestel is nie op die dieselfde Wi-Fi as die plaaslike argief jy nou net gelaai
         het nie! Probeer hierdie netwerk aansluiting by: %s"
     </string>
@@ -382,7 +379,7 @@
     <string name="notification_action_install">Installeer</string>
 
 <string name="app_recommended_version_installed">Weergawe %1$s (aanbeveel)</string>
-    <string name="app__newly_added">Nuwe</string>
+    <string name="app_new">Nuwe</string>
     <string name="app__tts__cancel_download">Kanselleer aflaai</string>
     <string name="app__install_downloaded_update">Opdateer</string>
 
@@ -393,7 +390,7 @@
     <string name="installed_app__updates_ignored">Opdaterings geïgnoreer</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Opdaterings vir weergawe %1$s geïgnoreer</string>
     <string name="updates__tts__download_app">Aflaai</string>
-    <string name="updates__tts__download_updates_for_all_apps">Laai alle opdaterings af</string>
+    <string name="update_all">Laai alle opdaterings af</string>
 
     <string name="updates__hide_updateable_apps">Verberg programme</string>
     <string name="updates__show_updateable_apps">Wys programme</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index d89f788b0..bb7fcd289 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -183,9 +183,6 @@
     <string name="repo_added">مستودع الحزمة المحفوظة %1$s.</string>
     <string name="repo_searching_address">ابحث عن مستودع الحزمة في
 \n%1$s</string>
-    <string name="minsdk_or_later">%s أو فيما بعد</string>
-    <string name="up_to_maxsdk">حتى %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s حتى %2$s</string>
     <string name="not_on_same_wifi">جهازك ليس على الإنترنت اللاسلكي نفسه مع المستودع المحلي الذي قمت بإضافتها فقط! حاول
         الانضمام إلى هذه الشبكة: %s
     </string>
@@ -347,11 +344,11 @@
     <string name="app_version_x_available">النسخة %1$s متوفر</string>
     <string name="app_version_x_installed">النسخة %1$s</string>
     <string name="app_recommended_version_installed">النسخة %1$s (مُستحب)</string>
-    <string name="app__newly_added">جديد</string>
+    <string name="app_new">جديد</string>
     <string name="app__install_downloaded_update">تحديث</string>
 
     <string name="app_list__name__downloading_in_progress">تنزيل %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">قم بتنزيل كل التحديثات</string>
+    <string name="update_all">قم بتنزيل كل التحديثات</string>
 
     <string name="updates__hide_updateable_apps">إخفاء التطبيقات</string>
     <string name="updates__show_updateable_apps">أظهر التطبيقات</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index dd9deebdc..6d141f94e 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -123,9 +123,6 @@
     <string name="repo_added">Guardóse\'l repositoriu d e paquetes %1$s.</string>
     <string name="repo_searching_address">Guetando\'l repositoriu de paquetes en
 \n%1$s</string>
-    <string name="minsdk_or_later">%s ó posterior</string>
-    <string name="up_to_maxsdk">Fasta %s</string>
-    <string name="minsdk_up_to_maxsdk">De %1$s fasta %2$s</string>
     <string name="not_on_same_wifi">¡El to preséu nun ta na mesma rede Wi-Fi que\'l repositoriu llocal que tas acabante
         d\'amestar! Tenta de xunite a esta rede: %s
     </string>
@@ -346,7 +343,7 @@
 
     <string name="app_list__name__successfully_installed">instalóse %1$s</string>
     <string name="updates__tts__download_app">Baxar</string>
-    <string name="updates__tts__download_updates_for_all_apps">Baxar tolos anovamientos</string>
+    <string name="update_all">Baxar tolos anovamientos</string>
 
     <string name="updates__hide_updateable_apps">Anubrir aplicaciones</string>
     <string name="updates__show_updateable_apps">Amosar aplicaciones</string>
@@ -387,7 +384,7 @@
     <string name="by_author_format">per %s</string>
     <string name="force_old_index">Forzar l\'antiguu formatu d\'índiz</string>
     <string name="force_old_index_summary">En casu d\'haber fallos o problemes de compatibilidá, usa l\'índiz XML de la app</string>
-    <string name="app__newly_added">Nueva</string>
+    <string name="app_new">Nueva</string>
     <string name="app__tts__cancel_download">Encaboxar descarga</string>
     <string name="menu_email">Mandar un corréu al autor</string>
     <string name="menu_video">Videu</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 90756527e..6ddeafaa5 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -204,9 +204,6 @@
     </string>
     <string name="repo_added">Рэпазіторый пакетаў %1$s захаваны.</string>
     <string name="repo_searching_address">Агляд рэпазіторыя пакетаў на %1$s</string>
-    <string name="minsdk_or_later">%s ці пазней</string>
-    <string name="up_to_maxsdk">Да %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s да %2$s</string>
     <string name="not_on_same_wifi">Ваша прылада не знаходзіцца ў той жа сетцы Wi-Fi, што і лакальны рэпазіторый, які вы
         толькі дадалі. Паспрабуйце далучыцца да сеткі «%s»
     </string>
@@ -376,7 +373,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">Версія %1$s (рэкамендуецца)</string>
-    <string name="app__newly_added">Новая</string>
+    <string name="app_new">Новая</string>
 
     <string name="installed_apps__activity_title">Усталяваныя праграмы</string>
     <string name="installed_app__updates_ignored">Абнаўленні ігнаруюцца</string>
@@ -399,7 +396,7 @@
     <string name="app_list__name__downloading_in_progress">Спампоўка %1$s</string>
 
     <string name="updates__tts__download_app">Спампаваць</string>
-    <string name="updates__tts__download_updates_for_all_apps">Спампаваць усе абнаўленні</string>
+    <string name="update_all">Спампаваць усе абнаўленні</string>
 
     <string name="updates__hide_updateable_apps">Схаваць праграмы</string>
     <string name="updates__show_updateable_apps">Паказаць праграмы</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 92391784f..af7a00724 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -109,8 +109,6 @@
     <string name="repo_disabled_notification">\"%1$s\" е деактивирано. За да инсталирате приложения от него ще трябва да
         го активирате наново.
     </string>
-    <string name="up_to_maxsdk">До %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s до %2$s</string>
     <string name="not_on_same_wifi">Вашето устройство не е в една и съща Wi-Fi мрежа с локалното хранилище, което
         добавихте! Опитайте да се свържете към тази мрежа: %s
     </string>
@@ -275,7 +273,6 @@
     <string name="unverified">Непотвърдено</string>
     <string name="unsigned_description">Това означава че списъкът на приложенията не е бил потвърден. Бъдете внимателни с приложения, изтеглени от неудостоверени индекси.</string>
     <string name="unknown">Неизвестно</string>
-    <string name="minsdk_or_later">%s или по-късно</string>
     <string name="wifi_ap">Хотспот</string>
 
     <string name="swap_join_this_hotspot">Помогнете на приятеля Ви да се включи към хотспота Ви</string>
@@ -311,7 +308,7 @@
     <string name="app_version_x_available">Версия %1$s е достъпна</string>
     <string name="app_version_x_installed">Версия %1$s</string>
     <string name="app_recommended_version_installed">Версия %1$s (Препоръчителна)</string>
-    <string name="app__newly_added">Ново</string>
+    <string name="app_new">Ново</string>
     <string name="app__install_downloaded_update">Обновяване</string>
 
     <string name="app_list__name__downloading_in_progress">Изтегляне на %1$s</string>
@@ -321,7 +318,7 @@
     <string name="installed_app__updates_ignored">Обновленията са отхвърлени</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Обновленията са отхвърлени за версия %1$s
     </string>
-    <string name="updates__tts__download_updates_for_all_apps">Изтегляне на всички обновления</string>
+    <string name="update_all">Изтегляне на всички обновления</string>
 
     <string name="updates__hide_updateable_apps">Скриване на приложения</string>
     <string name="updates__show_updateable_apps">Показване на приложения</string>
diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml
index 70179e9c3..33c4fe15c 100644
--- a/app/src/main/res/values-bo/strings.xml
+++ b/app/src/main/res/values-bo/strings.xml
@@ -119,7 +119,7 @@
     <string name="app_version_x_available">ཐོན་རིམ་ %1$s ཡོད།</string>
     <string name="app_version_x_installed">ཐོན་རིམ་ %1$s</string>
     <string name="app_recommended_version_installed">ཐོན་རིམ་ %1$s (ངོ་སྤྲོད།)</string>
-    <string name="app__newly_added">གསར་པ།</string>
+    <string name="app_new">གསར་པ།</string>
     <string name="added_on">%sའདིའི་སྒང་ལ་ཁ་སྣོན།</string>
     <string name="app__tts__cancel_download">ཕབ་ལེན་བརྩི་མེད།</string>
     <string name="app__install_downloaded_update">གསར་བསྒྱུར།</string>
@@ -129,7 +129,7 @@
     <string name="installed_apps__activity_title">མཉེན་ཆས་ཁག་འགྲིག་བཅུག</string>
     <string name="installed_app__updates_ignored">གསར་བསྒྱུར་ཁག་ལ་ཡ་བྱས་མ་སོང་།</string>
     <string name="installed_app__updates_ignored_for_suggested_version">ཐོན་རིམ་ %1$s འདིའི་གསར་བསྒྱུར་ཁག་ལ་ཡ་བྱས་ན་སོང་།</string>
-    <string name="updates__tts__download_updates_for_all_apps">གསར་བསྒྱུར་ཚང་མ་ཕབ་ལེན་བྱེད།</string>
+    <string name="update_all">གསར་བསྒྱུར་ཚང་མ་ཕབ་ལེན་བྱེད།</string>
 
     <string name="updates__hide_updateable_apps">མཉེན་ཆས་སྦས།</string>
     <string name="updates__show_updateable_apps">མཉེན་ཆས་སྟོན།</string>
@@ -240,9 +240,6 @@
     <string name="repo_added">ཨེཕ་རོཌ་མཛོད་ཁང་ཉར་ཚགས་%1$s</string>
     <string name="repo_searching_address">ཨེཕ་རོཌ་མཛོད་ཁང་འདི་ནས་་འཚོལ། 
 \n%1$s</string>
-    <string name="minsdk_or_later">%s ཡང་ན་རྗེས་ལ།</string>
-    <string name="up_to_maxsdk">%s འདི་བར།</string>
-    <string name="minsdk_up_to_maxsdk">%1$s འདི་ནས་དེའི་བར་དུ། %2$s</string>
     <string name="requires_features">དགོས་མཁོ་:%1$s</string>
     <string name="wifi_ap">དྲྭ་འཛོམས།</string>
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index f78d0c23e..81da23043 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -117,9 +117,6 @@
     <string name="repo_added">S\'ha desat el dipòsit %1$s del paquet.</string>
     <string name="repo_searching_address">S\'està cercant un dipòsit del paquet a 
 \n%1$s</string>
-    <string name="minsdk_or_later">%s o més recent</string>
-    <string name="up_to_maxsdk">Fins a %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s fins a %2$s</string>
     <string name="not_on_same_wifi">El dipòsit local que acabeu d\'afegir i el vostre dispositiu no són a la mateixa
         Wi-Fi. Proveu amb aquesta xarxa: %s
     </string>
@@ -343,7 +340,7 @@
     <string name="notification_action_install">Instal·leu</string>
 
     <string name="app_recommended_version_installed">Versió %1$s (Recomanada)</string>
-    <string name="app__newly_added">Nou</string>
+    <string name="app_new">Nou</string>
 
     <string name="installed_apps__activity_title">Aplicacions instal·lades</string>
     <string name="installed_app__updates_ignored">Ignoreu les actualitzacions</string>
@@ -366,7 +363,7 @@
     <string name="app_list__name__downloading_in_progress">Baixant %1$s</string>
 
     <string name="updates__tts__download_app">Baixa</string>
-    <string name="updates__tts__download_updates_for_all_apps">Baixa totes les actualitzacions</string>
+    <string name="update_all">Baixa totes les actualitzacions</string>
 
     <string name="updates__hide_updateable_apps">Amaga</string>
     <string name="updates__show_updateable_apps">Mostra</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4de858cce..7d63638b8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -97,7 +97,6 @@
 
         Pro instalaci aplikací z tohoto repozitáře ho bude nejprve třeba znovu povolit.
     </string>
-    <string name="minsdk_or_later">%s nebo novější</string>
     <string name="requires_features">Vyžaduje: %1$s</string>
     <string name="category_Development">Vývoj</string>
     <string name="category_Games">Hry</string>
@@ -169,8 +168,6 @@
     <string name="repo_added">Uložen repozitář balíčků %1$s.</string>
     <string name="repo_searching_address">Vyhledávání repozitáře balíčků na
 \n%1$s</string>
-    <string name="up_to_maxsdk">Až do %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s až do %2$s</string>
     <string name="login_title">Vyžadováno ověření</string>
     <string name="login_name">Uživatelské jméno</string>
     <string name="login_password">Heslo</string>
@@ -357,7 +354,7 @@
     <string name="notification_action_install">Nainstalovat</string>
 
     <string name="app_recommended_version_installed">Verze %1$s (doporučeno)</string>
-    <string name="app__newly_added">Nové</string>
+    <string name="app_new">Nové</string>
 
     <string name="installed_apps__activity_title">Nainstalované aplikace</string>
     <string name="installed_app__updates_ignored">Ignorované aktualizace</string>
@@ -376,7 +373,7 @@
     <string name="app_list__name__downloading_in_progress">Stahování %1$s</string>
 
     <string name="updates__tts__download_app">Stáhnout</string>
-    <string name="updates__tts__download_updates_for_all_apps">Stáhnout všechny aktualizace</string>
+    <string name="update_all">Stáhnout všechny aktualizace</string>
 
 <string name="app_list__name__successfully_installed">%1$s nainstalováno</string>
     <string name="by_author_format">od %s</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 05b5fd3cf..3b5d464f2 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -165,9 +165,6 @@
 \nDu skal genaktivere dette depot for at installere apps fra det.</string>
     <string name="repo_added">Gemte F-Droid depot %1$s.</string>
     <string name="repo_searching_address">Leder efter F-Droid depot på\n%1$s</string>
-    <string name="minsdk_or_later">%s eller nyere</string>
-    <string name="up_to_maxsdk">Op til %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s op til %2$s</string>
     <string name="not_on_same_wifi">Din enhed er ikke på samme Wi-Fi som det lokale depot du lige tilføjede! Prøv at
         tilslutte dig dette netværk: %s
     </string>
@@ -337,14 +334,14 @@
     <string name="app_version_x_available">Version %1$s tilgængelig</string>
     <string name="app_version_x_installed">Version %1$s</string>
     <string name="app_recommended_version_installed">Version %1$s (Anbefalet)</string>
-    <string name="app__newly_added">Nyhed</string>
+    <string name="app_new">Nyhed</string>
     <string name="app__tts__cancel_download">Stop download</string>
     <string name="app__install_downloaded_update">Opdatér</string>
 
     <string name="installed_apps__activity_title">Installerede Apps</string>
     <string name="installed_app__updates_ignored">Opdateringer ignoreres</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Opdateringer ignoreres for version %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Hent alle opdateringer</string>
+    <string name="update_all">Hent alle opdateringer</string>
 
     <string name="updates__hide_updateable_apps">Skjul apps</string>
     <string name="updates__show_updateable_apps">Vis apps</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fbc2c1079..7dc074130 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,9 +121,6 @@
     <string name="repo_added">Paketquelle %1$s gespeichert.</string>
     <string name="repo_searching_address">Nach Paketquelle wird gesucht unter
 \n%1$s</string>
-    <string name="minsdk_or_later">%s oder später</string>
-    <string name="up_to_maxsdk">Bis zu %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s bis zu %2$s</string>
     <string name="not_on_same_wifi">Dieses Gerät befindet sich nicht im selben WLAN, wie die eben hinzugefügte
         Paketquelle! Versuchen Sie sich mit dem folgenden Netzwerk zu verbinden: %s
     </string>
@@ -354,7 +351,7 @@
 
     <string name="main_menu__swap_nearby">Nah</string>
     <string name="app_recommended_version_installed">Version %1$s (Empfohlen)</string>
-    <string name="app__newly_added">Neu</string>
+    <string name="app_new">Neu</string>
 
     <string name="installed_apps__activity_title">Installierte Anwendungen</string>
     <string name="installed_app__updates_ignored">Ignorierte Aktualisierungen</string>
@@ -376,7 +373,7 @@
     <string name="app_list__name__downloading_in_progress">%1$s wird heruntergeladen</string>
 
     <string name="updates__tts__download_app">Herunterladen</string>
-    <string name="updates__tts__download_updates_for_all_apps">Alle Aktualisierungen herunterladen</string>
+    <string name="update_all">Alle Aktualisierungen herunterladen</string>
 
     <string name="updates__hide_updateable_apps">Anwendungen ausblenden</string>
     <string name="updates__show_updateable_apps">Anwendungen anzeigen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 618feec03..2486d3cc9 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -88,9 +88,6 @@
         Θα χρειαστεί
         να το ενεργοποιήσετε ξανά για να εγκαταστήσετε εφαρμογές από αυτό.
     </string>
-    <string name="minsdk_or_later">%s ή αργότερα</string>
-    <string name="up_to_maxsdk">Μέχρι %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s μέχρι %2$s</string>
     <string name="not_on_same_wifi">Η συσκευή σας δεν είναι στο ίδιο ασύρματο δίκτυο με το τοπικό αποθετήριο που μόλις
         προσθέσατε! Δοκιμάστε να συνδεθείτε σε αυτό το δίκτυο: %s
     </string>
@@ -343,14 +340,14 @@
     <string name="app_version_x_available">Η Έκδοση %1$s είναι διαθέσιμη</string>
     <string name="app_version_x_installed">Έκδοση %1$s</string>
     <string name="app_recommended_version_installed">Έκδοση %1$s (Συνιστάται)</string>
-    <string name="app__newly_added">Νέα</string>
+    <string name="app_new">Νέα</string>
     <string name="app__tts__cancel_download">Ακύρωση λήψης</string>
     <string name="app__install_downloaded_update">Ενημέρωση</string>
 
     <string name="installed_apps__activity_title">Εγκατεστημένες εφαρμογές</string>
     <string name="installed_app__updates_ignored">Οι ενημερώσεις αγνοήθηκαν</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Οι ενημερώσεις αγνοήθηκαν για την Έκδοση %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Λήψη όλων των ενημερώσεων</string>
+    <string name="update_all">Λήψη όλων των ενημερώσεων</string>
 
     <string name="updates__hide_updateable_apps">Απόκρυψη εφαρμογών</string>
     <string name="updates__show_updateable_apps">Προβολή εφαρμογών</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index f1aa2522e..e91c34d4f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -71,9 +71,6 @@
     <string name="repo_added">Konservis deponejon de pakaĵoj %1$s.</string>
     <string name="repo_searching_address">Serĉado de pakaĵa deponejo ĉe
 \n%1$s</string>
-    <string name="minsdk_or_later">%s aŭ posta</string>
-    <string name="up_to_maxsdk">Ĝis %s</string>
-    <string name="minsdk_up_to_maxsdk">De %1$s ĝis %2$s</string>
     <string name="requires_features">Postulas: %1$s</string>
     <string name="category_Development">Programado</string>
     <string name="category_Games">Ludoj</string>
@@ -354,7 +351,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">Versio %1$s (konsilinda)</string>
-    <string name="app__newly_added">Nova</string>
+    <string name="app_new">Nova</string>
 
     <string name="installed_apps__activity_title">Instalitaj aplikaĵoj</string>
     <string name="installed_app__updates_ignored">Ignorataj ĝisdatigoj</string>
@@ -375,7 +372,7 @@
     <string name="app_list__name__downloading_in_progress">Elŝutado de %1$s</string>
 
     <string name="updates__tts__download_app">Elŝuti</string>
-    <string name="updates__tts__download_updates_for_all_apps">Elŝuti ĉiujn ĝisdatigojn</string>
+    <string name="update_all">Elŝuti ĉiujn ĝisdatigojn</string>
 
     <string name="updates__hide_updateable_apps">Kaŝi aplikaĵojn</string>
     <string name="updates__show_updateable_apps">Montri aplikaĵojn</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 381b408f5..dd7bd1c8a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -125,9 +125,6 @@
     <string name="repo_added">Repositorio de paquetes guardado %1$s.</string>
     <string name="repo_searching_address">Buscando repositorio de paquetes en
 \n%1$s</string>
-    <string name="minsdk_or_later">%s o posterior</string>
-    <string name="up_to_maxsdk">Hasta %s</string>
-    <string name="minsdk_up_to_maxsdk">De %1$s a %2$s</string>
     <string name="not_on_same_wifi">¡Tu dispositivo no está en la misma Wi-Fi que el repo que acabas de añadir! Intenta
         unirte a esta red: %s
     </string>
@@ -357,7 +354,7 @@
     <string name="notification_action_install">Instalar</string>
 
     <string name="app_recommended_version_installed">Versión %1$s (Recomendada)</string>
-    <string name="app__newly_added">Novedad</string>
+    <string name="app_new">Novedad</string>
 
     <string name="installed_apps__activity_title">Aplicaciones instaladas</string>
     <string name="installed_app__updates_ignored">Actualizaciones ignoradas</string>
@@ -379,7 +376,7 @@
     <string name="app_list__name__downloading_in_progress">Descargando %1$s</string>
 
     <string name="updates__tts__download_app">Actualizaciones</string>
-    <string name="updates__tts__download_updates_for_all_apps">Descargar todas las actualizaciones</string>
+    <string name="update_all">Descargar todas las actualizaciones</string>
 
     <string name="updates__hide_updateable_apps">Ocultar apps</string>
     <string name="updates__show_updateable_apps">Mostrar apps</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ddaf2eb4b..e53bcf207 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -203,9 +203,6 @@
         ettevaatlik allkirjastamata indeksitest rakenduste alla laadimisel.
     </string>
     <string name="unknown">Tundmatu</string>
-    <string name="minsdk_or_later">%s või uuem</string>
-    <string name="up_to_maxsdk">Kuni %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s kuni %2$s</string>
     <string name="requires_features">Nõuab: %1$s</string>
     <string name="pref_language">Keel</string>
     <string name="pref_language_default">Süsteemi vaikesäte</string>
@@ -359,7 +356,7 @@
     <string name="app_version_x_available">Versioon %1$s on saadaval</string>
     <string name="app_version_x_installed">Versioon %1$s</string>
     <string name="app_recommended_version_installed">Versioon %1$s (soovitatav)</string>
-    <string name="app__newly_added">Uus</string>
+    <string name="app_new">Uus</string>
     <string name="app__tts__cancel_download">Tühista allalaadimine</string>
     <string name="app__install_downloaded_update">Värskenda</string>
     <string name="app_installed_media">Fail paigaldati asukohta %s</string>
@@ -373,7 +370,7 @@
     <string name="installed_apps__activity_title">Paigaldatud rakendused</string>
     <string name="installed_app__updates_ignored">Värskendusi ignoreeriti</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Versiooni %1$s värskendust ignoreeriti</string>
-    <string name="updates__tts__download_updates_for_all_apps">Laadi alla kõik värskendused</string>
+    <string name="update_all">Laadi alla kõik värskendused</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">%1$s sees leiti haavatavus. Soovitatav on see rakendus koheselt eemaldada.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">%1$s sees leiti haavatavus. Soovitatav on värskendada koheselt see rakendus uusimale versioonile.</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 2091fe028..e5eddbad3 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -175,9 +175,6 @@
     <string name="repo_added">%1$s pakete-biltegia gorde da.</string>
     <string name="repo_searching_address">Pakete-biltegia hemen bilatzen:
 \n%1$s</string>
-    <string name="minsdk_or_later">%s edo berriagoa</string>
-    <string name="up_to_maxsdk">%s arte</string>
-    <string name="minsdk_up_to_maxsdk">%1$stik %2$sra</string>
     <string name="pref_language">Hizkuntza</string>
     <string name="pref_language_default">Sistemaren lehenetsia</string>
 
@@ -375,7 +372,7 @@
 
 
     <string name="app_recommended_version_installed">%1$s bertsioa (Aholkatutakoa)</string>
-    <string name="app__newly_added">Berria</string>
+    <string name="app_new">Berria</string>
 
     <string name="installed_apps__activity_title">Instalatutako aplikazioak</string>
     <string name="installed_app__updates_ignored">Eguneraketak ezikusita</string>
@@ -397,7 +394,7 @@
     <string name="app_list__name__downloading_in_progress">%1$s deskargatzen</string>
 
     <string name="updates__tts__download_app">Deskargatu</string>
-    <string name="updates__tts__download_updates_for_all_apps">Deskargatu eguneraketa guztiak</string>
+    <string name="update_all">Deskargatu eguneraketa guztiak</string>
 
     <string name="updates__hide_updateable_apps">Ezkutatu aplikazioak</string>
     <string name="updates__show_updateable_apps">Erakutsi aplikazioak</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index ab679d443..3bf0681dd 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -54,9 +54,6 @@
     <string name="repo_name">نام</string>
     <string name="unsigned_description">این یعنی فهرست برنامه‌ها نتوانست تأیید شود. باید مراقب برنامه‌های بارگیری شده از فهرست های امضا نشده باشید.</string>
     <string name="unknown">ناشناخته</string>
-    <string name="minsdk_or_later">%s یا جدیدتر</string>
-    <string name="up_to_maxsdk">تا %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s تا %2$s</string>
     <string name="requires_features">نیاز دارد: %1$s</string>
     <string name="app_name">اف‌دروید</string>
 
@@ -313,7 +310,7 @@
     <string name="app_version_x_available">نگارش %1$s موجود است</string>
     <string name="app_version_x_installed">نگارش %1$s</string>
     <string name="app_recommended_version_installed">نگارش %1$s (توصیه شده)</string>
-    <string name="app__newly_added">جدید</string>
+    <string name="app_new">جدید</string>
     <string name="app__tts__cancel_download">لغو بارگیری</string>
     <string name="app__install_downloaded_update">به‌روز رسانی</string>
 
@@ -324,7 +321,7 @@
     <string name="installed_app__updates_ignored">صرف‌نظر از به‌روز رسانی</string>
     <string name="installed_app__updates_ignored_for_suggested_version">از به‌روز رسانی برای نگارش صرف‌نظر شده است %1$s</string>
     <string name="updates__tts__download_app">بارگیری</string>
-    <string name="updates__tts__download_updates_for_all_apps">بارگیری تمام به‌روز رسانی‌ها</string>
+    <string name="update_all">بارگیری تمام به‌روز رسانی‌ها</string>
 
     <string name="updates__hide_updateable_apps">مخفی کردن برنامه ها</string>
     <string name="updates__show_updateable_apps">نمایش برنامه ها</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e2c75e230..14d52c705 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -239,7 +239,6 @@
     <string name="repo_fingerprint">Allekirjoitusvarmenteen sormenjälki (SHA-256)</string>
     <string name="repo_searching_address">Etsitään sovelluslähdettä osoitteesta
 \n%1$s</string>
-    <string name="minsdk_or_later">%s tai uudempi</string>
     <string name="category_Connectivity">Liitettävyys</string>
     <string name="category_Graphics">Grafiikka</string>
     <string name="empty_installed_app_list">Ei asennettuja sovelluksia.
@@ -250,8 +249,6 @@
     <string name="empty_can_update_app_list">Onnittelut!
 \nKaikki sovelluksesi ovat ajan tasalla.</string>
     <string name="unsigned_description">Tämä tarkoittaa, että sovelluslistaa ei voitu tarkistaa. Ole varovainen ladatessasi sovelluksia varmentamattomista hakemistoista.</string>
-    <string name="up_to_maxsdk">Korkeintaan %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s - %2$s</string>
     <string name="empty_search_available_app_list">Haulla ei löytynyt tuloksia.</string>
     <string name="install_error_unknown">Asennus epäonnistui tuntemattoman virheen vuoksi</string>
     <string name="uninstall_error_unknown">Poistaminen epäonnistui tuntemattoman virheen vuoksi</string>
@@ -323,14 +320,14 @@
 <string name="app_version_x_available">Versio %1$s saatavilla</string>
     <string name="app_version_x_installed">Versio %1$s</string>
     <string name="app_recommended_version_installed">Versio %1$s (Suositeltu)</string>
-    <string name="app__newly_added">Uusi</string>
+    <string name="app_new">Uusi</string>
     <string name="app__install_downloaded_update">Päivitys</string>
 
     <string name="app_list__name__downloading_in_progress">Ladataan %1$s</string>
     <string name="app_list__name__successfully_installed">%1$s on asennettu</string>
 
     <string name="installed_apps__activity_title">Asennetut Sovellukset</string>
-    <string name="updates__tts__download_updates_for_all_apps">Lataa kaikki päivitykset</string>
+    <string name="update_all">Lataa kaikki päivitykset</string>
 
     <string name="updates__hide_updateable_apps">Piilota sovellukset</string>
     <string name="updates__show_updateable_apps">Näytä sovellukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 24f865134..997e24d5b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -118,9 +118,6 @@
     <string name="repo_disabled_notification">%1$s a été désactivé
 \n
 \nVous devez réactiver ce dépôt pour installer les applis qu\'il contient.</string>
-    <string name="minsdk_or_later">%s ou plus récent</string>
-    <string name="up_to_maxsdk">Jusqu\'à %s</string>
-    <string name="minsdk_up_to_maxsdk">De %1$s à %2$s</string>
     <string name="not_on_same_wifi">Votre appareil n\'est pas sur le même réseau Wi-Fi que le dépôt local que vous venez
         d\'ajouter ! Essayez de rejoindre ce réseau : %s
     </string>
@@ -349,7 +346,7 @@
 
 
     <string name="app_recommended_version_installed">Version %1$s (recommandée)</string>
-    <string name="app__newly_added">Nouveau</string>
+    <string name="app_new">Nouveau</string>
     <string name="app__install_downloaded_update">Mettre à jour</string>
 
     <string name="app_list__name__downloading_in_progress">Téléchargement de %1$s en cours</string>
@@ -359,7 +356,7 @@
     <string name="installed_app__updates_ignored">Mises à jour ignorées</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Mises à jour ignorées pour la version %1$s</string>
     <string name="updates__tts__download_app">Télécharger</string>
-    <string name="updates__tts__download_updates_for_all_apps">Télécharger toutes les mises jour</string>
+    <string name="update_all">Télécharger toutes les mises jour</string>
 
     <string name="updates__hide_updateable_apps">Masquer les applis</string>
     <string name="updates__show_updateable_apps">Afficher les applications</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index f5fafeae0..6ce21ed91 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -218,9 +218,6 @@
     </string>
     <string name="repo_added">Gardado o repositorio %1$s de F-Droid.</string>
     <string name="repo_searching_address">Buscando o repositorio F-Droid en\n%1$s</string>
-    <string name="minsdk_or_later">%s ou maior</string>
-    <string name="up_to_maxsdk">Por riba de %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s está por riba de %2$s</string>
     <string name="not_on_same_wifi">O teu dispositivo non está na mesma rede Wi-Fi que o repositorio local que
         engadiches! Intenta unirte á mesma rede: %s
     </string>
@@ -327,7 +324,7 @@
     <string name="app_version_x_available">Versión %1$s disponíbel</string>
     <string name="app_version_x_installed">Versión %1$s</string>
     <string name="app_recommended_version_installed">Versión %1$s (Recomendada)</string>
-    <string name="app__newly_added">Nova</string>
+    <string name="app_new">Nova</string>
     <string name="app__tts__cancel_download">Cancelar descarga</string>
     <string name="app__install_downloaded_update">Anovar</string>
     <string name="app_installed_media">Ficheiro instalado en %s</string>
@@ -339,7 +336,7 @@
     <string name="installed_apps__activity_title">Aplicacións instaladas</string>
     <string name="installed_app__updates_ignored">Anovacións ignoradas</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Anovacións ignoradas para a versión %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Descargar todas as anovacións</string>
+    <string name="update_all">Descargar todas as anovacións</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">Atopamos unha vulnerabilidade en %1$s. Recomendamos desinstalar esta app inmediatamente.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">Atopamos unha vulnerabilidade en %1$s. Recomendamos actualizar á nova versión inmediatamente.</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 296d14a6b..7c5f80369 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -129,9 +129,6 @@
     <string name="unknown">לא ידוע</string>
     <string name="repo_confirm_delete_title">למחוק מאגר?</string>
     <string name="repo_added">מאגר חבילות שמור %1$s.</string>
-    <string name="minsdk_or_later">%s ומעלה</string>
-    <string name="up_to_maxsdk">עד %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s עד %2$s</string>
     <string name="requires_features">נדרש: %1$s</string>
     <string name="pref_language">שפה</string>
     <string name="pref_language_default">ברירת המחדל של המערכת</string>
@@ -308,7 +305,7 @@
     <string name="app_version_x_available">גרסה %1$s זמינה</string>
     <string name="app_version_x_installed">גרסה %1$s</string>
     <string name="app_recommended_version_installed">גרסה %1$s (מומלצת)</string>
-    <string name="app__newly_added">חדש</string>
+    <string name="app_new">חדש</string>
     <string name="app__tts__cancel_download">ביטול הורדה</string>
     <string name="app__install_downloaded_update">עדכון</string>
 
@@ -319,7 +316,7 @@
     <string name="installed_app__updates_ignored">עדכונים בהתעלמות</string>
     <string name="installed_app__updates_ignored_for_suggested_version">עדכונים בהתעלמות לגרסה %1$s</string>
     <string name="updates__tts__download_app">הורדה</string>
-    <string name="updates__tts__download_updates_for_all_apps">הורדת כל העדכונים</string>
+    <string name="update_all">הורדת כל העדכונים</string>
 
     <string name="updates__hide_updateable_apps">הסתרת יישומונים</string>
     <string name="updates__show_updateable_apps">הצגת יישומונים</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a28aec7b1..645ea4d79 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -193,9 +193,6 @@
     </string>
     <string name="repo_added">Spremljen F-Droid repozitorij %1$s.</string>
     <string name="repo_searching_address">Tražim F-Drroid repozitorij na\n%1$s</string>
-    <string name="minsdk_or_later">%s ili kasnije</string>
-    <string name="up_to_maxsdk">Do %s</string>
-    <string name="minsdk_up_to_maxsdk">Od %1$s do %2$s</string>
     <string name="not_on_same_wifi">Vaš uređaj nije na istoj Wi-Fi mreži kao i lokalni repozitorij koji ste upravo
         dodali! Probajte se spojiti na ovu mrežu: %s
     </string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4391b2a05..e65c6aa62 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -68,7 +68,6 @@
     <string name="repo_disabled_notification">%1$s letiltva.
 \n
 \nÚjra kell majd engedélyezni a tárolót, hogy alkalmazásokat telepíthessen belőle.</string>
-    <string name="minsdk_or_later">Android %s vagy későbbi</string>
     <string name="delete">Törlés</string>
     <string name="app_name">F-Droid</string>
 
@@ -283,7 +282,7 @@
     <string name="notification_action_install">Telepítés</string>
 
     <string name="updates__tts__download_app">Letöltés</string>
-    <string name="app__newly_added">Új</string>
+    <string name="app_new">Új</string>
     <string name="app__install_downloaded_update">Frissítés</string>
 
     <string name="installed_apps__activity_title">Telepített alkalmazások</string>
@@ -310,7 +309,7 @@
     <string name="app_list__dismiss_downloading_app">Letöltés megszakítva</string>
 
     <string name="installed_app__updates_ignored">Frissítések figyelmen kívül hagyva</string>
-    <string name="updates__tts__download_updates_for_all_apps">Összes frissítés letöltése</string>
+    <string name="update_all">Összes frissítés letöltése</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">Egy sebezhetőség található a(z) %1$s alkalmazásban. Az alkalmazás azonnali eltávolítása ajánlott.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">Egy sebezhetőség található a(z) %1$s appban. Azonnali frissítés ajánlott a legújabb verzióra.</string>
@@ -341,8 +340,6 @@
     <string name="download_404">A kért fájl nem található.</string>
     <string name="unsigned_description">Ez azt jelenti, hogy az alkalmazások listája nem ellenőrizhető. Óvatosnak kell lennie a hitelesítetlen indexekből letöltött alkalmazásokkal.</string>
     <string name="repo_added">A(z) %1$s csomagtároló mentve.</string>
-    <string name="up_to_maxsdk">%s-ig</string>
-    <string name="minsdk_up_to_maxsdk">%1$s-től %2$s-ig</string>
     <string name="by_author_format">Készítette: %s</string>
     <string name="force_old_index">Régi indexformátum kényszerítése</string>
     <string name="app_details_donate_prompt">A(z) %1$s alkalmazást %2$s készítette. Vegyen nekik egy kávét!</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 780872b62..3c405ba41 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -24,7 +24,7 @@
     <string name="app_inst_known_source">Տեղադրված (%s կողմից)</string>
     <string name="app_inst_unknown_source">Տեղադրված (անհայտ աղբյուրից)</string>
     <string name="app_version_x_installed">Տարբերակ %1$s</string>
-    <string name="app__newly_added">Նոր</string>
+    <string name="app_new">Նոր</string>
 
     <string name="installed_apps__activity_title">Տեղադրված ափփեր</string>
     <string name="installed_app__updates_ignored">Առհամարված թարմացումներ</string>
@@ -72,7 +72,6 @@
     <string name="repo_description">Նկարագրություն</string>
     <string name="repo_last_update">Վերջին թարմացում</string>
     <string name="repo_name">Անուն</string>
-    <string name="minsdk_up_to_maxsdk">%1$sից մինչև %2$s</string>
     <string name="pref_language">Լեզու</string>
     <string name="pref_language_default">Համակարգի լռելյայնը</string>
 
@@ -158,7 +157,6 @@
     <string name="unverified">Չվավերացված</string>
     <string name="repo_num_apps">Ափփերի քանակ</string>
     <string name="unknown">Անհայտ</string>
-    <string name="up_to_maxsdk">Մինչև %s</string>
     <string name="requires_features">Պահանջում է. %1$s</string>
     <string name="wifi">Wi-Fi</string>
     <string name="category_Development">Ծրագրավորում</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 85f82e96a..3f71fb500 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -181,9 +181,6 @@
     <string name="repo_added">Paket Repositori tersimpan %1$s.</string>
     <string name="repo_searching_address">Mencari paket repositori di
 \n%1$s</string>
-    <string name="minsdk_or_later">%s atau nanti</string>
-    <string name="up_to_maxsdk">Hingga %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s hingga %2$s</string>
     <string name="not_on_same_wifi">Perangkat Anda tidak berada pada jaringan Wi-Fi yang sama dengan repo lokal yang baru Anda tambahkan! Coba bergabung dengan jaringan ini: %s</string>
     <string name="requires_features">Membutuhkan: %1$s</string>
     <string name="pref_language">Bahasa</string>
@@ -359,14 +356,14 @@
 
     <string name="main_menu__swap_nearby">Dekat</string>
     <string name="app_recommended_version_installed">Versi %1$s (Direkomendasikan)</string>
-    <string name="app__newly_added">Baru</string>
+    <string name="app_new">Baru</string>
     <string name="app_list__name__downloading_in_progress">Mengunduh %1$s</string>
 
     <string name="installed_apps__activity_title">Apl Terpasang</string>
     <string name="installed_app__updates_ignored">Pembaruan diabaikan</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Pembaruan diabaikan untuk Versi %1$s</string>
     <string name="updates__tts__download_app">Unduh</string>
-    <string name="updates__tts__download_updates_for_all_apps">Unduh semua pembaruan</string>
+    <string name="update_all">Unduh semua pembaruan</string>
 
     <string name="updates__hide_updateable_apps">Sembunyikan apl</string>
     <string name="updates__show_updateable_apps">Tampilkan apl</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 19e07ffc0..91cb4ef6e 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -147,9 +147,6 @@
     <string name="repo_confirm_delete_title">Eyða hugbúnaðarsafni?</string>
     <string name="repo_added">Vistaði  %1$s hugbúnaðarsafnið.</string>
     <string name="repo_searching_address">Leita að hugbúnaðarsafni á %1$s</string>
-    <string name="minsdk_or_later">%s eða nýrra</string>
-    <string name="up_to_maxsdk">Upp að %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s allt að %2$s</string>
     <string name="requires_features">Krefst: %1$s</string>
     <string name="pref_language">Tungumál</string>
     <string name="pref_language_default">Sjálfgefið í kerfinu</string>
@@ -365,7 +362,7 @@
     <string name="app_version_x_available">%1$s-útgáfan er tiltæk</string>
     <string name="app_version_x_installed">Útgáfa %1$s</string>
     <string name="app_recommended_version_installed">Útgáfa %1$s (mælt með)</string>
-    <string name="app__newly_added">Nýtt</string>
+    <string name="app_new">Nýtt</string>
 
     <string name="installed_apps__activity_title">Uppsett forrit</string>
     <string name="installed_app__updates_ignored">Hunsaðar uppfærslur</string>
@@ -420,7 +417,7 @@
     <string name="app__install_downloaded_update">Uppfæra</string>
 
 
-    <string name="updates__tts__download_updates_for_all_apps">Sækja allar uppfærslur</string>
+    <string name="update_all">Sækja allar uppfærslur</string>
 
     <string name="updates__hide_updateable_apps">Fela forrit</string>
     <string name="updates__show_updateable_apps">Birta forrit</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6f33a0fdd..4fc5301a3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -125,9 +125,6 @@
         È necessario
         abilitare nuovamente questo repository per installare le app contenute.
     </string>
-    <string name="minsdk_or_later">%s o successivi</string>
-    <string name="up_to_maxsdk">Fino a %s</string>
-    <string name="minsdk_up_to_maxsdk">da %1$s fino a %2$s</string>
     <string name="not_on_same_wifi">Il tuo dispositivo non è nella stessa rete Wi-Fi del repo locale che hai aggiunto!
         Prova a collegarti a questa rete: %s
     </string>
@@ -384,7 +381,7 @@
     <string name="app_list__name__successfully_installed">%1$s installato</string>
     <string name="updates__tts__download_app">Scarica</string>
     <string name="app_recommended_version_installed">Versione %1$s (Raccomandata)</string>
-    <string name="app__newly_added">Nuovo</string>
+    <string name="app_new">Nuovo</string>
     <string name="app__tts__cancel_download">Annulla scaricamento</string>
     <string name="app__install_downloaded_update">Aggiorna</string>
 
@@ -393,7 +390,7 @@
     <string name="installed_apps__activity_title">App Installate</string>
     <string name="installed_app__updates_ignored">Aggiornamenti ignorati</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Aggiornamenti ignorati per Versione %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Scarica tutti gli aggiornamenti</string>
+    <string name="update_all">Scarica tutti gli aggiornamenti</string>
 
     <string name="updates__hide_updateable_apps">Nascondi applicazioni</string>
     <string name="updates__show_updateable_apps">Mostra applicazioni</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c68193f5a..3bb9bd65b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -116,9 +116,6 @@
     <string name="repo_added">パッケージリポジトリ%1$sを保存しました。</string>
     <string name="repo_searching_address">リポジトリを検索中
 \n%1$s</string>
-    <string name="minsdk_or_later">%s以上</string>
-    <string name="up_to_maxsdk">最大%s</string>
-    <string name="minsdk_up_to_maxsdk">%1$sから%2$s</string>
     <string name="not_on_same_wifi">あなたの端末は追加したローカルリポジトリと同じWi-Fiに接続されていません。このネットワークに接続してみてください: %s</string>
     <string name="requires_features">必須: %1$s</string>
     <string name="category_Development">開発</string>
@@ -335,7 +332,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">バージョン%1$s(推奨)</string>
-    <string name="app__newly_added">新規</string>
+    <string name="app_new">新規</string>
 
     <string name="installed_apps__activity_title">インストール済みのアプリ</string>
     <string name="installed_app__updates_ignored">アップデートが無視されています</string>
@@ -355,7 +352,7 @@
     <string name="app_list__name__downloading_in_progress">%1$sをダウンロード中</string>
 
     <string name="updates__tts__download_app">ダウンロード</string>
-    <string name="updates__tts__download_updates_for_all_apps">すべての更新をダウンロード</string>
+    <string name="update_all">すべての更新をダウンロード</string>
 
     <string name="updates__hide_updateable_apps">アプリを非表示</string>
     <string name="updates__show_updateable_apps">アプリを表示</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index fe350796d..3ee1816fb 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -66,7 +66,7 @@
 
     <string name="app_installed">Yettusbedd</string>
     <string name="app_not_installed">Ur yebdid ara</string>
-    <string name="app__newly_added">Amaynut</string>
+    <string name="app_new">Amaynut</string>
     <string name="added_on">Yettwarna ar %s</string>
     <string name="app__tts__cancel_download">Sefsex asider</string>
     <string name="app__install_downloaded_update">Mucceḍ</string>
@@ -145,8 +145,6 @@
     <string name="adding_apks_format">Timerna n  %s ar ukufi…</string>
     <string name="repos_unchanged">Akk ikuffiyen ttwaleqmen</string>
     <string name="all_other_repos_fine">Ikufiyen nniḍen ur d-ggaren ara tuccḍiwin.</string>
-    <string name="minsdk_or_later">%s neɣ ugar</string>
-    <string name="minsdk_up_to_maxsdk">%1$s arama d %2$s</string>
     <string name="swap_active_hotspot">%1$s (taneqqiḍt-ik n unekcum)</string>
     <string name="swap_choose_apps">Fren Asnas</string>
     <string name="swap_wifi_device_name">Isem n yibenk</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 7e1db7509..50f51cda7 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -62,7 +62,7 @@
     <string name="ok">ಸರಿ</string>
 
     <string name="app_version_x_installed">%1$s ನೆಯ ಆವೃತ್ತಿ</string>
-    <string name="app__newly_added">ಹೊಸತು</string>
+    <string name="app_new">ಹೊಸತು</string>
     <string name="added_on">%s ನಂದು ಸೇರಿಸಲಾಯಿತು</string>
     <string name="app_installed">ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ</string>
     <string name="app_not_installed">ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index eefe98739..7644d9f67 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -116,9 +116,6 @@
 \n저장소로부터 앱을 설치하려면 이 저장소를 다시 활성화해야 합니다.</string>
     <string name="repo_added">패키지 저장소 %1$s 저장되었습니다.</string>
     <string name="repo_searching_address">%1$s에서 패키지 저장소를 찾는 중</string>
-    <string name="minsdk_or_later">%s 또는 나중에</string>
-    <string name="up_to_maxsdk">최대 %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s 최대 %2$s</string>
     <string name="not_on_same_wifi">당신의 장치는 당신이 추가한 로컬 저장소와 같은 Wi-Fi 네트워크 상에 있지 않습니다! 이 네트워크로 접속을 시도해보세요: %s</string>
     <string name="requires_features">필요: %1$s</string>
     <string name="category_Development">개발</string>
@@ -321,7 +318,7 @@
     <string name="app_version_x_available">버전 %1$s 사용 가능</string>
     <string name="app_version_x_installed">버전 %1$s</string>
     <string name="app_recommended_version_installed">버전 %1$s (권장)</string>
-    <string name="app__newly_added">신규</string>
+    <string name="app_new">신규</string>
     <string name="app__tts__cancel_download">다운로드 취소</string>
     <string name="app__install_downloaded_update">업데이트</string>
     <string name="app_installed_media">%s에 설치된 파일</string>
@@ -332,7 +329,7 @@
     <string name="installed_apps__activity_title">설치된 앱</string>
     <string name="installed_app__updates_ignored">업데이트 무시됨</string>
     <string name="installed_app__updates_ignored_for_suggested_version">버전 %1$s의 업데이트 무시됨</string>
-    <string name="updates__tts__download_updates_for_all_apps">모든 업데이트 다운로드</string>
+    <string name="update_all">모든 업데이트 다운로드</string>
 
     <string name="updates__app_with_known_vulnerability__ignore">무시</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 84957b1b2..8e99066a1 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -223,7 +223,7 @@
     <string name="app_version_x_available">Versija %1$s pasiekiama</string>
     <string name="app_version_x_installed">Versija %1$s</string>
     <string name="app_recommended_version_installed">Versija %1$s (rekomenduojama)</string>
-    <string name="app__newly_added">Nauja</string>
+    <string name="app_new">Nauja</string>
     <string name="app__tts__cancel_download">Atšaukti siuntimą</string>
     <string name="app__install_downloaded_update">Atnaujinti</string>
     <string name="app_installed_media">Failas suinstaliuotas %s</string>
@@ -237,7 +237,7 @@
     <string name="send_installed_apps">Pasidalinti suinstaliuotomis programomis</string>
     <string name="installed_app__updates_ignored">Atnaujinimai praleisti</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Atnaujinimai praleisti %1$s versijai</string>
-    <string name="updates__tts__download_updates_for_all_apps">Atsiųsti visus atnaujinimus</string>
+    <string name="update_all">Atsiųsti visus atnaujinimus</string>
 
     <string name="updates__app_with_known_vulnerability__ignore">Ignoruoti</string>
 
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 42e96bded..86f60c77d 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -148,7 +148,7 @@
     <string name="app_version_x_available">Ir pieejama %1$s versija</string>
     <string name="app_version_x_installed">Versija %1$s</string>
     <string name="app_recommended_version_installed">Versija %1$s (Ieteiktā)</string>
-    <string name="app__newly_added">Jauna</string>
+    <string name="app_new">Jauna</string>
     <string name="app__tts__cancel_download">Atcelt lejupielādi</string>
     <string name="app__install_downloaded_update">Atjaunināt</string>
     <string name="app_installed_media">Fails ieinstalēts uz %s</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 728f3236a..dc5798032 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -127,7 +127,7 @@
     <string name="app_version_x_available">പതിപ്പ് %1$s ലഭ്യമാണ്</string>
     <string name="app_version_x_installed">പതിപ്പ് %1$s</string>
     <string name="app_recommended_version_installed">പതിപ്പ് %1$s (അനുശാസിക്കുന്നത്‌)</string>
-    <string name="app__newly_added">പുതിയത്</string>
+    <string name="app_new">പുതിയത്</string>
     <string name="added_on">%s ന് ചേർത്തത്</string>
     <string name="app__tts__cancel_download">ഡൗൺലോഡ് റദ്ദാക്കുക</string>
     <string name="app__install_downloaded_update">പുതുക്കുക</string>
@@ -135,7 +135,7 @@
     <string name="installed_apps__activity_title">സ്ഥാപിച്ചിട്ടുള്ള പ്രയോഗങ്ങള്‍</string>
     <string name="installed_app__updates_ignored">പുതുക്കലുകള്‍ അവഗണിച്ചു</string>
     <string name="installed_app__updates_ignored_for_suggested_version">%1$s പതിപ്പിന്റെ പുതുക്കലുകള്‍ അവഗണിച്ചു</string>
-    <string name="updates__tts__download_updates_for_all_apps">എല്ലാ പുതുക്കലുകളും ഡൌണ്‍ലോഡ് ചെയ്യുക</string>
+    <string name="update_all">എല്ലാ പുതുക്കലുകളും ഡൌണ്‍ലോഡ് ചെയ്യുക</string>
 
     <string name="updates__hide_updateable_apps">പ്രയോഗങ്ങള്‍ മറയ്ക്കുക</string>
     <string name="updates__show_updateable_apps">പ്രയോഗങ്ങള്‍ കാണിക്കുക</string>
@@ -257,9 +257,6 @@
     <string name="repo_added">എഫ്-ഡ്രോയ്ഡ് സങ്കേതം %1$s സൂക്ഷിച്ചു.</string>
     <string name="repo_searching_address">എഫ്-ഡ്രോയ്ഡ് സംഭരണിക്ക് വേണ്ടി തിരയുന്നു
 \n%1$s ല്‍</string>
-    <string name="minsdk_or_later">%s ഓ പുതിയതോ</string>
-    <string name="up_to_maxsdk">%s വരെ</string>
-    <string name="minsdk_up_to_maxsdk">%1$s മുതല്‍ %2$s വരെ</string>
     <string name="requires_features">വേണ്ടത്: %1$s</string>
     <string name="wifi_ap">ഹോട്ട്സ്പോട്ട്</string>
 
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 286116d0e..cc5fcc094 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -159,9 +159,6 @@
     <string name="deleting_repo">ယခုလက္ရွိ ရီပိုကိုဖ်က္ေနသည္.…</string>
     <string name="all_other_repos_fine">တျခားရီပိုအားလံုးသည္ ခ်ိဳ႕ယြင္းခ်က္မ်ားမရွိပါ.</string>
     <string name="global_error_updating_repos">အသစ္မြမ္းမံစဥ္ခ်ိဳ႕ယြင္းခ်က္ - %s</string>
-    <string name="minsdk_or_later">%s သို႔မဟုတ္ ေနာက္မွ</string>
-    <string name="up_to_maxsdk">%s ထိ</string>
-    <string name="minsdk_up_to_maxsdk">%1$s %2$s ထိ</string>
     <string name="requires_features">လိုအပ္သည္- %1$s</string>
     <string name="pref_language">ဘာသာစကား</string>
     <string name="pref_language_default">စနစ္မူလအတိုင္း</string>
@@ -250,7 +247,7 @@
     <string name="app_version_x_available">ဗားရှင်း %1$s ထွက်ရှိပါသည်</string>
     <string name="app_version_x_installed">ဗားရှင်း %1$s</string>
     <string name="app_recommended_version_installed">ဗားရှင်း %1$s (အကြံပြုသည်)</string>
-    <string name="app__newly_added">အသစ်</string>
+    <string name="app_new">အသစ်</string>
     <string name="app__install_downloaded_update">အသစ်ထွက်ရှိခြင်း</string>
 
     <string name="app_list__name__downloading_in_progress">%1$s ကိုဒေါင်းလုတ်ဆွဲနေသည်</string>
@@ -259,7 +256,7 @@
     <string name="installed_apps__activity_title">သွင်းခဲ့သော အက်ပ်စ်များ</string>
     <string name="installed_app__updates_ignored">အသစ်ထွက်ရှိမှုကိုလျစ်လျူရှူမည်</string>
     <string name="installed_app__updates_ignored_for_suggested_version">ဗားရှင်း %1$s အတွက် အသစ်ထွက်ရှိမှုကိုလျစ်လျူရှုမည်</string>
-    <string name="updates__tts__download_updates_for_all_apps">အသစ်ထွက်ရှိမှုအားလုံးကိုဒေါင်းလုတ်ဆွဲမည်</string>
+    <string name="update_all">အသစ်ထွက်ရှိမှုအားလုံးကိုဒေါင်းလုတ်ဆွဲမည်</string>
 
     <string name="updates__hide_updateable_apps">ဖျောက်ထားသောအက်ပ်စ်များ</string>
     <string name="updates__show_updateable_apps">အက်ပ်စ်များကိုပြမည်</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 48cb9f822..6904b0b02 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -117,9 +117,6 @@
     <string name="repo_added">Lagret pakkebrønnen %1$s.</string>
     <string name="repo_searching_address">Ser etter pakkebrønn på
 \n%1$s</string>
-    <string name="minsdk_or_later">%s eller senere</string>
-    <string name="up_to_maxsdk">Opptil %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s opptil %2$s</string>
     <string name="not_on_same_wifi">Din enhet er ikke på det samme lokale Wi-Fi-nettet som pakkebrønnen du nettopp la
         til! Prøv å koble til dette nettverket: %s
     </string>
@@ -328,7 +325,7 @@
     <string name="app_version_x_available">Versjon %1$s er tilgjengelig</string>
     <string name="app_version_x_installed">Versjon %1$s</string>
     <string name="app_recommended_version_installed">Versjon %1$s (Anbefales)</string>
-    <string name="app__newly_added">Ny</string>
+    <string name="app_new">Ny</string>
 
     <string name="installed_apps__activity_title">Installerte programmer</string>
     <string name="installed_app__updates_ignored">Oppdateringer ignorert</string>
@@ -375,7 +372,7 @@
     <string name="app_list__name__downloading_in_progress">Henter %1$s</string>
 
     <string name="updates__tts__download_app">Last ned</string>
-    <string name="updates__tts__download_updates_for_all_apps">Last ned alle oppdateringer</string>
+    <string name="update_all">Last ned alle oppdateringer</string>
 
     <string name="updates__hide_updateable_apps">Skjul programmer</string>
     <string name="updates__show_updateable_apps">Vis programmer</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index e8a033da9..6980d235d 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -135,7 +135,7 @@
     <string name="app_version_x_available">Versie %1$s is beschikbaar</string>
     <string name="app_version_x_installed">Versie %1$s</string>
     <string name="app_recommended_version_installed">Versie %1$s (aanbevolen)</string>
-    <string name="app__newly_added">Nieuw</string>
+    <string name="app_new">Nieuw</string>
     <string name="added_on">Toegevoegd op %s</string>
     <string name="app__tts__cancel_download">Download annuleren</string>
     <string name="app__install_downloaded_update">Bijwerken</string>
@@ -150,7 +150,7 @@
     <string name="installed_apps__activity_title">Geïnstalleerde apps</string>
     <string name="installed_app__updates_ignored">Updates genegeerd</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Updates genegeerd voor versie %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Alle updates downloaden</string>
+    <string name="update_all">Alle updates downloaden</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">Der zit een kwetsbaarheid in %1$s. We raden aan dezen app direct te verwijderen.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">Der zit een kwetsbaarheid in %1$s. We raden aan direct bij te werken naar de meest recente versie.</string>
@@ -309,9 +309,6 @@
     <string name="repo_disabled_notification">%1$s uitgeschakeld. Ge moet dezen bron terug inschakelen indien dat ge der apps van wilt installeren.</string>
     <string name="repo_added">Pakketbron %1$s opgeslagen.</string>
     <string name="repo_searching_address">Zoeken naar pakketbron op %1$s</string>
-    <string name="minsdk_or_later">%s of later</string>
-    <string name="up_to_maxsdk">Tot en met %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s tot en met %2$s</string>
     <string name="requires_features">Benodigd: %1$s</string>
     <string name="wifi_ap">Hotspot</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 01d104f25..2a8b581c4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -119,9 +119,6 @@
     </string>
     <string name="repo_added">Pakketbron %1$s opgeslagen.</string>
     <string name="repo_searching_address">Zoeken naar pakketbron op %1$s</string>
-    <string name="minsdk_or_later">%s of later</string>
-    <string name="up_to_maxsdk">Tot en met %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s tot en met %2$s</string>
     <string name="not_on_same_wifi">Je apparaat zit niet op hetzelfde wifinetwerk als de lokale bron die je zojuist hebt toegevoegd! Probeer om netwerk %s bij te treden</string>
     <string name="requires_features">Benodigd: %1$s</string>
     <string name="category_Development">Ontwikkeling</string>
@@ -318,7 +315,7 @@
     <string name="app_version_x_available">Versie %1$s is beschikbaar</string>
     <string name="app_version_x_installed">Versie %1$s</string>
     <string name="app_recommended_version_installed">Versie %1$s (aanbevolen)</string>
-    <string name="app__newly_added">Nieuw</string>
+    <string name="app_new">Nieuw</string>
     <string name="app__install_downloaded_update">Bijwerken</string>
 
     <string name="app_list__name__downloading_in_progress">%1$s wordt gedownload</string>
@@ -327,7 +324,7 @@
     <string name="installed_app__updates_ignored">Updates genegeerd</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Updates genegeerd voor versie %1$s</string>
     <string name="updates__tts__download_app">Downloaden</string>
-    <string name="updates__tts__download_updates_for_all_apps">Alle updates downloaden</string>
+    <string name="update_all">Alle updates downloaden</string>
 
     <string name="updates__hide_updateable_apps">Apps verbergen</string>
     <string name="updates__show_updateable_apps">Apps weergeven</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0f2c8adf9..1bd62f257 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -88,9 +88,6 @@
     <string name="repo_confirm_delete_body">Usunięcie repozytorium oznacza, że aplikacje z niego nie będą dłużej dostępne w F-Droid.
 \n
 \nUwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</string>
-    <string name="minsdk_or_later">%s lub nowszy</string>
-    <string name="up_to_maxsdk">Wsparcie do %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s aż do %2$s</string>
     <string name="requires_features">Wymaga: %1$s</string>
     <string name="category_Development">Tworzenie</string>
     <string name="category_Games">Gry</string>
@@ -359,7 +356,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">Wersja %1$s (zalecana)</string>
-    <string name="app__newly_added">Nowa</string>
+    <string name="app_new">Nowa</string>
 
     <string name="installed_apps__activity_title">Zainstalowane aplikacje</string>
     <string name="installed_app__updates_ignored">Zignorowane aktualizacje</string>
@@ -383,7 +380,7 @@
     <string name="app_list__name__downloading_in_progress">Pobieranie %1$s</string>
 
     <string name="updates__tts__download_app">Pobierz</string>
-    <string name="updates__tts__download_updates_for_all_apps">Pobierz wszystkie aktualizacje</string>
+    <string name="update_all">Pobierz wszystkie aktualizacje</string>
 
     <string name="updates__hide_updateable_apps">Ukryj aplikacje</string>
     <string name="updates__show_updateable_apps">Pokaż aplikacje</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 450911efe..bbb47304d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -124,9 +124,6 @@
     <string name="repo_added">Repositório de pacotes %1$s salvo.</string>
     <string name="repo_searching_address">Procurando por repositório de pacotes em
 \n%1$s</string>
-    <string name="minsdk_or_later">%s ou posterior</string>
-    <string name="up_to_maxsdk">Até %s</string>
-    <string name="minsdk_up_to_maxsdk">De %1$s até %2$s</string>
     <string name="not_on_same_wifi">O seu dispositivo não está no mesma rede Wi-Fi do repositório local que você acabou
         de adicionar! Tente conectar-se a esta rede: %s
     </string>
@@ -361,7 +358,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">Versão %1$s (Recomendada)</string>
-    <string name="app__newly_added">Novo</string>
+    <string name="app_new">Novo</string>
     <string name="app__install_downloaded_update">Atualizar</string>
 
     <string name="app_list__name__downloading_in_progress">Baixando %1$s</string>
@@ -371,7 +368,7 @@
     <string name="installed_app__updates_ignored_for_suggested_version">Atualizações ignoradas para a versão %1$s
     </string>
     <string name="updates__tts__download_app">Download</string>
-    <string name="updates__tts__download_updates_for_all_apps">Baixar todas as atualizações</string>
+    <string name="update_all">Baixar todas as atualizações</string>
 
     <string name="updates__hide_updateable_apps">Esconder aplicativos</string>
     <string name="updates__show_updateable_apps">Mostrar aplicativos</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 478a91f58..5918ddda0 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -163,9 +163,6 @@
     <string name="repo_added">Pacote do repositório guardado %1$s.</string>
     <string name="repo_searching_address">A procurar um repositório de pacote em
 \n%1$s</string>
-    <string name="minsdk_or_later">%s ou posterior</string>
-    <string name="up_to_maxsdk">Até %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s até %2$s</string>
     <string name="not_on_same_wifi">O seu dispositivo não está ligado à rede Wi-Fi do repositório adicionado! Tente
         entrar nesta rede: %s
     </string>
@@ -346,7 +343,7 @@
     <string name="app_version_x_available">Versão %1$s disponível</string>
     <string name="app_version_x_installed">Versão %1$s</string>
     <string name="app_recommended_version_installed">Versão %1$s (recomendada)</string>
-    <string name="app__newly_added">Nova</string>
+    <string name="app_new">Nova</string>
     <string name="app__install_downloaded_update">Atualizar</string>
 
     <string name="app_list__name__downloading_in_progress">A descarregar %1$s</string>
@@ -357,7 +354,7 @@
     <string name="installed_app__updates_ignored_for_suggested_version">Atualizações ignoradas para a versão %1$s
     </string>
     <string name="updates__tts__download_app">Descarregar</string>
-    <string name="updates__tts__download_updates_for_all_apps">Descarregar todas as atualizações</string>
+    <string name="update_all">Descarregar todas as atualizações</string>
 
     <string name="updates__hide_updateable_apps">Ocultar aplicações</string>
     <string name="updates__show_updateable_apps">Mostrar aplicações</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 752c4e3a8..aa9300f3c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -134,8 +134,7 @@
     <string name="wifi">Wi-Fi</string>
     <string name="pref_language_default">Setare implicită sistem</string>
 
-    <string name="up_to_maxsdk">Până la %s</string>
-    <string name="repo_searching_address">Căutare depozit de pachete la 
+    <string name="repo_searching_address">Căutare depozit de pachete la
 \n%1$s</string>
     <string name="repo_confirm_delete_title">Șterge depozit?</string>
     <string name="repo_description">Descriere</string>
@@ -160,8 +159,6 @@
     <string name="menu_settings">Setări</string>
     <string name="menu_manage">Depozite</string>
     <string name="repo_added">Depozit de pachete salvat %1$s.</string>
-    <string name="minsdk_or_later">%s sau mai nou</string>
-    <string name="minsdk_up_to_maxsdk">%1$s pana la %2$s</string>
     <string name="pref_language">Limba</string>
     <string name="antiupstreamnonfreelist">Codul sursa originar nu este în totalitatea lui software liber</string>
     <string name="unsigned">Nesemnat</string>
@@ -368,7 +365,7 @@
     <string name="updates__show_updateable_apps">Arata aplicațiile</string>
 
     <string name="updates__hide_updateable_apps">Ascunde aplicațiile</string>
-    <string name="updates__tts__download_updates_for_all_apps">Descarca toate actualizările</string>
+    <string name="update_all">Descarca toate actualizările</string>
 
     <string name="updates__tts__download_app">Descarcă</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Actualizări ignorate pentru versiunea %1$s</string>
@@ -379,7 +376,7 @@
     <string name="app_list__name__downloading_in_progress">Se descarcă %1$s</string>
     <string name="app__install_downloaded_update">Actualizare</string>
 
-    <string name="app__newly_added">Nou</string>
+    <string name="app_new">Nou</string>
     <string name="app_recommended_version_installed">Versiunea %1$s (Recomandată)</string>
     <string name="app_version_x_installed">Versiunea %1$s</string>
     <string name="app_version_x_available">Versiunea %1$s disponibilă</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bd8c9b4be..64a509328 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -114,9 +114,6 @@
     <string name="repo_disabled_notification">%1$s отключен.
 \n
 \nДля установки приложений из этого репозитория вам необходимо повторно включить его.</string>
-    <string name="minsdk_or_later">%s или новее</string>
-    <string name="up_to_maxsdk">До %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s до %2$s</string>
     <string name="not_on_same_wifi">Данное устройство не находится в той же сети Wi-Fi, что и локальный репозиторий,
         который вы только что добавили! Попробуйте присоединиться к этой сети: %s
     </string>
@@ -308,7 +305,7 @@
     <string name="warning_no_internet">Не удается обновить. Вы подключены к Интернету?</string>
     <string name="versions">Версии</string>
     <string name="app_details_donate_prompt_unknown_author">Купи разработчику %1$s чашечку кофе!</string>
-    <string name="updates__tts__download_updates_for_all_apps">Скачать все обновления</string>
+    <string name="update_all">Скачать все обновления</string>
 
     <string name="updates__hide_updateable_apps">Скрыть приложения</string>
     <string name="updates__show_updateable_apps">Показать приложения</string>
@@ -339,7 +336,7 @@
 
     <string name="app_version_x_available">Доступна версия %1$s</string>
     <string name="app_version_x_installed">Версия %1$s</string>
-    <string name="app__newly_added">Новое</string>
+    <string name="app_new">Новое</string>
     <string name="app_list__name__successfully_installed">%1$s установлено</string>
 
     <string name="categories__empty_state__no_categories">Нет категорий для показа</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index aa875ccbe..62793c7ed 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -123,9 +123,6 @@
     <string name="repo_added">Depòsitu de pachetos %1$s sarvadu.</string>
     <string name="repo_searching_address">Chirchende unu depòsitu de pachetos in
 \n%1$s</string>
-    <string name="minsdk_or_later">%s o imbeniente</string>
-    <string name="up_to_maxsdk">Finas a %s</string>
-    <string name="minsdk_up_to_maxsdk">dae %1$s finas a %2$s</string>
     <string name="not_on_same_wifi">Su dispositivu tuo no est in sa matessi retza Wi-Fi de su depòsitu locale chi as
         annantu como! Proa a intrare in custa retza: %s
     </string>
@@ -368,7 +365,7 @@
     <string name="clear_search">Inneta sa chirca</string>
 
     <string name="app_recommended_version_installed">Versione %1$s (Racumandada)</string>
-    <string name="app__newly_added">Noa</string>
+    <string name="app_new">Noa</string>
 
     <string name="installed_apps__activity_title">Aplicatziones installadas</string>
     <string name="installed_app__updates_ignored">Agiornamentos ignorados</string>
@@ -390,7 +387,7 @@
     <string name="app_list__name__downloading_in_progress">Installende %1$s</string>
 
     <string name="updates__tts__download_app">Iscàrriga</string>
-    <string name="updates__tts__download_updates_for_all_apps">Iscàrriga totu sos agiornamentos</string>
+    <string name="update_all">Iscàrriga totu sos agiornamentos</string>
 
     <string name="updates__hide_updateable_apps">Istichi sas aplicatziones</string>
     <string name="updates__show_updateable_apps">Ammustra sas aplicatziones</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 5838df37a..78b5d217a 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -132,9 +132,6 @@
     </string>
     <string name="repo_added">Uložený F-Droid repozitár %1$s.</string>
     <string name="repo_searching_address">Hľadá sa repozitár F-Droidu na %1$s</string>
-    <string name="minsdk_or_later">%s alebo neskôr</string>
-    <string name="up_to_maxsdk">Do %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s do %2$s</string>
     <string name="not_on_same_wifi">Vaše zariadenie nie je na rovnakej Wi-Fi ako miestny repozitár, čo ste práve
         pridali! Skúste sa pripojiť na túto sieť: %s
     </string>
@@ -362,7 +359,7 @@
     <string name="app_version_x_available">Je dostupná verzia %1$s</string>
     <string name="app_version_x_installed">Verzia %1$s</string>
     <string name="app_recommended_version_installed">Verzia %1$s (odporúčaná)</string>
-    <string name="app__newly_added">Novinka</string>
+    <string name="app_new">Novinka</string>
     <string name="app__install_downloaded_update">Aktualizovať</string>
 
     <string name="app_list__name__downloading_in_progress">Sťahovanie %1$s</string>
@@ -372,7 +369,7 @@
     <string name="installed_app__updates_ignored">Vynechané aktualizácie</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Vynechané aktualizácie pre verziu %1$s</string>
     <string name="updates__tts__download_app">Stiahnuť</string>
-    <string name="updates__tts__download_updates_for_all_apps">Stiahnuť všetky aktualizácie</string>
+    <string name="update_all">Stiahnuť všetky aktualizácie</string>
 
     <string name="updates__hide_updateable_apps">Skryť aplikácie</string>
     <string name="updates__show_updateable_apps">Zobraziť aplikácie</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index ef3efd6fc..a32a17359 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -154,7 +154,7 @@
     <string name="app_version_x_available">Verzija %1$s je na voljo</string>
     <string name="app_version_x_installed">Verzija %1$s</string>
     <string name="app_recommended_version_installed">Verzija %1$s(priporočeno)</string>
-    <string name="app__newly_added">Novo</string>
+    <string name="app_new">Novo</string>
     <string name="added_on">Dodano dne %s</string>
     <string name="app__tts__cancel_download">Prekliči prenos</string>
     <string name="app__install_downloaded_update">Posodobi</string>
@@ -167,7 +167,7 @@
     <string name="installed_apps__activity_title">Nameščene aplikacije</string>
     <string name="installed_app__updates_ignored">Posodobitve ignorirane</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Posodobitve ignorirane za verzijo %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Prenesi vse posodobitve</string>
+    <string name="update_all">Prenesi vse posodobitve</string>
 
     <string name="updates__app_with_known_vulnerability__ignore">Ignoriraj</string>
 
@@ -276,8 +276,6 @@
     <string name="repo_name">Ime</string>
     <string name="unknown">Nepoznano</string>
     <string name="repo_confirm_delete_title">Izbriši skladišče aplikacij?</string>
-    <string name="minsdk_or_later">%s ali kasneje</string>
-    <string name="up_to_maxsdk">Do skupno %s</string>
     <string name="requires_features">Potrebuje: %1$s</string>
     <string name="wifi_ap">Hotspot</string>
 
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index aca3f4573..b0e96b753 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -214,9 +214,6 @@
     <string name="repo_searching_address">Pfimbi yeF-Droid irikutsvagirwa pa
         %1$s
     </string>
-    <string name="minsdk_or_later">%s kana pashure</string>
-    <string name="up_to_maxsdk">Kusvika pa %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s kusvika pa %2$s</string>
     <string name="not_on_same_wifi">Muchina wako hausi pamasaisai eWi-Fi mamwe chete nepfimbi yakamanikwa yawabva
         kuwedzera! Yedza kukochekedza pamasaisai aya: %s
     </string>
@@ -398,7 +395,7 @@
     <string name="app_version_x_available">Version %1$s yavapo</string>
     <string name="app_version_x_installed">Version %1$s</string>
     <string name="app_recommended_version_installed">Version %1$s (Inoyambirwa)</string>
-    <string name="app__newly_added">Itsva</string>
+    <string name="app_new">Itsva</string>
     <string name="app__install_downloaded_update">Natsa</string>
 
     <string name="app_list__name__downloading_in_progress">Kututunura %1$s</string>
@@ -409,7 +406,7 @@
     <string name="updates__tts__download_app">Bhatani rekututunura riri mukati memutsara rakaratidzwa muscreen
         rinoshandisa icon chete
     </string>
-    <string name="updates__tts__download_updates_for_all_apps">Tutunura wedzero dzese</string>
+    <string name="update_all">Tutunura wedzero dzese</string>
 
     <string name="updates__hide_updateable_apps">Hwandisa maApps</string>
     <string name="updates__show_updateable_apps">Ratidza maApps</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index edacc6a3d..08e183e2b 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -151,7 +151,7 @@
     <string name="app_version_x_available">Verzioni %1$s është i mundshëm</string>
     <string name="app_version_x_installed">Verzioni %1$s</string>
     <string name="app_recommended_version_installed">Verzioni %1$s (Rekomandohet)</string>
-    <string name="app__newly_added">E re</string>
+    <string name="app_new">E re</string>
     <string name="app__tts__cancel_download">Anuloje shkarkimin</string>
     <string name="app__install_downloaded_update">Freskim</string>
     <string name="app_installed_media">Dosja është instaluar në %s</string>
@@ -165,7 +165,7 @@
     <string name="installed_apps__activity_title">Aplikacionet e Instaluara</string>
     <string name="installed_app__updates_ignored">Freskimet nuk u morrën parasysh</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Freskimet nuk u pranuan për Verzionin %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Shkarko të gjitha freskimet</string>
+    <string name="update_all">Shkarko të gjitha freskimet</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">Ne kemi gjetur një dobësi me %1$s. Ne rekomandojmë që të uninstaloni aplikacionin menjëherë.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">Ne kemi gjetur një dobësi me %1$s. Ne rekomandojmë që të bëni upgrade te një verzion tjetër menjëherë.</string>
@@ -281,9 +281,6 @@
     <string name="repo_user_mirrors">Pasqyrat e përdoruesit</string>
     <string name="unknown">Panjohur</string>
     <string name="repo_confirm_delete_title">Të fshijë depon?</string>
-    <string name="minsdk_or_later">%s ose më vonë</string>
-    <string name="up_to_maxsdk">Deri më %s</string>
-    <string name="minsdk_up_to_maxsdk">nga %1$s deri më %2$s</string>
     <string name="requires_features">Nevojitet: %1$s</string>
     <plurals name="button_view_all_apps_in_category">
 	<item quantity="one">Shiko %d</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 95ce734cb..5be36cf90 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -125,9 +125,6 @@
     </string>
     <string name="repo_added">Сачувана је ризница Ф-дроида %1$s.</string>
     <string name="repo_searching_address">Тражим ризницу Ф-дроида на\n%1$s</string>
-    <string name="minsdk_or_later">%s или новији</string>
-    <string name="up_to_maxsdk">До %s</string>
-    <string name="minsdk_up_to_maxsdk">Од %1$s до %2$s</string>
     <string name="not_on_same_wifi">Ваш уређај није на истој бежичној мрежи са локалном ризницом коју сте управо додали!
         Придружите се овој мрежи: %s
     </string>
@@ -363,7 +360,7 @@
 
     <string name="notification_title_summary_ready_to_install_update">Надоградња спремна</string>
     <string name="app_recommended_version_installed">Издање %1$s (препоручено)</string>
-    <string name="app__newly_added">Ново</string>
+    <string name="app_new">Ново</string>
 
     <string name="installed_apps__activity_title">Инсталиране апликације</string>
     <string name="installed_app__updates_ignored">Надоградње занемарене</string>
@@ -380,7 +377,7 @@
     <string name="app_list__name__downloading_in_progress">Преузимам %1$s</string>
 
     <string name="updates__tts__download_app">Преузми</string>
-    <string name="updates__tts__download_updates_for_all_apps">Преузми све надоградње</string>
+    <string name="update_all">Преузми све надоградње</string>
 
     <string name="updates__hide_updateable_apps">Сакриј апликације</string>
     <string name="updates__show_updateable_apps">Прикажи апликације</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0d9a554b5..6ae2311b0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -117,9 +117,6 @@
 \nDu kommer att behöva återaktivera det här förrådet för att kunna installera appar från det.</string>
     <string name="repo_searching_address">Söker efter paketförråd på 
 \n%1$s</string>
-    <string name="minsdk_or_later">%s eller senare</string>
-    <string name="up_to_maxsdk">Upp till %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s upp till %2$s</string>
     <string name="not_on_same_wifi">Din enhet är inte på samma wifi som det lokala förrådet du just lagt till! Försök ansluta till detta nätverk: %s</string>
     <string name="requires_features">Kräver: %1$s</string>
     <string name="category_Development">Utveckling</string>
@@ -314,7 +311,7 @@
     <string name="app_version_x_available">Version %1$s är tillgänglig</string>
     <string name="app_version_x_installed">Version %1$s</string>
     <string name="app_recommended_version_installed">Version %1$s (Rekommenderad)</string>
-    <string name="app__newly_added">Ny</string>
+    <string name="app_new">Ny</string>
 
     <string name="installed_apps__activity_title">Installerade appar</string>
     <string name="installed_app__updates_ignored">Uppdateringar ignorerade</string>
@@ -365,7 +362,7 @@
     <string name="app_list__name__downloading_in_progress">Hämtar %1$s</string>
 
     <string name="updates__tts__download_app">Hämta</string>
-    <string name="updates__tts__download_updates_for_all_apps">Hämta alla uppdateringar</string>
+    <string name="update_all">Hämta alla uppdateringar</string>
 
     <string name="updates__hide_updateable_apps">Göm appar</string>
     <string name="updates__show_updateable_apps">Visa appar</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 6bb23260e..b8650a010 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -34,7 +34,7 @@
     <string name="about_site">వెబ్‌సైటు</string>
     <string name="about_license">లైసెన్సు</string>
 
-    <string name="app__newly_added">కొత్తది</string>
+    <string name="app_new">కొత్తది</string>
     <string name="app__tts__cancel_download">దింపుకోలును రద్దుచేయి</string>
     <string name="repo_add_add">చేర్చు</string>
     <string name="links">లంకెలు</string>
@@ -155,7 +155,7 @@
 
     <string name="installed_apps__activity_title">వ్యవస్థాపించిన అనువర్తనాలు</string>
     <string name="installed_app__updates_ignored">నవీకరణలు విస్మరించబడ్డాయి</string>
-    <string name="updates__tts__download_updates_for_all_apps">అన్ని నవీకరణలను దింపుకోండి</string>
+    <string name="update_all">అన్ని నవీకరణలను దింపుకోండి</string>
 
     <string name="updates__app_with_known_vulnerability__ignore">పట్టించుకోకుండా</string>
 
@@ -229,9 +229,6 @@
     <string name="repo_num_apps">అనువర్తనాల సంఖ్య</string>
     <string name="unknown">తెలియని</string>
     <string name="repo_confirm_delete_title">రిపోజిటరీని తొలగించాలా?</string>
-    <string name="minsdk_or_later">%s లేదా తరువాత</string>
-    <string name="up_to_maxsdk">%s వరకు</string>
-    <string name="minsdk_up_to_maxsdk">%1$s వరకు %2$s</string>
     <string name="requires_features">అవసరం: %1$s</string>
     <string name="wifi_ap">హాట్స్పాట్</string>
 
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 3ef9039f3..013ddbd76 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -132,8 +132,6 @@
         โปรแกรมที่มาจากแหล่งนี้จะไม่มีขึ้นให้ดาวน์โหลดในรายการของ F-Droid อีกต่อไป\n\nหมายเหตุ:
         โปรแกรมที่คุณดาวน์โหลดและติดตั้งแล้ว จะยังคงติดตั้งและใช้งานได้อยู่ตามเดิม
     </string>
-    <string name="minsdk_or_later">%s หรือสูงกว่า</string>
-    <string name="up_to_maxsdk">จนถึง %s</string>
     <string name="pref_language">ภาษา</string>
     <string name="pref_language_default">ใช้ภาษาของเครื่อง</string>
 
@@ -299,7 +297,6 @@
     </string>
     <string name="wifi_ap">เครื่องส่ง WiFi</string>
 
-    <string name="minsdk_up_to_maxsdk">%1$s ถึง %2$s</string>
     <string name="repo_searching_address">กำลังค้นหาแหล่งโปรแกรม F-Droid ที่
         %1$s
     </string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1d36ce782..a4f16535b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -127,9 +127,6 @@
     <string name="repo_added">Paket deposu %1$s kaydedildi.</string>
     <string name="repo_searching_address">%1$s konumunda paket deposu
 \naranıyor</string>
-    <string name="minsdk_or_later">%s veya sonrası</string>
-    <string name="up_to_maxsdk">%s değerine kadar</string>
-    <string name="minsdk_up_to_maxsdk">%1$s değerinden %2$s değerine kadar</string>
     <string name="not_on_same_wifi">Aygıtınız eklemiş olduğunuz yerel deponuzla aynı Wi-Fi\'de değildir. Şu ağa
         katılmayı deneyin: %s
     </string>
@@ -353,7 +350,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">Sürüm %1$s (Önerilen)</string>
-    <string name="app__newly_added">Yeni</string>
+    <string name="app_new">Yeni</string>
 
     <string name="installed_apps__activity_title">Kurulu Uygulamalar</string>
     <string name="installed_app__updates_ignored">Yok sayılan güncellemeler</string>
@@ -375,7 +372,7 @@
     <string name="app_list__name__downloading_in_progress">%1$s indiriliyor</string>
 
     <string name="updates__tts__download_app">İndir</string>
-    <string name="updates__tts__download_updates_for_all_apps">Tüm güncellemeleri indir</string>
+    <string name="update_all">Tüm güncellemeleri indir</string>
 
     <string name="updates__hide_updateable_apps">Uygulamaları gizle</string>
     <string name="updates__show_updateable_apps">Uygulamaları göster</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 3c6909582..a6bafe90f 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -155,7 +155,7 @@
     <string name="app_version_x_available">نەشىر %1$s ئېرىشىشچان</string>
     <string name="app_version_x_installed">نەشىر %1$s</string>
     <string name="app_recommended_version_installed">نەشىر %1$s (تەۋسىيە)</string>
-    <string name="app__newly_added">يېڭى</string>
+    <string name="app_new">يېڭى</string>
     <string name="app__tts__cancel_download">چۈشۈرۈشتىن ۋازكەچ</string>
     <string name="app__install_downloaded_update">يېڭىلا</string>
     <string name="app_installed_media">ھۆججەت %s گە ئورنىتىلدى</string>
@@ -169,7 +169,7 @@
     <string name="installed_apps__activity_title">ئورنىتىلغان ئۇيغۇلىمىلار</string>
     <string name="installed_app__updates_ignored">ئېتىبارسىزلانغان يېڭىلانمىلار</string>
     <string name="installed_app__updates_ignored_for_suggested_version">%1$s نەشىرى ئۈچۈن يېڭىلانمىلار ساقىتىلدى</string>
-    <string name="updates__tts__download_updates_for_all_apps">بارلىق يېڭىلانمىلارنى چۈشۈرۈش</string>
+    <string name="update_all">بارلىق يېڭىلانمىلارنى چۈشۈرۈش</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">%1$s دىن تۆشۈكۈك بايقىدۇق. بۇ ئۇيغۇلىمىنى دەرھال يۇيىۋېتىشىڭىزنى تەۋسىيە قىلىمىز.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">%1$s دىن تۆشۈكۈك بايقىدۇق. بۇ ئۇيغۇلىمىنى دەرھال يېڭى نەشىرىگە ئۆرلىتىشىڭىزنى تەۋسىيە قىلىمىز.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a4fbc1a40..73e789562 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -201,9 +201,6 @@
     <string name="repo_disabled_notification">%1$s відключено.
 \n
 \nВам необхідно ввімкнути репозиторій, щоб встановлювати застосунки з нього.</string>
-    <string name="minsdk_or_later">%s чи старше</string>
-    <string name="up_to_maxsdk">До %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s до %2$s</string>
     <string name="not_on_same_wifi">Ваш пристрій не в тій самій Wi-Fi мережі, що й локальне сховище, яке ви щойно додали! Спробуйте приєднатися до цієї мережі: %s</string>
     <string name="category_Development">Розробка</string>
     <string name="swap_nfc_title">Натисніть для обміну</string>
@@ -336,7 +333,7 @@
     <string name="app_version_x_available">Доступна версія %1$s</string>
     <string name="app_version_x_installed">Версія %1$s</string>
     <string name="app_recommended_version_installed">Версія %1$s (Рекомендовано)</string>
-    <string name="app__newly_added">Нова</string>
+    <string name="app_new">Нова</string>
 
     <string name="installed_apps__activity_title">Встановлені застосунки</string>
     <string name="installed_app__updates_ignored">Проігноровані оновлення</string>
@@ -359,7 +356,7 @@
     <string name="app_list__name__downloading_in_progress">Завантаження %1$s</string>
     <string name="app_list__name__successfully_installed">%1$s встановлено</string>
 
-    <string name="updates__tts__download_updates_for_all_apps">Завантажити всі оновлення</string>
+    <string name="update_all">Завантажити всі оновлення</string>
 
     <string name="updates__hide_updateable_apps">Приховати застосунки</string>
     <string name="updates__show_updateable_apps">Показати застосунки</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 5d3cd5a4c..b7de4ef8d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -111,9 +111,6 @@
     </string>
     <string name="repo_added">Đã lưu kho ứng dụng %1$s.</string>
     <string name="repo_searching_address">Đang tìm kho ứng dụng tại địa chỉ %1$s</string>
-    <string name="minsdk_or_later">%s hoặc mới hơn</string>
-    <string name="up_to_maxsdk">Đến %s</string>
-    <string name="minsdk_up_to_maxsdk">Từ %1$s đến %2$s</string>
     <string name="not_on_same_wifi">Thiết bị của bạn không trong cùng mạng Wi-Fi với kho nội bộ mới thêm! Hãy vào mạng
         này: %s
     </string>
@@ -320,7 +317,7 @@
     <string name="app_version_x_available">Đã có phiên bản %1$s</string>
     <string name="app_version_x_installed">Phiên bản %1$s</string>
     <string name="app_recommended_version_installed">Phiên bản %1$s (Khuyên dùng)</string>
-    <string name="app__newly_added">Mới</string>
+    <string name="app_new">Mới</string>
     <string name="app__tts__cancel_download">Dừng tải xuống</string>
     <string name="app__install_downloaded_update">Cập nhật</string>
     <string name="app_installed_media">Đã cài đặt tập tin vào %s</string>
@@ -334,7 +331,7 @@
     <string name="installed_apps__activity_title">Ứng dụng đã cài đặt</string>
     <string name="installed_app__updates_ignored">Đã bỏ qua các cập nhật</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Đã bỏ qua cập nhật với phiên bản %1$s</string>
-    <string name="updates__tts__download_updates_for_all_apps">Tải về tất cả các bản cập nhật</string>
+    <string name="update_all">Tải về tất cả các bản cập nhật</string>
 
     <string name="updates__app_with_known_vulnerability__prompt_uninstall">Chúng tôi đã tìm thấy lỗ hổng bảo mật trong ứng dụng %1$s. Chúng tôi khuyên bạn gỡ bỏ ứng dụng này ngay lập tức.</string>
     <string name="updates__app_with_known_vulnerability__prompt_upgrade">Chúng tôi đã tìm thấy lỗ hổng bảo mật trong ứng dụng %1$s. Chúng tôi khuyên bạn cập nhật phiên bản mới nhất ngay lập tức.</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a454f7030..7f7d99650 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -94,9 +94,6 @@
     <string name="repo_disabled_notification">已禁用 %1$s。
 \n
 \n需重新启用该资源库才能安装其中的应用。</string>
-    <string name="minsdk_or_later">%s 及以上</string>
-    <string name="up_to_maxsdk">最大 %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s 到 %2$s</string>
     <string name="not_on_same_wifi">您的设备与刚添加的本地软件源不在同一个 Wi-Fi 网络下！请加入此网络：%s</string>
     <string name="requires_features">需要：%1$s</string>
     <string name="category_Development">开发</string>
@@ -316,14 +313,14 @@
     <string name="app_version_x_available">版本%1$s可用</string>
     <string name="app_version_x_installed">版本%1$s</string>
     <string name="app_recommended_version_installed">版本%1$s（推荐使用）</string>
-    <string name="app__newly_added">新品</string>
+    <string name="app_new">新品</string>
     <string name="app__tts__cancel_download">取消下載</string>
     <string name="app__install_downloaded_update">更新</string>
 
     <string name="installed_apps__activity_title">已安装的应用</string>
     <string name="installed_app__updates_ignored">已忽略的更新</string>
     <string name="installed_app__updates_ignored_for_suggested_version">已忽略%1$s版本更新</string>
-    <string name="updates__tts__download_updates_for_all_apps">下载所有更新</string>
+    <string name="update_all">下载所有更新</string>
 
     <string name="updates__hide_updateable_apps">隐藏应用</string>
     <string name="updates__show_updateable_apps">显示应用</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 4db050c45..ae759d6ba 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -92,8 +92,6 @@
     <string name="repo_added">已儲存 F-Droid 軟件庫 %1$s。</string>
     <string name="repo_searching_address">在 %1$s
 搜索 F-Droid 軟件庫</string>
-    <string name="minsdk_or_later">%s 或以後</string>
-    <string name="up_to_maxsdk">直至 %s</string>
     <string name="not_on_same_wifi">您剛才添加的本地倉庫與您的裝置並不在同一個 Wi-Fi 網絡上！請嘗試加入以下網絡：%s</string>
     <string name="requires_features">需要：%1$s</string>
     <string name="category_Development">開發</string>
@@ -187,7 +185,6 @@
     <string name="install_confirm_update_system">您是否要更新此內置應用程式？您不會失去現有的數據。已更新的程式需要以下的存取權：</string>
     <string name="install_confirm_update_system_no_perms">您是否要更新此內置應用程式？您不會失去現有的數據，也不需要提供任何存取權。</string>
     <string name="next">下一步</string>
-    <string name="minsdk_up_to_maxsdk">%1$s 至 %2$s</string>
     <string name="SignatureMismatch">新版的應用程式使用了一個不相同的鑰匙簽署。若要安裝新版本，您必須先卸載舊版本。（註：卸載將會刪除應用程式內的資料）</string>
     <string name="download_error">下載失敗！</string>
 
@@ -307,7 +304,7 @@
     <string name="installed_apps__activity_title">已安裝的應用程式</string>
     <string name="installed_app__updates_ignored">已略過的更新</string>
     <string name="installed_app__updates_ignored_for_suggested_version">已略過 %1$s 版的更新</string>
-    <string name="updates__tts__download_updates_for_all_apps">下載所有更新</string>
+    <string name="update_all">下載所有更新</string>
 
     <string name="updates__hide_updateable_apps">隱藏應用程式</string>
     <string name="updates__show_updateable_apps">顯示應用程式</string>
@@ -376,7 +373,7 @@
     <plurals name="details_last_update_days">
         <item quantity="other">%1$d 天前更新</item>
     </plurals>
-<string name="app__newly_added">最新</string>
+<string name="app_new">最新</string>
     <string name="latest__empty_state__no_recent_apps">找不到近期用過的應用程式</string>
     <string name="categories__empty_state__no_categories">沒有可顯示的程式分類</string>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b4e826c37..a58ca269f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -111,7 +111,6 @@
     <string name="repo_description">描述</string>
     <string name="repo_name">名稱</string>
     <string name="unknown">未知</string>
-    <string name="minsdk_or_later">%s 或更新</string>
     <string name="requires_features">需要：%1$s</string>
     <string name="pref_language">語言</string>
     <string name="pref_language_default">系統預設</string>
@@ -246,8 +245,6 @@
     <string name="update_auto_download">自動取得更新</string>
     <string name="update_auto_download_summary">自動下載更新的程式並通知您安裝</string>
     <string name="no_handler_app">您沒有任何可處理 %s 的應用程式。</string>
-    <string name="up_to_maxsdk">直到 %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s 直到 %2$s</string>
     <string name="empty_search_available_app_list">沒有相符合的應用程式可用。</string>
     <string name="repo_searching_address">正在 %1$s 查看封裝的軟體庫</string>
     <string name="not_on_same_wifi">您的裝置與剛新增的本地軟體庫不在同一個 Wi-Fi 網路上！請試著加入此網路：%s</string>
@@ -348,7 +345,7 @@
     </plurals>
 
     <string name="app_recommended_version_installed">版本 %1$s （推薦）</string>
-    <string name="app__newly_added">最新</string>
+    <string name="app_new">最新</string>
 
     <string name="installed_apps__activity_title">已安裝的應用程式</string>
     <string name="installed_app__updates_ignored">已忽略的更新</string>
@@ -367,7 +364,7 @@
 
     <string name="app_list__name__downloading_in_progress">正在下載 %1$s</string>
 
-    <string name="updates__tts__download_updates_for_all_apps">下載所有更新</string>
+    <string name="update_all">下載所有更新</string>
 
     <string name="updates__hide_updateable_apps">隱藏應用程式</string>
     <string name="updates__show_updateable_apps">顯示應用程式</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 89c683d15..c3c9df65d 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -16,6 +16,9 @@
     <string name="https">https://</string>
 
     <string name="app_details_subject">%1$s on F-Droid</string>
+    <string name="minsdk_or_later">%s+</string>
+    <string name="up_to_maxsdk">1.0-%s</string>
+    <string name="minsdk_up_to_maxsdk">%1$s-%2$s</string>
 
     <!-- The unset value is set to a string that is impossible to be a valid Java package name. This
      prevents abuse by creating malware with the same packageName as the unset string. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec4252413..8f24bd641 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,7 +90,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="app_suggested">Suggested</string>
     <string name="app_incompatible">Incompatible</string>
     <string name="app_installed">Installed</string>
-    <string name="app__newly_added">New</string>
+    <string name="app_new">New</string>
     <string name="app_not_installed">Not Installed</string>
     <string name="app_inst_known_source">Installed (from %s)</string>
     <string name="app_inst_unknown_source">Installed (from unknown source)</string>
@@ -125,7 +125,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <!-- The inline download button shown in the "Updates" screen only uses an icon and so requires
     some descriptive text for the TTS engine -->
     <string name="updates__tts__download_app">Download</string>
-    <string name="updates__tts__download_updates_for_all_apps">Update all</string>
+    <string name="update_all">Update all</string>
     <string name="updates__hide_updateable_apps">Hide apps</string>
     <string name="updates__show_updateable_apps">Show apps</string>
     <plurals name="updates__download_updates_for_apps">
@@ -356,9 +356,6 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="repo_added">Saved package repository %1$s.</string>
     <string name="repo_searching_address">Looking for package repository at\n%1$s</string>
     <string name="share_repository">Share Repository</string>
-    <string name="minsdk_or_later">%s+</string>
-    <string name="up_to_maxsdk">1.0-%s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s-%2$s</string>
     <string name="not_on_same_wifi">Your device is not on the same Wi-Fi as the local repo you just added! Try joining
         this network: %s
     </string>

From 568ef562474297bbdef0765263051a6e5198cc7b Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 9 Dec 2018 16:37:18 +0900
Subject: [PATCH 6/6] fix merge issues and tweak the header layouts a bit more

---
 .../main/java/org/fdroid/fdroid/data/App.java | 10 +++
 .../views/AppDetailsRecyclerViewAdapter.java  |  6 +-
 .../fdroid/views/updates/UpdatesAdapter.java  |  1 -
 .../updates/items/UpdateableAppsHeader.java   |  1 -
 .../main/res/layout/app_details2_header.xml   | 17 ++---
 .../main/res/layout/app_permission_item.xml   | 51 ---------------
 .../res/layout/updateable_app_status_item.xml | 62 ++++++++++---------
 7 files changed, 55 insertions(+), 93 deletions(-)
 mode change 100755 => 100644 app/src/main/res/layout/app_details2_header.xml
 delete mode 100644 app/src/main/res/layout/app_permission_item.xml

diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 555cf815e..16d56d278 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -396,6 +396,16 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         return app;
     }
 
+    /**
+     * In order to format all in coming descriptions before they are written
+     * out to the database and used elsewhere, this is needed to intercept
+     * the setting of {@link App#description} to insert the format method.
+     */
+    @JsonProperty("description")
+    private void setDescription(String description) { // NOPMD
+        this.description = formatDescription(description);
+    }
+
     /**
      * Parses the {@code localized} block in the incoming index metadata,
      * choosing the best match in terms of locale/language while filling as
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 1ff8a6b7f..a0931d941 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -504,8 +504,8 @@ public class AppDetailsRecyclerViewAdapter
                 sbWhatsNew.append(whatsNewView.getContext().getString(R.string.details_new_in_version,
                         suggestedApk.versionName).toUpperCase(locale));
                 sbWhatsNew.append("\n\n");
-                sbWhatsNew.append(app.whatsNew);
-                whatsNewView.setText(trimTrailingNewlines(sbWhatsNew));
+                sbWhatsNew.append(trimTrailingNewlines(Html.fromHtml(app.whatsNew)));
+                whatsNewView.setText(sbWhatsNew);
                 whatsNewView.setVisibility(View.VISIBLE);
 
                 // Set focus on the header section to prevent auto scrolling to
@@ -1091,7 +1091,7 @@ public class AppDetailsRecyclerViewAdapter
             Repo repo = RepoProvider.Helper.findById(context, apk.repoId);
             if (repo != null) {
                 repository.setVisibility(View.VISIBLE);
-                repository.setText(String.format(repo.getName(), context.getString(R.string.app_repository)));
+                repository.setText(String.format(context.getString(R.string.app_repository), repo.getName()));
             } else {
                 repository.setVisibility(View.INVISIBLE);
             }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
index 5a93e3e93..15cf1b6d6 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
@@ -138,7 +138,6 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     public void toggleAllUpdateableApps() {
         showAllUpdateableApps = !showAllUpdateableApps;
         populateItems();
-        notifyDataSetChanged();
     }
 
     /**
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
index beebd062d..dfb8e1d2f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
@@ -8,7 +8,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.TextView;
 import com.hannesdorfmann.adapterdelegates3.AdapterDelegate;
 import org.fdroid.fdroid.R;
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
old mode 100755
new mode 100644
index fb0805bc2..9886d50e4
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -184,11 +184,11 @@
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
             android:scrollbars="none"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textIsSelectable="true"
@@ -215,11 +215,11 @@
             android:id="@+id/label_anti_features"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
             android:scrollbars="none"
             android:text="@string/antifeatures"
             android:textStyle="bold"
@@ -230,23 +230,24 @@
             android:id="@+id/text_anti_features"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
             android:scrollbars="none"
-            tools:text="\t• This app tracks and reports your activity."
+            tools:text="This app tracks and reports your activity."
             android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <TextView
             android:id="@+id/description_more"
+            style="@style/DetailsMoreButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="4dp"
             android:text="@string/more"
             android:textAllCaps="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            style="@style/DetailsMoreButtonStyle" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
     </LinearLayout>
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/app_permission_item.xml b/app/src/main/res/layout/app_permission_item.xml
deleted file mode 100644
index 366c1e07d..000000000
--- a/app/src/main/res/layout/app_permission_item.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<!--
-  Defines the layout of a single permission item.
--->
-
-<view class="org.fdroid.fdroid.privileged.views.AppSecurityPermissions$PermissionItemView"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/perm_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
-        android:scaleType="fitCenter" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
-
-    <TextView
-        android:id="@+id/perm_name"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="16sp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|start" />
-
-</view>
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index a29eea61f..3906b848d 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <LinearLayout
+    <android.support.constraint.ConstraintLayout
         android:id="@+id/text_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -35,8 +35,7 @@
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/action_button"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/progress_bar"
-        android:orientation="vertical">
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <TextView
             android:id="@+id/app_name"
@@ -46,7 +45,9 @@
             android:textSize="16sp"
             android:textColor="?attr/installedApps"
             android:maxLines="2"
-            android:ellipsize="end" />
+            android:ellipsize="end"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/status"
@@ -55,34 +56,37 @@
             tools:text="@string/app_list_download_ready"
             style="@style/AppListItemStatusText"
             android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/app_name" />
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/cancel_button"
+            app:layout_constraintTop_toBottomOf="@id/status"
             tools:visibility="visible" />
 
-    </LinearLayout>
+        <ImageButton
+            android:id="@+id/cancel_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
+            android:src="@drawable/ic_cancel"
+            android:contentDescription="@string/cancel"
+            android:background="@android:color/transparent"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/progress_bar"
+            app:layout_constraintBottom_toBottomOf="@+id/progress_bar"
+            tools:visibility="visible" />
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:visibility="gone"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        app:layout_constraintStart_toEndOf="@+id/icon"
-        app:layout_constraintEnd_toStartOf="@+id/cancel_button"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:visibility="visible" />
-
-    <ImageButton
-        android:id="@+id/cancel_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_cancel"
-        android:contentDescription="@string/cancel"
-        android:background="@android:color/transparent"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/progress_bar"
-        app:layout_constraintBottom_toBottomOf="@+id/progress_bar"
-        tools:visibility="visible" />
+    </android.support.constraint.ConstraintLayout>
 
     <Button
         android:id="@+id/action_button"