From aff39954759d652d39a788ad1a7c6783b20ad934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 2 Dec 2015 18:42:43 +0100
Subject: [PATCH] tab fragments: use string resources consistently

Also, remove unnecessary "Installed" tab title duplicate.
---
 F-Droid/res/values-fr/strings.xml                              | 3 +--
 F-Droid/res/values-ja/strings.xml                              | 3 +--
 F-Droid/res/values-sc/strings.xml                              | 3 +--
 F-Droid/res/values-sr/strings.xml                              | 3 +--
 F-Droid/res/values/strings.xml                                 | 1 -
 .../fdroid/fdroid/views/fragments/AvailableAppsFragment.java   | 2 +-
 .../fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java   | 2 +-
 .../fdroid/fdroid/views/fragments/InstalledAppsFragment.java   | 2 +-
 8 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index cde769491..3d8fcb8a6 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -333,5 +333,4 @@
 
     <string name="tab_installed_apps_i18n">Installation (%d)</string>
     <string name="tab_updates_i18n">Mise à jour (%d)</string>
-    <string name="installed_title">Installé</string>
-</resources>
+    </resources>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 5cf59477e..99bfdfc26 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -332,5 +332,4 @@
 
     <string name="tab_installed_apps_i18n">ｲﾝｽﾄｰﾙ済 (%d)</string>
     <string name="tab_updates_i18n">更新 (%d)</string>
-    <string name="installed_title">ｲﾝｽﾄｰﾙ済</string>
-</resources>
+    </resources>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index aac3f719d..d51fe9493 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -333,5 +333,4 @@ Intregadu cun sa litzèntzia
 
     <string name="tab_updates_i18n">Agiornamentos (%d)</string>
     <string name="tab_installed_apps_i18n">Installadas (%d)</string>
-    <string name="installed_title">Installada</string>
-</resources>
+    </resources>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index 454d0556e..277adba07 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -325,7 +325,6 @@
     <string name="repo_edit_credentials">Измени лозинку</string>
     <string name="repo_error_empty_username">Празно корисничко име, акредитиви нису измењени</string>
 
-    <string name="installed_title">Инсталиране</string>
-<string name="tab_installed_apps_i18n">Инсталиране (%d)</string>
+    <string name="tab_installed_apps_i18n">Инсталиране (%d)</string>
     <string name="tab_updates_i18n">Надоградње (%d)</string>
     </resources>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index a533e7bcf..78bbf7bce 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -377,5 +377,4 @@
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
     <string name="theme_night">Night</string>
-    <string name="installed_title">Installed</string>
 </resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 896835ca6..ffb14c4e2 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -43,7 +43,7 @@ public class AvailableAppsFragment extends AppListFragment implements
 
     @Override
     protected String getFromTitle() {
-        return "Available";
+        return getString(R.string.tab_available_apps);
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
index 20402afe0..e767077b9 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
@@ -20,7 +20,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
 
     @Override
     protected String getFromTitle() {
-        return getString(R.string.updates);
+        return getString(R.string.tab_updates);
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
index 662f91a66..d5078b80f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
@@ -20,7 +20,7 @@ public class InstalledAppsFragment extends AppListFragment {
 
     @Override
     protected String getFromTitle() {
-        return getString(R.string.installed_title);
+        return getString(R.string.tab_installed_apps);
     }
 
     @Override