From f67527a86ec6d623a4e9588cf251c50e12ed29e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 2 Dec 2015 18:43:51 +0100
Subject: [PATCH] Replace _i18n with _count in tab strings

All strings are internationalized. Use a name that actually says what
they mean.
---
 F-Droid/res/values-fr/strings.xml                             | 2 --
 F-Droid/res/values-ja/strings.xml                             | 2 --
 F-Droid/res/values-sc/strings.xml                             | 2 --
 F-Droid/res/values-sr/strings.xml                             | 2 --
 F-Droid/res/values/strings.xml                                | 4 ++--
 .../org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java  | 4 ++--
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 3d8fcb8a6..90d5396a1 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -331,6 +331,4 @@
     <string name="repo_edit_credentials">Modifier le mot de passe</string>
     <string name="repo_error_empty_username">Utilisateur non renseigné, aucune modification n\'a été effectuée</string>
 
-    <string name="tab_installed_apps_i18n">Installation (%d)</string>
-    <string name="tab_updates_i18n">Mise à jour (%d)</string>
     </resources>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 99bfdfc26..7d6be3773 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -330,6 +330,4 @@
     <string name="repo_edit_credentials">ﾊﾟｽﾜｰﾄﾞを変更</string>
     <string name="repo_error_empty_username">ﾕｰｻﾞｰ名が空です。資格情報は変更されていません</string>
 
-    <string name="tab_installed_apps_i18n">ｲﾝｽﾄｰﾙ済 (%d)</string>
-    <string name="tab_updates_i18n">更新 (%d)</string>
     </resources>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index d51fe9493..22a3c379c 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -331,6 +331,4 @@ Intregadu cun sa litzèntzia
     <string name="repo_edit_credentials">Modìfica sa crae</string>
     <string name="repo_error_empty_username">Nùmene impreadore bòidu, credentziales non cambiadas</string>
 
-    <string name="tab_updates_i18n">Agiornamentos (%d)</string>
-    <string name="tab_installed_apps_i18n">Installadas (%d)</string>
     </resources>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index 277adba07..e027e3293 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -325,6 +325,4 @@
     <string name="repo_edit_credentials">Измени лозинку</string>
     <string name="repo_error_empty_username">Празно корисничко име, акредитиви нису измењени</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 78bbf7bce..d7a9a57f4 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -81,8 +81,8 @@
     <string name="tab_available_apps">Available</string>
     <string name="tab_installed_apps">Installed</string>
     <string name="tab_updates">Updates</string>
-    <string name="tab_installed_apps_i18n">Installed (%d)</string>
-    <string name="tab_updates_i18n">Updates (%d)</string>
+    <string name="tab_installed_apps_count">Installed (%d)</string>
+    <string name="tab_updates_count">Updates (%d)</string>
     <string name="one_update_available">1 update is available.</string>
     <string name="many_updates_available">%d updates are available.</string>
     <string name="fdroid_updates_available">F-Droid Updates Available</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
index 49fd5b9db..43ac7b81f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
@@ -26,12 +26,12 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
 
     private String getInstalledTabTitle() {
         int installedCount = AppProvider.Helper.count(parent, AppProvider.getInstalledUri());
-        return parent.getString(R.string.tab_installed_apps_i18n, installedCount);
+        return parent.getString(R.string.tab_installed_apps_count, installedCount);
     }
 
     private String getUpdateTabTitle() {
         int updateCount = AppProvider.Helper.count(parent, AppProvider.getCanUpdateUri());
-        return parent.getString(R.string.tab_updates_i18n, updateCount);
+        return parent.getString(R.string.tab_updates_count, updateCount);
     }
 
     @Override