From 09a7ec3fd3cd3b932b9ed4a16c87ce4bd9bcf150 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sun, 21 Oct 2018 13:31:50 +0200
Subject: [PATCH] Change inconsistent 'Upgrade' to 'Update'

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 .../fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java    | 4 ++--
 .../views/updates/items/KnownVulnAppListItemController.java   | 2 +-
 app/src/main/res/layout/app_details2_header.xml               | 2 +-
 app/src/main/res/values/strings.xml                           | 4 ++--
 4 files changed, 6 insertions(+), 6 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..7283456f1 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -1101,7 +1101,7 @@ public class AppDetailsRecyclerViewAdapter
             api.setText(getApiText(apk));
 
 
-            // Figuring out whether to show Install/Upgrade button or Downgrade button
+            // Figuring out whether to show Install/Update button or Downgrade button
             buttonDowngrade.setVisibility(View.GONE);
             buttonInstallUpgrade.setVisibility(View.GONE);
             buttonInstallUpgrade.setText(context.getString(R.string.menu_install));
@@ -1109,7 +1109,7 @@ public class AppDetailsRecyclerViewAdapter
             if (isAppInstalled && !isApkInstalled) {
                 if (apk.versionCode > app.installedVersionCode) {
                     // Change the label to indicate that pressing this
-                    // button will result in upgrading the installed app
+                    // button will result in updating the installed app
                     buttonInstallUpgrade.setText(R.string.menu_upgrade);
                 } else if (apk.versionCode < app.installedVersionCode) {
                     // The Downgrade button should be shown in this case
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
index 61ac64c2e..6d3631940 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
@@ -67,7 +67,7 @@ public class KnownVulnAppListItemController extends AppListItemController {
         Apk installedApk = app.getInstalledApk(activity);
         if (installedApk == null) {
             throw new IllegalStateException(
-                    "Tried to upgrade or uninstall app with known vulnerability but it doesn't seem to be installed");
+                    "Tried to update or uninstall app with known vulnerability but it doesn't seem to be installed");
         }
 
         Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(activity, app);
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 1a7270c28..643d3aa7b 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -135,7 +135,7 @@
                     android:layout_toStartOf="@id/progress_cancel" />
             </RelativeLayout>
 
-            <!-- Install, Uninstall, Upgrade, Open buttons -->
+            <!-- Install, Uninstall, Update, Open buttons -->
             <LinearLayout
                 android:id="@+id/button_layout"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab12e7e1f..123dd9911 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,7 +122,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <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__prompt_upgrade">We found a vulnerability with %1$s. We recommend updating to the newest version immediately.</string>
     <string name="updates__app_with_known_vulnerability__ignore">Ignore</string>
 
     <string name="updates__hide_updateable_apps">Hide apps</string>
@@ -188,7 +188,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="menu_video">Video</string>
     <string name="menu_license">License: %s</string>
     <string name="menu_source">Source Code</string>
-    <string name="menu_upgrade">Upgrade</string>
+    <string name="menu_upgrade">Update</string>
     <string name="menu_downgrade">Downgrade</string>
     <string name="menu_donate">Donate</string>
     <string name="menu_bitcoin">Bitcoin</string>