From cdfe1566fa3715ec1fb4a2260d7268c67659d604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 14 Sep 2015 15:00:14 -0700
Subject: [PATCH] Give more context on some strings, split installed

As per !140, some languages require different translations for an app being
installed and the tab name for installed apps. Namely, one is plural while the
other isn't. Separate the two.
---
 F-Droid/res/layout/swap_app_list_item.xml           |  4 ++--
 F-Droid/res/values-ar/strings.xml                   | 10 +++++-----
 F-Droid/res/values-ast/strings.xml                  | 10 +++++-----
 F-Droid/res/values-bg/strings.xml                   | 10 +++++-----
 F-Droid/res/values-ca/strings.xml                   | 12 ++++++------
 F-Droid/res/values-cs/strings.xml                   | 12 ++++++------
 F-Droid/res/values-de/strings.xml                   | 12 ++++++------
 F-Droid/res/values-el/strings.xml                   |  6 +++---
 F-Droid/res/values-eo/strings.xml                   | 10 +++++-----
 F-Droid/res/values-es/strings.xml                   | 12 ++++++------
 F-Droid/res/values-eu/strings.xml                   | 12 ++++++------
 F-Droid/res/values-fa/strings.xml                   |  4 ++--
 F-Droid/res/values-fi/strings.xml                   |  8 ++++----
 F-Droid/res/values-fr/strings.xml                   | 10 +++++-----
 F-Droid/res/values-gl/strings.xml                   |  6 +++---
 F-Droid/res/values-he/strings.xml                   | 12 ++++++------
 F-Droid/res/values-hu/strings.xml                   |  6 +++---
 F-Droid/res/values-it/strings.xml                   |  6 +++---
 F-Droid/res/values-ja/strings.xml                   | 12 ++++++------
 F-Droid/res/values-ko/strings.xml                   | 10 +++++-----
 F-Droid/res/values-lt/strings.xml                   |  6 +++---
 F-Droid/res/values-lv/strings.xml                   | 10 +++++-----
 F-Droid/res/values-nb/strings.xml                   | 10 +++++-----
 F-Droid/res/values-nl/strings.xml                   | 12 ++++++------
 F-Droid/res/values-pl/strings.xml                   | 12 ++++++------
 F-Droid/res/values-pt-rBR/strings.xml               | 12 ++++++------
 F-Droid/res/values-ro/strings.xml                   |  6 +++---
 F-Droid/res/values-ru/strings.xml                   | 10 +++++-----
 F-Droid/res/values-sc/strings.xml                   | 12 ++++++------
 F-Droid/res/values-sk/strings.xml                   | 10 +++++-----
 F-Droid/res/values-sl/strings.xml                   |  6 +++---
 F-Droid/res/values-sr/strings.xml                   | 10 +++++-----
 F-Droid/res/values-sv/strings.xml                   | 10 +++++-----
 F-Droid/res/values-tr/strings.xml                   | 10 +++++-----
 F-Droid/res/values-ug/strings.xml                   |  6 +++---
 F-Droid/res/values-uk/strings.xml                   |  6 +++---
 F-Droid/res/values-vi/strings.xml                   | 10 +++++-----
 F-Droid/res/values-zh-rCN/strings.xml               |  6 +++---
 F-Droid/res/values-zh-rHK/strings.xml               | 10 +++++-----
 F-Droid/res/values/strings.xml                      | 13 +++++++------
 F-Droid/src/org/fdroid/fdroid/AppDetails.java       | 10 +++++-----
 .../fdroid/views/AppListFragmentPagerAdapter.java   |  4 ++--
 .../views/fragments/InstalledAppsFragment.java      |  2 +-
 43 files changed, 194 insertions(+), 193 deletions(-)

diff --git a/F-Droid/res/layout/swap_app_list_item.xml b/F-Droid/res/layout/swap_app_list_item.xml
index c0ae3911c..8542c5dfe 100644
--- a/F-Droid/res/layout/swap_app_list_item.xml
+++ b/F-Droid/res/layout/swap_app_list_item.xml
@@ -47,7 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textStyle="italic"
-            android:text="@string/inst" />
+            android:text="@string/app_installed" />
 
         <TextView
             android:id="@+id/status_incompatible"
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:textStyle="italic"
             android:textColor="@color/swap_incompatible"
-            android:text="@string/incompatible" />
+            android:text="@string/app_incompatible" />
 
         <TextView
             android:id="@+id/btn_attempt_install"
diff --git a/F-Droid/res/values-ar/strings.xml b/F-Droid/res/values-ar/strings.xml
index f5c43f9b1..705eba857 100644
--- a/F-Droid/res/values-ar/strings.xml
+++ b/F-Droid/res/values-ar/strings.xml
@@ -11,10 +11,10 @@
   <string name="about_site">الموقع الإلكتروني:</string>
   <string name="about_mail">البريد الإلكتروني:</string>
   <string name="about_version">الإصدار:</string>
-  <string name="inst">مثبت</string>
-  <string name="not_inst">غير مثبت</string>
-  <string name="inst_known_source">مثبت (من s%)</string>
-  <string name="inst_unknown_source">مثبت ( من مصدر غير معروف)</string>
+  <string name="app_installed">مثبت</string>
+  <string name="app_not_installed">غير مثبت</string>
+  <string name="app_inst_known_source">مثبت (من s%)</string>
+  <string name="app_inst_unknown_source">مثبت ( من مصدر غير معروف)</string>
   <string name="ok">موافق</string>
   <string name="yes">نعم</string>
   <string name="no">لا</string>
@@ -23,7 +23,7 @@
   <string name="cancel">إلغاء</string>
   <string name="enable">تمكين</string>
   <string name="add_key">إضافة مفتاح</string>
-  <string name="tab_noninstalled">متواجد</string>
+  <string name="tab_available_apps">متواجد</string>
   <string name="tab_updates">التحديثات</string>
   <string name="choose_bt_send">إختيار البلوتوث كطريقة إرسال</string>
   <string name="send_via_bluetooth">إرسال بواسطة البلوتوث</string>
diff --git a/F-Droid/res/values-ast/strings.xml b/F-Droid/res/values-ast/strings.xml
index d524a8138..0bbd690b0 100644
--- a/F-Droid/res/values-ast/strings.xml
+++ b/F-Droid/res/values-ast/strings.xml
@@ -38,10 +38,10 @@ Llanzáu baxo la llicencia GNU GPLv3.</string>
   <string name="about_site">Sitiu web:</string>
   <string name="about_mail">Corréu:</string>
   <string name="about_version">Versión:</string>
-  <string name="inst">Instaláu</string>
-  <string name="not_inst">Non instaláu</string>
-  <string name="inst_known_source">Instaláu (dende %s)</string>
-  <string name="inst_unknown_source">Instaláu (dende fonte desconocida)</string>
+  <string name="app_installed">Instaláu</string>
+  <string name="app_not_installed">Non instaláu</string>
+  <string name="app_inst_known_source">Instaláu (dende %s)</string>
+  <string name="app_inst_unknown_source">Instaláu (dende fonte desconocida)</string>
   <string name="added_on">Amestáu\'l %s</string>
   <string name="ok">Aceutar</string>
   <string name="yes">Sí</string>
@@ -52,7 +52,7 @@ Llanzáu baxo la llicencia GNU GPLv3.</string>
   <string name="enable">Habilitar</string>
   <string name="add_key">Amestar clave</string>
   <string name="overwrite">Sobrescribir</string>
-  <string name="tab_noninstalled">Disponible</string>
+  <string name="tab_available_apps">Disponible</string>
   <string name="tab_updates">Anovamientos</string>
   <string name="one_update_available">Un anovamientu disponible.</string>
   <string name="many_updates_available">%d anovamientos disponibles.</string>
diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index 6448ae3b3..46b662c15 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -37,10 +37,10 @@
   <string name="about_site">Уебсайт:</string>
   <string name="about_mail">Имейл:</string>
   <string name="about_version">Версия:</string>
-  <string name="inst">Инсталирана</string>
-  <string name="not_inst">Неинсталирана</string>
-  <string name="inst_known_source">Инсталирана (от %s)</string>
-  <string name="inst_unknown_source">Инсталирана (от неизвестен източник)</string>
+  <string name="app_installed">Инсталирана</string>
+  <string name="app_not_installed">Неинсталирана</string>
+  <string name="app_inst_known_source">Инсталирана (от %s)</string>
+  <string name="app_inst_unknown_source">Инсталирана (от неизвестен източник)</string>
   <string name="added_on">Добавена на %s</string>
   <string name="ok">Добре</string>
   <string name="yes">Да</string>
@@ -49,7 +49,7 @@
   <string name="repo_add_add">Добавяне</string>
   <string name="cancel">Отказ</string>
   <string name="add_key">Добавете ключ</string>
-  <string name="tab_noninstalled">Налични</string>
+  <string name="tab_available_apps">Налични</string>
   <string name="tab_updates">Обновявания</string>
   <string name="one_update_available">1 налична актуализация.</string>
   <string name="many_updates_available">%d налични актуализации.</string>
diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index f4eed787a..304a17528 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -37,10 +37,10 @@ Publicat amb la llicència GNU GPL v3.</string>
   <string name="about_site">Pàgina web:</string>
   <string name="about_mail">Correu:</string>
   <string name="about_version">Versió:</string>
-  <string name="inst">Instal·lat</string>
-  <string name="not_inst">No està instal·lat</string>
-  <string name="inst_known_source">Instal·lat (des de %s)</string>
-  <string name="inst_unknown_source">Instal·lat (font desconeguda)</string>
+  <string name="app_installed">Instal·lat</string>
+  <string name="app_not_installed">No està instal·lat</string>
+  <string name="app_inst_known_source">Instal·lat (des de %s)</string>
+  <string name="app_inst_unknown_source">Instal·lat (font desconeguda)</string>
   <string name="added_on">S\'ha afegit a %s</string>
   <string name="ok">D\'acord</string>
   <string name="yes">Sí</string>
@@ -51,7 +51,7 @@ Publicat amb la llicència GNU GPL v3.</string>
   <string name="enable">Permès</string>
   <string name="add_key">Afegeix clau</string>
   <string name="overwrite">Sobreescriu</string>
-  <string name="tab_noninstalled">Disponible</string>
+  <string name="tab_available_apps">Disponible</string>
   <string name="tab_updates">Actualitzacions</string>
   <string name="one_update_available">Hi ha 1 actualització disponible.</string>
   <string name="many_updates_available">Hi ha %d actualitzacions disponibles.</string>
@@ -192,7 +192,7 @@ Tingueu compte amb aplicacions baixades des de dipòsits sense empremta digital.
 <string name="app_name">F-Droid</string>
 
 	<string name="about_source">Codi font:</string>
-	<string name="incompatible">Incompatible</string>
+	<string name="app_incompatible">Incompatible</string>
 	<string name="links">Enllaços</string>
 	<string name="content_description_view_more">Veure més</string>
 
diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml
index 0ab06c6ba..e0f712e96 100644
--- a/F-Droid/res/values-cs/strings.xml
+++ b/F-Droid/res/values-cs/strings.xml
@@ -34,8 +34,8 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="about_site">Webová stránka:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Verze:</string>
-  <string name="inst">Je nainstalováno</string>
-  <string name="not_inst">Není nainstalováno</string>
+  <string name="app_installed">Je nainstalováno</string>
+  <string name="app_not_installed">Není nainstalováno</string>
   <string name="added_on">Přidáno %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ano</string>
@@ -46,7 +46,7 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="enable">Povolit</string>
   <string name="add_key">Přidat klíč</string>
   <string name="overwrite">Přepsat</string>
-  <string name="tab_noninstalled">Dostupné</string>
+  <string name="tab_available_apps">Dostupné</string>
   <string name="tab_updates">Aktualizace</string>
   <string name="one_update_available">1 aktualizace je dostupná.</string>
   <string name="many_updates_available">%d aktualizací je dostupných.</string>
@@ -160,9 +160,9 @@ Uvolněno pod GPLv3 licencí.</string>
 	<string name="uninstall_system">Odinstalovat verzi se systémovými oprávněními</string>
 	<string name="uninstall_system_summary">Odinstaluje dodatečnou aplikaci se systémovými oprávněními</string>
 	<string name="about_source">Zdroj:</string>
-	<string name="incompatible">Nekompatibilní</string>
-	<string name="inst_known_source">Nainstalováno (z %s)</string>
-	<string name="inst_unknown_source">Nainstalováno (z neznámého zdroje)</string>
+	<string name="app_incompatible">Nekompatibilní</string>
+	<string name="app_inst_known_source">Nainstalováno (z %s)</string>
+	<string name="app_inst_unknown_source">Nainstalováno (z neznámého zdroje)</string>
 
 	<string name="links">Odkazy</string>
 	<string name="content_description_view_more">Více</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index 6eac4f3a6..de39e6acc 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -38,10 +38,10 @@ Veröffentlicht unter der GNU GPLv3 Lizenz.</string>
   <string name="about_site">Internetseite:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Version:</string>
-  <string name="inst">Installiert</string>
-  <string name="not_inst">Nicht installiert</string>
-  <string name="inst_known_source">Installiert (aus %s)</string>
-  <string name="inst_unknown_source">Installiert (aus unbekannter Quelle)</string>
+  <string name="app_installed">Installiert</string>
+  <string name="app_not_installed">Nicht installiert</string>
+  <string name="app_inst_known_source">Installiert (aus %s)</string>
+  <string name="app_inst_unknown_source">Installiert (aus unbekannter Quelle)</string>
   <string name="added_on">Hinzugefügt am %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ja</string>
@@ -52,7 +52,7 @@ Veröffentlicht unter der GNU GPLv3 Lizenz.</string>
   <string name="enable">Aktivieren</string>
   <string name="add_key">Schlüssel hinzufügen</string>
   <string name="overwrite">Überschreiben</string>
-  <string name="tab_noninstalled">Verfügbar</string>
+  <string name="tab_available_apps">Verfügbar</string>
   <string name="tab_updates">Updates</string>
   <string name="one_update_available">Eine Aktualisierung ist verfügbar.</string>
   <string name="many_updates_available">%d Aktualisierungen sind verfügbar.</string>
@@ -201,7 +201,7 @@ Bemerkung: Alle
   <string name="swap_welcome">Willkommen bei F-Droid!</string>
   <string name="swap_confirm_connect">Möchten Sie jetzt Apps von %1$s erhalten?</string>
 <string name="about_source">Quelle:</string>
-	<string name="incompatible">Inkompatibel</string>
+	<string name="app_incompatible">Inkompatibel</string>
 	<string name="links">Links</string>
 	<string name="back">Zurück</string>
 	<string name="update_notification_more">+%1$d mehr…</string>
diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml
index 6ccb4f3db..347c09f86 100644
--- a/F-Droid/res/values-el/strings.xml
+++ b/F-Droid/res/values-el/strings.xml
@@ -32,8 +32,8 @@
   <string name="about_site">Ιστοσελίδα:</string>
   <string name="about_mail">Ηλ. ταχυδρομείο:</string>
   <string name="about_version">Έκδοση:</string>
-  <string name="inst">Εγκατεστημένο</string>
-  <string name="not_inst">Δεν είναι εγκατεστημένο</string>
+  <string name="app_installed">Εγκατεστημένο</string>
+  <string name="app_not_installed">Δεν είναι εγκατεστημένο</string>
   <string name="added_on">Προστέθηκε στις %s</string>
   <string name="ok">Εντάξει</string>
   <string name="yes">Ναι</string>
@@ -44,7 +44,7 @@
   <string name="enable">Ενεργοποίηση</string>
   <string name="add_key">Προσθήκη κλειδιού</string>
   <string name="overwrite">Αντικατάσταση</string>
-  <string name="tab_noninstalled">Διαθέσιμα</string>
+  <string name="tab_available_apps">Διαθέσιμα</string>
   <string name="tab_updates">Ενημερώσεις</string>
   <string name="one_update_available">1 διαθέσιμη ενημερώση.</string>
   <string name="many_updates_available">%d διαθέσιμες ενημερώσεις.</string>
diff --git a/F-Droid/res/values-eo/strings.xml b/F-Droid/res/values-eo/strings.xml
index 4f1150df1..0310fe684 100644
--- a/F-Droid/res/values-eo/strings.xml
+++ b/F-Droid/res/values-eo/strings.xml
@@ -17,10 +17,10 @@
   <string name="about_site">Retejo:</string>
   <string name="about_mail">Retpoŝto:</string>
   <string name="about_version">Versio:</string>
-  <string name="inst">Instalita</string>
-  <string name="not_inst">Ne instalita</string>
-  <string name="inst_known_source">Instalita (de %s)</string>
-  <string name="inst_unknown_source">Instalita (de nekonata fonto)</string>
+  <string name="app_installed">Instalita</string>
+  <string name="app_not_installed">Ne instalita</string>
+  <string name="app_inst_known_source">Instalita (de %s)</string>
+  <string name="app_inst_unknown_source">Instalita (de nekonata fonto)</string>
   <string name="added_on">Aldonita je %s</string>
   <string name="ok">Bone</string>
   <string name="yes">Jes</string>
@@ -29,7 +29,7 @@
   <string name="repo_add_add">Aldoni</string>
   <string name="cancel">Nuligi</string>
   <string name="overwrite">Anstataŭigi</string>
-  <string name="tab_noninstalled">Disponeblaj</string>
+  <string name="tab_available_apps">Disponeblaj</string>
   <string name="tab_updates">Ĝisdatigoj</string>
   <string name="one_update_available">1 ĝisdatigo estas disponebla.</string>
   <string name="many_updates_available">%d ĝisdatigoj estas disponeblaj.</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 534efd324..7a23fc6eb 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -38,10 +38,10 @@ Publicado bajo la licencia GNU GPLv3.</string>
   <string name="about_site">Página web:</string>
   <string name="about_mail">Correo electrónico:</string>
   <string name="about_version">Versión:</string>
-  <string name="inst">Instalado</string>
-  <string name="not_inst">No instalado</string>
-  <string name="inst_known_source">Instalado (desde %s)</string>
-  <string name="inst_unknown_source">Instalado (desde origen desconocido)</string>
+  <string name="app_installed">Instalado</string>
+  <string name="app_not_installed">No instalado</string>
+  <string name="app_inst_known_source">Instalado (desde %s)</string>
+  <string name="app_inst_unknown_source">Instalado (desde origen desconocido)</string>
   <string name="added_on">Agregado el %s</string>
   <string name="ok">OK</string>
   <string name="yes">Sí</string>
@@ -52,7 +52,7 @@ Publicado bajo la licencia GNU GPLv3.</string>
   <string name="enable">Habilitar</string>
   <string name="add_key">Añadir clave</string>
   <string name="overwrite">Sobreescribir</string>
-  <string name="tab_noninstalled">Disponible</string>
+  <string name="tab_available_apps">Disponible</string>
   <string name="tab_updates">Actualizaciones</string>
   <string name="one_update_available">1 actualización disponible.</string>
   <string name="many_updates_available">%d actualizaciones disponibles.</string>
@@ -201,7 +201,7 @@ Deberías tener cuidado con aplicaciones descargadas desde índices no firmados.
 <string name="app_name">F-Droid</string>
 
 	<string name="about_source">Código:</string>
-	<string name="incompatible">Incompatible</string>
+	<string name="app_incompatible">Incompatible</string>
 	<string name="links">Enlaces</string>
 	<string name="content_description_view_more">Ver más</string>
 
diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml
index 83a0d3d15..00357e594 100644
--- a/F-Droid/res/values-eu/strings.xml
+++ b/F-Droid/res/values-eu/strings.xml
@@ -26,8 +26,8 @@ GNU GPLv3 lizentziapean argitaratua.</string>
   <string name="about_site">Webgunea:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Bertsioa:</string>
-  <string name="inst">Instalatuta</string>
-  <string name="not_inst">Instalatu gabea</string>
+  <string name="app_installed">Instalatuta</string>
+  <string name="app_not_installed">Instalatu gabea</string>
   <string name="added_on">%s(e)an gehitua</string>
   <string name="ok">Ados</string>
   <string name="yes">Bai</string>
@@ -38,7 +38,7 @@ GNU GPLv3 lizentziapean argitaratua.</string>
   <string name="enable">Gaitu</string>
   <string name="add_key">Gehitu gakoa</string>
   <string name="overwrite">Gainidatzi</string>
-  <string name="tab_noninstalled">Eskuragarri</string>
+  <string name="tab_available_apps">Eskuragarri</string>
   <string name="tab_updates">Eguneraketak</string>
   <string name="one_update_available">Eguneraketa 1 eskuragarri.</string>
   <string name="many_updates_available">%d eguneraketa eskuragarri.</string>
@@ -107,9 +107,9 @@ konektatzen</string>
 	<string name="uninstall_system_summary">Desinstalatu pribilegiodun F-Droid aplikazio gehigarria</string>
 	<string name="local_repo_https">Erabili konexio pribatua</string>
 	<string name="about_source">Iturria:</string>
-	<string name="incompatible">Bateraezina</string>
-	<string name="inst_known_source">Instalatuta (%stik)</string>
-	<string name="inst_unknown_source">Instalatuta (Iturri ezezagunetik)</string>
+	<string name="app_incompatible">Bateraezina</string>
+	<string name="app_inst_known_source">Instalatuta (%stik)</string>
+	<string name="app_inst_unknown_source">Instalatuta (Iturri ezezagunetik)</string>
 
 	<string name="links">Loturak</string>
 	<string name="content_description_view_more">Ikusi gehiago</string>
diff --git a/F-Droid/res/values-fa/strings.xml b/F-Droid/res/values-fa/strings.xml
index eaaca9db9..458e91de5 100644
--- a/F-Droid/res/values-fa/strings.xml
+++ b/F-Droid/res/values-fa/strings.xml
@@ -19,8 +19,8 @@
   <string name="no_such_app">چنین برنامه‌ای یافت نشد</string>
   <string name="about_title">دربارهٔ F-Droid</string>
   <string name="about_mail">رایانامه:</string>
-  <string name="inst">نصب‌شده</string>
-  <string name="not_inst">نصب‌نشده</string>
+  <string name="app_installed">نصب‌شده</string>
+  <string name="app_not_installed">نصب‌نشده</string>
   <string name="added_on">به %s افزوده شد</string>
   <string name="ok">باشد</string>
   <string name="yes">بله</string>
diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml
index 8ee45a731..3df4625cf 100644
--- a/F-Droid/res/values-fi/strings.xml
+++ b/F-Droid/res/values-fi/strings.xml
@@ -39,9 +39,9 @@ käyttöehtojen mukaisesti.</string>
   <string name="about_site">Verkkosivu:</string>
   <string name="about_mail">Sähköposti:</string>
   <string name="about_version">Versio:</string>
-  <string name="inst">Asennettu</string>
-  <string name="not_inst">Ei asennettu</string>
-  <string name="inst_unknown_source">Asennettu (tuntemattomasta lähteestä)</string>
+  <string name="app_installed">Asennettu</string>
+  <string name="app_not_installed">Ei asennettu</string>
+  <string name="app_inst_unknown_source">Asennettu (tuntemattomasta lähteestä)</string>
   <string name="added_on">Lisätty %s</string>
   <string name="ok">OK</string>
   <string name="yes">Kyllä</string>
@@ -52,7 +52,7 @@ käyttöehtojen mukaisesti.</string>
   <string name="enable">Ota käyttöön</string>
   <string name="add_key">Lisää avain</string>
   <string name="overwrite">Korvaa</string>
-  <string name="tab_noninstalled">Saatavilla</string>
+  <string name="tab_available_apps">Saatavilla</string>
   <string name="tab_updates">Päivityksiä</string>
   <string name="one_update_available">1 päivitys saatavilla.</string>
   <string name="many_updates_available">%d päivitystä saatavilla.</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 5f37f5a00..d35a29743 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -38,10 +38,10 @@ Publiée sous licence GNU GPLv3.</string>
   <string name="about_site">Site web :</string>
   <string name="about_mail">Courriel :</string>
   <string name="about_version">Version :</string>
-  <string name="inst">Installée</string>
-  <string name="not_inst">Non installée</string>
-  <string name="inst_known_source">Installé (depuis %s)</string>
-  <string name="inst_unknown_source">Installé (depuis une source inconnue)</string>
+  <string name="app_installed">Installée</string>
+  <string name="app_not_installed">Non installée</string>
+  <string name="app_inst_known_source">Installé (depuis %s)</string>
+  <string name="app_inst_unknown_source">Installé (depuis une source inconnue)</string>
   <string name="added_on">Ajoutée le %s</string>
   <string name="ok">OK</string>
   <string name="yes">Oui</string>
@@ -52,7 +52,7 @@ Publiée sous licence GNU GPLv3.</string>
   <string name="enable">Activer</string>
   <string name="add_key">Ajouter une clé</string>
   <string name="overwrite">Écraser</string>
-  <string name="tab_noninstalled">Disponibles</string>
+  <string name="tab_available_apps">Disponibles</string>
   <string name="tab_updates">Mises à jour</string>
   <string name="one_update_available">Une mise à jour est disponible.</string>
   <string name="many_updates_available">%d mises à jour sont disponibles.</string>
diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml
index dff0dbb34..22f5d6652 100644
--- a/F-Droid/res/values-gl/strings.xml
+++ b/F-Droid/res/values-gl/strings.xml
@@ -24,8 +24,8 @@ Publicado con licenza GNU GPLv3.</string>
   <string name="about_site">Sitio web:</string>
   <string name="about_mail">Correo:</string>
   <string name="about_version">Versión:</string>
-  <string name="inst">Instalada</string>
-  <string name="not_inst">Non instalada</string>
+  <string name="app_installed">Instalada</string>
+  <string name="app_not_installed">Non instalada</string>
   <string name="added_on">Engadida a %s</string>
   <string name="ok">Aceptar</string>
   <string name="yes">Si</string>
@@ -33,7 +33,7 @@ Publicado con licenza GNU GPLv3.</string>
   <string name="repo_add_title">Engadir un novo repositorio</string>
   <string name="repo_add_add">Engadir</string>
   <string name="cancel">Cancelar</string>
-  <string name="tab_noninstalled">Dispoñíbel</string>
+  <string name="tab_available_apps">Dispoñíbel</string>
   <string name="tab_updates">Actualizacións</string>
   <string name="one_update_available">1 Actualización dispoñíbel</string>
   <string name="many_updates_available">%d actualizacións dispoñíbeis</string>
diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml
index f56e676ea..24f95b88e 100644
--- a/F-Droid/res/values-he/strings.xml
+++ b/F-Droid/res/values-he/strings.xml
@@ -41,10 +41,10 @@
     <string name="about_site">אתר רשת:</string>
     <string name="about_mail">דוא״ל:</string>
     <string name="about_version">גרסא:</string>
-    <string name="inst">מותקנת</string>
-    <string name="not_inst">לא מותקנת</string>
-    <string name="inst_known_source">מותקנת (מתוך %s)</string>
-    <string name="inst_unknown_source">מותקנת (מתוך מקור לא ידוע)</string>
+    <string name="app_installed">מותקנת</string>
+    <string name="app_not_installed">לא מותקנת</string>
+    <string name="app_inst_known_source">מותקנת (מתוך %s)</string>
+    <string name="app_inst_unknown_source">מותקנת (מתוך מקור לא ידוע)</string>
 
     <string name="added_on">התווסף %s</string>
 
@@ -62,7 +62,7 @@
     <string name="add_key">הוסף מפתח</string>
     <string name="overwrite">שכתב</string>
 
-    <string name="tab_noninstalled">זמינים</string>
+    <string name="tab_available_apps">זמינים</string>
     <string name="tab_updates">עדכונים</string>
     <string name="one_update_available">עדכון 1 זמין.</string>
     <string name="many_updates_available">%d עדכונים זמינים.</string>
@@ -260,7 +260,7 @@
     <string name="downloading">כעת מוריד…</string>
 <string name="app_name">F-Droid</string>
 
-	<string name="incompatible">לא תואמת</string>
+	<string name="app_incompatible">לא תואמת</string>
 	<string name="back">אחורה</string>
 	<string name="repo_searching_address">כעת מחפש מאגר F-Droid אצל\n%1$s</string>
     <string name="wifi">Wi-Fi</string>
diff --git a/F-Droid/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml
index 875271dbd..15b045f49 100644
--- a/F-Droid/res/values-hu/strings.xml
+++ b/F-Droid/res/values-hu/strings.xml
@@ -32,8 +32,8 @@ Honosítás: gidano | sympda.info\"</string>
   <string name="about_site">Weboldal:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Verzió:</string>
-  <string name="inst">Telepítve</string>
-  <string name="not_inst">Nincs telepítve</string>
+  <string name="app_installed">Telepítve</string>
+  <string name="app_not_installed">Nincs telepítve</string>
   <string name="added_on">Hozzáadva %s</string>
   <string name="ok">Oké</string>
   <string name="yes">Igen</string>
@@ -44,7 +44,7 @@ Honosítás: gidano | sympda.info\"</string>
   <string name="enable">Engedélyez</string>
   <string name="add_key">Kulcs hozzáadás</string>
   <string name="overwrite">Felülírás</string>
-  <string name="tab_noninstalled">Elérhető</string>
+  <string name="tab_available_apps">Elérhető</string>
   <string name="tab_updates">Frissítések</string>
   <string name="one_update_available">1 frissítés érhető el.</string>
   <string name="many_updates_available">%d frissítés érhető el.</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index 8587546fe..c189f99f9 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -38,8 +38,8 @@ Rilasciato sotto licenza GNU GPLv3.</string>
   <string name="about_site">Sito Web:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Versione:</string>
-  <string name="inst">Installato</string>
-  <string name="not_inst">Non installato</string>
+  <string name="app_installed">Installato</string>
+  <string name="app_not_installed">Non installato</string>
   <string name="added_on">Aggiunto il %s</string>
   <string name="ok">OK</string>
   <string name="yes">Sì</string>
@@ -50,7 +50,7 @@ Rilasciato sotto licenza GNU GPLv3.</string>
   <string name="enable">Abilita</string>
   <string name="add_key">Aggiungi chiave</string>
   <string name="overwrite">Sovrascrivi</string>
-  <string name="tab_noninstalled">Disponibile</string>
+  <string name="tab_available_apps">Disponibile</string>
   <string name="tab_updates">Aggiornamenti</string>
   <string name="one_update_available">1 aggiornamento disponibile.</string>
   <string name="many_updates_available">%d aggiornamenti disponibili.</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 28b3d0850..cc9870cb1 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -37,10 +37,10 @@
   <string name="about_site">Webｻｲﾄ:</string>
   <string name="about_mail">電子ﾒｰﾙ:</string>
   <string name="about_version">ﾊﾞｰｼﾞｮﾝ:</string>
-  <string name="inst">入手済</string>
-  <string name="not_inst">未ｲﾝｽﾄｰﾙ</string>
-  <string name="inst_known_source">ｲﾝｽﾄｰﾙ済 (%s から)</string>
-  <string name="inst_unknown_source">ｲﾝｽﾄｰﾙ済 (入手元不明)</string>
+  <string name="app_installed">入手済</string>
+  <string name="app_not_installed">未ｲﾝｽﾄｰﾙ</string>
+  <string name="app_inst_known_source">ｲﾝｽﾄｰﾙ済 (%s から)</string>
+  <string name="app_inst_unknown_source">ｲﾝｽﾄｰﾙ済 (入手元不明)</string>
   <string name="added_on">%s に追加しました</string>
   <string name="ok">OK</string>
   <string name="yes">はい</string>
@@ -51,7 +51,7 @@
   <string name="enable">有効</string>
   <string name="add_key">ｷｰを追加</string>
   <string name="overwrite">上書き</string>
-  <string name="tab_noninstalled">入手可能</string>
+  <string name="tab_available_apps">入手可能</string>
   <string name="tab_updates">更新</string>
   <string name="one_update_available">1つの更新があります｡</string>
   <string name="many_updates_available">%d 個の更新があります｡</string>
@@ -195,7 +195,7 @@
   <string name="swap_confirm_connect">今すぐ %1$s からｱﾌﾟﾘを取得しますか?</string>
 <string name="uninstall_system">特権 F-Droid をｱﾝｲﾝｽﾄｰﾙ</string>
 	<string name="uninstall_system_summary">追加の特権を持つ F-Droid ｱﾌﾟﾘをｱﾝｲﾝｽﾄｰﾙします</string>
-	<string name="incompatible">非互換</string>
+	<string name="app_incompatible">非互換</string>
 	<string name="links">ﾘﾝｸ</string>
 	<string name="content_description_view_more">もっと見る</string>
 
diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml
index 0f55842f0..71d683b94 100644
--- a/F-Droid/res/values-ko/strings.xml
+++ b/F-Droid/res/values-ko/strings.xml
@@ -38,10 +38,10 @@ GNU GPLv3 라이센스 하에 배포됩니다.</string>
   <string name="about_site">웹사이트:</string>
   <string name="about_mail">이메일:</string>
   <string name="about_version">버전:</string>
-  <string name="inst">설치됨</string>
-  <string name="not_inst">설치되지 않음</string>
-  <string name="inst_known_source">설치됨 (%s (으)로부터)</string>
-  <string name="inst_unknown_source">설치됨 (알 수 없는 출처로부터)</string>
+  <string name="app_installed">설치됨</string>
+  <string name="app_not_installed">설치되지 않음</string>
+  <string name="app_inst_known_source">설치됨 (%s (으)로부터)</string>
+  <string name="app_inst_unknown_source">설치됨 (알 수 없는 출처로부터)</string>
   <string name="added_on">%s에 추가됨</string>
   <string name="ok">확인</string>
   <string name="yes">예</string>
@@ -52,7 +52,7 @@ GNU GPLv3 라이센스 하에 배포됩니다.</string>
   <string name="enable">사용</string>
   <string name="add_key">키 추가</string>
   <string name="overwrite">덮어쓰기</string>
-  <string name="tab_noninstalled">사용 가능</string>
+  <string name="tab_available_apps">사용 가능</string>
   <string name="tab_updates">업데이트</string>
   <string name="one_update_available">1개의 업데이트를 사용할 수 있습니다.</string>
   <string name="many_updates_available">%d개의 업데이트를 사용할 수 있습니다.</string>
diff --git a/F-Droid/res/values-lt/strings.xml b/F-Droid/res/values-lt/strings.xml
index 0d93a4b02..2118e2d5b 100644
--- a/F-Droid/res/values-lt/strings.xml
+++ b/F-Droid/res/values-lt/strings.xml
@@ -18,8 +18,8 @@
   <string name="about_site">Svetainė:</string>
   <string name="about_mail">El. paštas:</string>
   <string name="about_version">Versija:</string>
-  <string name="inst">Įdiegta</string>
-  <string name="not_inst">Neįdiegta</string>
+  <string name="app_installed">Įdiegta</string>
+  <string name="app_not_installed">Neįdiegta</string>
   <string name="added_on">Išleista %s</string>
   <string name="ok">Gerai</string>
   <string name="yes">Taip</string>
@@ -30,7 +30,7 @@
   <string name="enable">Įjungti</string>
   <string name="add_key">Pridėti raktą</string>
   <string name="overwrite">Perrašyti</string>
-  <string name="tab_noninstalled">Prieinamos programos</string>
+  <string name="tab_available_apps">Prieinamos programos</string>
   <string name="tab_updates">Atnaujinimai</string>
   <string name="one_update_available">Atsirado 1 atnaujinimas.</string>
   <string name="many_updates_available">Galite įdiegti %d atnaujinimus.</string>
diff --git a/F-Droid/res/values-lv/strings.xml b/F-Droid/res/values-lv/strings.xml
index 7954729cf..6049ab60f 100644
--- a/F-Droid/res/values-lv/strings.xml
+++ b/F-Droid/res/values-lv/strings.xml
@@ -30,10 +30,10 @@ Izlaists zem GNU GPLv3 licenzes</string>
   <string name="about_site">Mājaslapa:</string>
   <string name="about_mail">Epasts:</string>
   <string name="about_version">Versija:</string>
-  <string name="inst">Intstalēts</string>
-  <string name="not_inst">Nav instalēts</string>
-  <string name="inst_known_source">Instalēts (no %s)</string>
-  <string name="inst_unknown_source">Instalēts (no nezināmiem avotiem)</string>
+  <string name="app_installed">Intstalēts</string>
+  <string name="app_not_installed">Nav instalēts</string>
+  <string name="app_inst_known_source">Instalēts (no %s)</string>
+  <string name="app_inst_unknown_source">Instalēts (no nezināmiem avotiem)</string>
   <string name="added_on">Pievienots %s</string>
   <string name="ok">OK</string>
   <string name="yes">Jā</string>
@@ -44,7 +44,7 @@ Izlaists zem GNU GPLv3 licenzes</string>
   <string name="enable">Ieslēgt</string>
   <string name="add_key">Pievienot atslēgu</string>
   <string name="overwrite">Pārrakstīt</string>
-  <string name="tab_noninstalled">Pieejams</string>
+  <string name="tab_available_apps">Pieejams</string>
   <string name="tab_updates">Atjauninājumi</string>
   <string name="one_update_available">1 atjauninājums pieejams</string>
   <string name="many_updates_available">%d atjauninājumi pieejami</string>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index e45bb5a12..551026da1 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -38,10 +38,10 @@ Lisensiert GNU GPLv3.</string>
   <string name="about_site">Nettside:</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Versjon:</string>
-  <string name="inst">Installert</string>
-  <string name="not_inst">Ikke installert</string>
-  <string name="inst_known_source">Installert (fra %s)</string>
-  <string name="inst_unknown_source">Installert (fra ukjent kilde)</string>
+  <string name="app_installed">Installert</string>
+  <string name="app_not_installed">Ikke installert</string>
+  <string name="app_inst_known_source">Installert (fra %s)</string>
+  <string name="app_inst_unknown_source">Installert (fra ukjent kilde)</string>
   <string name="added_on">Lagt til %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ja</string>
@@ -52,7 +52,7 @@ Lisensiert GNU GPLv3.</string>
   <string name="enable">Skru på</string>
   <string name="add_key">Legg til nøkkel</string>
   <string name="overwrite">Overskriv</string>
-  <string name="tab_noninstalled">Tilgjengelig</string>
+  <string name="tab_available_apps">Tilgjengelig</string>
   <string name="tab_updates">Oppdateringer</string>
   <string name="one_update_available">1 oppdatering tilgjengelig.</string>
   <string name="many_updates_available">%d oppdateringer tilgjengelig.</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index ad2c94dff..303ecd767 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -37,10 +37,10 @@
   <string name="about_site">Website:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Versie:</string>
-  <string name="inst">Geïnstalleerd</string>
-  <string name="not_inst">Niet geïnstalleerd</string>
-  <string name="inst_known_source">Geïnstalleerd (van %s)</string>
-  <string name="inst_unknown_source">Geïnstalleerd (van onbekende bron)</string>
+  <string name="app_installed">Geïnstalleerd</string>
+  <string name="app_not_installed">Niet geïnstalleerd</string>
+  <string name="app_inst_known_source">Geïnstalleerd (van %s)</string>
+  <string name="app_inst_unknown_source">Geïnstalleerd (van onbekende bron)</string>
   <string name="added_on">Toegevoegd op %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ja</string>
@@ -51,7 +51,7 @@
   <string name="enable">Activeer</string>
   <string name="add_key">Voeg sleutel toe</string>
   <string name="overwrite">Overschrijven</string>
-  <string name="tab_noninstalled">Beschikbaar</string>
+  <string name="tab_available_apps">Beschikbaar</string>
   <string name="tab_updates">Updates</string>
   <string name="one_update_available">1 update beschikbaar.</string>
   <string name="many_updates_available">%d updates beschikbaar.</string>
@@ -189,7 +189,7 @@
   <string name="open_qr_code_scanner">Open QR code scanner</string>
   <string name="swap_welcome">Welkom bij F-Droid!</string>
   <string name="swap_confirm_connect">Wilt u nu apps van %1$s ontvangen?</string>
-<string name="incompatible">Incompatibel</string>
+<string name="app_incompatible">Incompatibel</string>
 	<string name="links">Links</string>
 	<string name="content_description_view_more">Bekijk meer</string>
 
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index 789a93e65..b15c179cf 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -24,7 +24,7 @@
   <string name="about_title">O F-Droid</string>
   <string name="about_site">Strona internetowa:</string>
   <string name="about_version">Wersja:</string>
-  <string name="not_inst">Niezainstalowane</string>
+  <string name="app_not_installed">Niezainstalowane</string>
   <string name="added_on">Dodano %s</string>
   <string name="ok">OK</string>
   <string name="yes">Tak</string>
@@ -35,7 +35,7 @@
   <string name="enable">Włącz</string>
   <string name="add_key">Dodaj klucz</string>
   <string name="overwrite">Nadpisz</string>
-  <string name="tab_noninstalled">Dostępne</string>
+  <string name="tab_available_apps">Dostępne</string>
   <string name="tab_updates">Aktualizacje</string>
   <string name="one_update_available">Dostępne jest 1 uaktualnienie.</string>
   <string name="fdroid_updates_available">Uaktualnienie F-Droid jest dostępne</string>
@@ -167,10 +167,10 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
 	<string name="uninstall_system_summary">Odinstaluj dodatkowe uprzywilejowane aplikacje F-Droida</string>
 	<string name="about_desc">Oryginalnie bazuje na Aptiode.\nWydano pod licencją GNU GPLv3.</string>
 	<string name="about_mail">Email:</string>
-	<string name="incompatible">Niekompatybilne</string>
-	<string name="inst">Zainstalowano</string>
-	<string name="inst_known_source">Zainstalowano (z %s)</string>
-	<string name="inst_unknown_source">Zainstalowano (z nieznanego źródła)</string>
+	<string name="app_incompatible">Niekompatybilne</string>
+	<string name="app_installed">Zainstalowano</string>
+	<string name="app_inst_known_source">Zainstalowano (z %s)</string>
+	<string name="app_inst_unknown_source">Zainstalowano (z nieznanego źródła)</string>
 
 	<string name="links">Linki</string>
 	<string name="content_description_view_more">Zobacz więcej</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index 0e917969a..f75919168 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -38,10 +38,10 @@ Lançado sob a licença GNU GPLv3.</string>
   <string name="about_site">Página web:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Versão:</string>
-  <string name="inst">Instalado</string>
-  <string name="not_inst">Não Instalado</string>
-  <string name="inst_known_source">Instalado (a partir de %s)</string>
-  <string name="inst_unknown_source">Instalado (a partir de fonte desconhecida)</string>
+  <string name="app_installed">Instalado</string>
+  <string name="app_not_installed">Não Instalado</string>
+  <string name="app_inst_known_source">Instalado (a partir de %s)</string>
+  <string name="app_inst_unknown_source">Instalado (a partir de fonte desconhecida)</string>
   <string name="added_on">Adicionado em %s</string>
   <string name="ok">OK</string>
   <string name="yes">Sim</string>
@@ -52,7 +52,7 @@ Lançado sob a licença GNU GPLv3.</string>
   <string name="enable">Ativar</string>
   <string name="add_key">Adicionar chave</string>
   <string name="overwrite">Sobrescrever</string>
-  <string name="tab_noninstalled">Disponível</string>
+  <string name="tab_available_apps">Disponível</string>
   <string name="tab_updates">Atualizações</string>
   <string name="one_update_available">1 atualização disponível.</string>
   <string name="many_updates_available">%d atualizações disponíveis.</string>
@@ -199,7 +199,7 @@ com aplicativos baixados a partir de índices não assinados.</string>
 
 	<string name="uninstall_system">Desinstalar F-droid privilegiado</string>
 	<string name="uninstall_system_summary">Desinstalar o app adicional do F-Droid privilegiado</string>
-	<string name="incompatible">Incompatível</string>
+	<string name="app_incompatible">Incompatível</string>
 	<string name="links">Links</string>
 	<string name="content_description_view_more">Ver mais</string>
 
diff --git a/F-Droid/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml
index d2ef9748c..e0fb5539f 100644
--- a/F-Droid/res/values-ro/strings.xml
+++ b/F-Droid/res/values-ro/strings.xml
@@ -17,8 +17,8 @@ Distribuit sub licenta GNU GPLv3.</string>
   <string name="about_site">Website</string>
   <string name="about_mail">Email</string>
   <string name="about_version">Versiune</string>
-  <string name="inst">Instalat</string>
-  <string name="not_inst">Nu este instalat</string>
+  <string name="app_installed">Instalat</string>
+  <string name="app_not_installed">Nu este instalat</string>
   <string name="ok">Aplica</string>
   <string name="yes">Da</string>
   <string name="no">Nu</string>
@@ -26,7 +26,7 @@ Distribuit sub licenta GNU GPLv3.</string>
   <string name="repo_add_add">Adauga</string>
   <string name="cancel">Anuleaza</string>
   <string name="enable">Activează</string>
-  <string name="tab_noninstalled">Disponibil</string>
+  <string name="tab_available_apps">Disponibil</string>
   <string name="tab_updates">Actualizare</string>
   <string name="one_update_available">1 actualizare e disponibilă.</string>
   <string name="many_updates_available">%d actualizări sunt disponibile</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index 085e39585..601bb530f 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -40,10 +40,10 @@
   <string name="about_site">Сайт:</string>
   <string name="about_mail">E-mail:</string>
   <string name="about_version">Версия:</string>
-  <string name="inst">Установлено</string>
-  <string name="not_inst">Не установлено</string>
-  <string name="inst_known_source">Установлено (из %s)</string>
-  <string name="inst_unknown_source">Установлено (из неизвестного источника)</string>
+  <string name="app_installed">Установлено</string>
+  <string name="app_not_installed">Не установлено</string>
+  <string name="app_inst_known_source">Установлено (из %s)</string>
+  <string name="app_inst_unknown_source">Установлено (из неизвестного источника)</string>
   <string name="added_on">Добавлено %s</string>
   <string name="ok">ОК</string>
   <string name="yes">Да</string>
@@ -54,7 +54,7 @@
   <string name="enable">Включить</string>
   <string name="add_key">Добавить ключ</string>
   <string name="overwrite">Перезаписать</string>
-  <string name="tab_noninstalled">Доступно</string>
+  <string name="tab_available_apps">Доступно</string>
   <string name="tab_updates">Обновления</string>
   <string name="one_update_available">Доступно 1 обновление.</string>
   <string name="many_updates_available">Доступно %d обновлений.</string>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index 175c5a822..95329a8d7 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -39,10 +39,10 @@ Intregadu cun sa litzèntzia
   <string name="about_site">Giassu/situ web:</string>
   <string name="about_mail">E-lìtera:</string>
   <string name="about_version">Versione:</string>
-  <string name="inst">Installada</string>
-  <string name="not_inst">Non installada</string>
-  <string name="inst_known_source">Installada (dae %s)</string>
-  <string name="inst_unknown_source">Installada (dae una mitza disconnota)</string>
+  <string name="app_installed">Installada</string>
+  <string name="app_not_installed">Non installada</string>
+  <string name="app_inst_known_source">Installada (dae %s)</string>
+  <string name="app_inst_unknown_source">Installada (dae una mitza disconnota)</string>
   <string name="added_on">Annanta su %s</string>
   <string name="ok">AB</string>
   <string name="yes">Eja</string>
@@ -53,7 +53,7 @@ Intregadu cun sa litzèntzia
   <string name="enable">Abìlita</string>
   <string name="add_key">Annanghe crae</string>
   <string name="overwrite">Subraiscrie</string>
-  <string name="tab_noninstalled">Disponìbiles</string>
+  <string name="tab_available_apps">Disponìbiles</string>
   <string name="tab_updates">Agiornamentos</string>
   <string name="one_update_available">1 agiornamentu est disponìbile.</string>
   <string name="many_updates_available">%d agiornamentos sunt disponìbiles.</string>
@@ -209,7 +209,7 @@ Depes
   <string name="swap_confirm_connect">Boles retzire como sas aplicatziones dae %1$s?</string>
 <string name="app_name">F-Droid</string>
 
-	<string name="incompatible">Non cumpatìbile</string>
+	<string name="app_incompatible">Non cumpatìbile</string>
 	<string name="links">Ligòngios</string>
 	<string name="content_description_view_more">Ammustra àteru</string>
 
diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml
index 431d37ebd..e455f25de 100644
--- a/F-Droid/res/values-sk/strings.xml
+++ b/F-Droid/res/values-sk/strings.xml
@@ -39,10 +39,10 @@ Vydaný pod licenciou
   <string name="about_site">Webstránka:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Verzia:</string>
-  <string name="inst">Nainštalované</string>
-  <string name="not_inst">Nie je nainštalované</string>
-  <string name="inst_known_source">Nainštalované (z %s)</string>
-  <string name="inst_unknown_source">Nainštalované (z neznámeho zdroja)</string>
+  <string name="app_installed">Nainštalované</string>
+  <string name="app_not_installed">Nie je nainštalované</string>
+  <string name="app_inst_known_source">Nainštalované (z %s)</string>
+  <string name="app_inst_unknown_source">Nainštalované (z neznámeho zdroja)</string>
   <string name="added_on">Pridané %s</string>
   <string name="ok">OK</string>
   <string name="yes">Áno</string>
@@ -53,7 +53,7 @@ Vydaný pod licenciou
   <string name="enable">Zapnúť</string>
   <string name="add_key">Pridať kľúč</string>
   <string name="overwrite">Prepísať</string>
-  <string name="tab_noninstalled">Dostupné</string>
+  <string name="tab_available_apps">Dostupné</string>
   <string name="tab_updates">Aktualizácie</string>
   <string name="one_update_available">Dostupná 1 aktualizácia.</string>
   <string name="many_updates_available">Dostupné aktualizácie: %d ks</string>
diff --git a/F-Droid/res/values-sl/strings.xml b/F-Droid/res/values-sl/strings.xml
index c81aa3d64..1c9827981 100644
--- a/F-Droid/res/values-sl/strings.xml
+++ b/F-Droid/res/values-sl/strings.xml
@@ -14,15 +14,15 @@ Izdan z licenco GNU GPLv3.</string>
   <string name="about_site">Spletna stran:</string>
   <string name="about_mail">E-pošta:</string>
   <string name="about_version">Različica:</string>
-  <string name="inst">Nameščeno</string>
-  <string name="not_inst">Ni nameščeno</string>
+  <string name="app_installed">Nameščeno</string>
+  <string name="app_not_installed">Ni nameščeno</string>
   <string name="ok">V redu</string>
   <string name="yes">Da</string>
   <string name="no">Ne</string>
   <string name="repo_add_title">Dodaj novo skladišče</string>
   <string name="repo_add_add">Dodaj</string>
   <string name="cancel">Prekliči</string>
-  <string name="tab_noninstalled">Na razpolago</string>
+  <string name="tab_available_apps">Na razpolago</string>
   <string name="tab_updates">Posodobitve</string>
   <string name="repo_add_url">Naslov skladišča</string>
   <string name="menu_manage">Upravljanje s skladišči</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index 9c148134e..a4adba4a9 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -37,10 +37,10 @@
   <string name="about_site">Вебсајт:</string>
   <string name="about_mail">Е-адреса:</string>
   <string name="about_version">Издање:</string>
-  <string name="inst">Инсталирано</string>
-  <string name="not_inst">Није инсталирано</string>
-  <string name="inst_known_source">Инсталирано (са %s)</string>
-  <string name="inst_unknown_source">Инсталирано (са непознатог извора)</string>
+  <string name="app_installed">Инсталирано</string>
+  <string name="app_not_installed">Није инсталирано</string>
+  <string name="app_inst_known_source">Инсталирано (са %s)</string>
+  <string name="app_inst_unknown_source">Инсталирано (са непознатог извора)</string>
   <string name="added_on">Додата %s</string>
   <string name="ok">У реду</string>
   <string name="yes">Да</string>
@@ -51,7 +51,7 @@
   <string name="enable">Омогући</string>
   <string name="add_key">Додај кључ</string>
   <string name="overwrite">Пребриши</string>
-  <string name="tab_noninstalled">Доступно</string>
+  <string name="tab_available_apps">Доступно</string>
   <string name="tab_updates">Надоградње</string>
   <string name="one_update_available">1 надоградња је доступна.</string>
   <string name="many_updates_available">%d нових надоградњи је доступно.</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index 2f8932ee5..9aa10c1a8 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -38,10 +38,10 @@ Släppt under licensen GNU GPLv3.</string>
   <string name="about_site">Webbplats:</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Version:</string>
-  <string name="inst">Installerad</string>
-  <string name="not_inst">Inte installerad</string>
-  <string name="inst_known_source">Installerad (från %s)</string>
-  <string name="inst_unknown_source">Installerad (från okänd källa)</string>
+  <string name="app_installed">Installerad</string>
+  <string name="app_not_installed">Inte installerad</string>
+  <string name="app_inst_known_source">Installerad (från %s)</string>
+  <string name="app_inst_unknown_source">Installerad (från okänd källa)</string>
   <string name="added_on">Tillagd %s</string>
   <string name="ok">OK</string>
   <string name="yes">Ja</string>
@@ -52,7 +52,7 @@ Släppt under licensen GNU GPLv3.</string>
   <string name="enable">Aktivera</string>
   <string name="add_key">Lägg till nyckel</string>
   <string name="overwrite">Skriv över</string>
-  <string name="tab_noninstalled">Tillgängliga</string>
+  <string name="tab_available_apps">Tillgängliga</string>
   <string name="tab_updates">Uppdateringar</string>
   <string name="one_update_available">1 uppdatering finns tillgänglig.</string>
   <string name="many_updates_available">%d uppdateringar finns tillgängliga.</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index d46171670..b8de35db2 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -38,10 +38,10 @@ GNU GPLv3 lisansı kapsamında yayınlanmıştır.</string>
   <string name="about_site">Ağ sitesi:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Sürüm:</string>
-  <string name="inst">Kurulu</string>
-  <string name="not_inst">Kurulu değil</string>
-  <string name="inst_known_source">Kuruldu (şuradan: %s)</string>
-  <string name="inst_unknown_source">Kuruldu (bilinmeyen kaynaktan)</string>
+  <string name="app_installed">Kurulu</string>
+  <string name="app_not_installed">Kurulu değil</string>
+  <string name="app_inst_known_source">Kuruldu (şuradan: %s)</string>
+  <string name="app_inst_unknown_source">Kuruldu (bilinmeyen kaynaktan)</string>
   <string name="added_on">%s tarihinde eklenmiş</string>
   <string name="ok">Tamam</string>
   <string name="yes">Evet</string>
@@ -52,7 +52,7 @@ GNU GPLv3 lisansı kapsamında yayınlanmıştır.</string>
   <string name="enable">Etkinleştir</string>
   <string name="add_key">Anahtar ekle</string>
   <string name="overwrite">Üzerine yaz</string>
-  <string name="tab_noninstalled">Mevcut</string>
+  <string name="tab_available_apps">Mevcut</string>
   <string name="tab_updates">Güncellemeler</string>
   <string name="one_update_available">1 güncelleme bulunmaktadır.</string>
   <string name="many_updates_available">%d güncelleme bulunmaktadır.</string>
diff --git a/F-Droid/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml
index a17b02e3e..0ab4274f4 100644
--- a/F-Droid/res/values-ug/strings.xml
+++ b/F-Droid/res/values-ug/strings.xml
@@ -24,8 +24,8 @@
   <string name="about_site">تور تۇرا:</string>
   <string name="about_mail">تورخەت:</string>
   <string name="about_version">نەشرى:</string>
-  <string name="inst">ئورنىتىلغان</string>
-  <string name="not_inst">ئورنىتىلمىغان</string>
+  <string name="app_installed">ئورنىتىلغان</string>
+  <string name="app_not_installed">ئورنىتىلمىغان</string>
   <string name="added_on">%s دا قوشۇلغان</string>
   <string name="ok">جەزملە</string>
   <string name="yes">ھەئە</string>
@@ -33,7 +33,7 @@
   <string name="repo_add_title">يېڭى خەزىنە قوش</string>
   <string name="repo_add_add">قوش</string>
   <string name="cancel">ۋاز كەچ</string>
-  <string name="tab_noninstalled">ئىشلىتىشچان</string>
+  <string name="tab_available_apps">ئىشلىتىشچان</string>
   <string name="tab_updates">يېڭىلانمىلار</string>
   <string name="one_update_available">1 يېڭىلانما بار.</string>
   <string name="many_updates_available">%d يېڭىلانما بار.</string>
diff --git a/F-Droid/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml
index 563d37d9c..01a8c4006 100644
--- a/F-Droid/res/values-uk/strings.xml
+++ b/F-Droid/res/values-uk/strings.xml
@@ -14,15 +14,15 @@
   <string name="about_site">Сайт:</string>
   <string name="about_mail">Пошта:</string>
   <string name="about_version">Версія:</string>
-  <string name="inst">Встановлено</string>
-  <string name="not_inst">Не встановлено</string>
+  <string name="app_installed">Встановлено</string>
+  <string name="app_not_installed">Не встановлено</string>
   <string name="ok">Гаразд</string>
   <string name="yes">Так</string>
   <string name="no">Ні</string>
   <string name="repo_add_title">Новий репозиторій</string>
   <string name="repo_add_add">Додати</string>
   <string name="cancel">Назад</string>
-  <string name="tab_noninstalled">Наявне</string>
+  <string name="tab_available_apps">Наявне</string>
   <string name="tab_updates">Оновлення</string>
   <string name="repo_add_url">Адреса репозиторію</string>
   <string name="menu_update_repo">Оновити</string>
diff --git a/F-Droid/res/values-vi/strings.xml b/F-Droid/res/values-vi/strings.xml
index ed9f53f59..2ae60133a 100644
--- a/F-Droid/res/values-vi/strings.xml
+++ b/F-Droid/res/values-vi/strings.xml
@@ -36,10 +36,10 @@
   <string name="about_site">Trang web:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Phiên bản:</string>
-  <string name="inst">Đã cài đặt</string>
-  <string name="not_inst">Chưa cài đặt</string>
-  <string name="inst_known_source">Đã cài đặt (từ %s)</string>
-  <string name="inst_unknown_source">Đã cài đặt (không rõ nguồn gốc)</string>
+  <string name="app_installed">Đã cài đặt</string>
+  <string name="app_not_installed">Chưa cài đặt</string>
+  <string name="app_inst_known_source">Đã cài đặt (từ %s)</string>
+  <string name="app_inst_unknown_source">Đã cài đặt (không rõ nguồn gốc)</string>
   <string name="added_on">Đã thêm vào %s</string>
   <string name="ok">OK</string>
   <string name="yes">Có</string>
@@ -50,7 +50,7 @@
   <string name="enable">Kích hoạt</string>
   <string name="add_key">Thêm mã khoá</string>
   <string name="overwrite">Ghi đè</string>
-  <string name="tab_noninstalled">Hiện có</string>
+  <string name="tab_available_apps">Hiện có</string>
   <string name="tab_updates">Cập nhật</string>
   <string name="one_update_available">Có 1 bản cập nhật.</string>
   <string name="many_updates_available">Có %d bản cập nhật.</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index e7a282c46..f110d0bf5 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -34,8 +34,8 @@
   <string name="about_site">网站：</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">版本：</string>
-  <string name="inst">已安装</string>
-  <string name="not_inst">未安装</string>
+  <string name="app_installed">已安装</string>
+  <string name="app_not_installed">未安装</string>
   <string name="added_on">添加于 %s</string>
   <string name="ok">OK</string>
   <string name="yes">确认</string>
@@ -46,7 +46,7 @@
   <string name="enable">启用</string>
   <string name="add_key">添加密钥</string>
   <string name="overwrite">覆盖</string>
-  <string name="tab_noninstalled">可安装</string>
+  <string name="tab_available_apps">可安装</string>
   <string name="tab_updates">更新</string>
   <string name="one_update_available">有 1 个可用的更新。</string>
   <string name="many_updates_available">有 %d 个可用的更新。</string>
diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml
index a784792e6..e8685a32a 100644
--- a/F-Droid/res/values-zh-rHK/strings.xml
+++ b/F-Droid/res/values-zh-rHK/strings.xml
@@ -34,10 +34,10 @@
   <string name="about_site">網站：</string>
   <string name="about_mail">電郵：</string>
   <string name="about_version">版本：</string>
-  <string name="inst">已安裝</string>
-  <string name="not_inst">沒有安裝</string>
-  <string name="inst_known_source">已安裝 (來自 %s)</string>
-  <string name="inst_unknown_source">已安裝 (來源不明)</string>
+  <string name="app_installed">已安裝</string>
+  <string name="app_not_installed">沒有安裝</string>
+  <string name="app_inst_known_source">已安裝 (來自 %s)</string>
+  <string name="app_inst_unknown_source">已安裝 (來源不明)</string>
   <string name="added_on">在 %s 加入</string>
   <string name="ok">OK</string>
   <string name="yes">是</string>
@@ -48,7 +48,7 @@
   <string name="enable">啟用</string>
   <string name="add_key">添加鑰匙</string>
   <string name="overwrite">蓋寫</string>
-  <string name="tab_noninstalled">可用</string>
+  <string name="tab_available_apps">可用</string>
   <string name="tab_updates">更新</string>
   <string name="one_update_available">有 1 個更新。</string>
   <string name="many_updates_available">有 %d 個更新。</string>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 3a0b2bd1f..5617be28b 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -50,11 +50,11 @@
 	<string name="about_desc">Originally based on Aptoide.\nReleased under the
 		GNU GPLv3 license.</string>
 
-	<string name="incompatible">Incompatible</string>
-	<string name="inst">Installed</string>
-	<string name="not_inst">Not Installed</string>
-	<string name="inst_known_source">Installed (from %s)</string>
-	<string name="inst_unknown_source">Installed (from unknown source)</string>
+	<string name="app_incompatible">Incompatible</string>
+	<string name="app_installed">Installed</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="added_on">Added on %s</string>
 
@@ -73,7 +73,8 @@
 	<string name="add_key">Add Key</string>
 	<string name="overwrite">Overwrite</string>
 
-	<string name="tab_noninstalled">Available</string>
+	<string name="tab_available_apps">Available</string>
+	<string name="tab_installed_apps">Installed</string>
 	<string name="tab_updates">Updates</string>
 	<string name="one_update_available">1 update is available.</string>
 	<string name="many_updates_available">%d updates are available.</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 4eaa8d489..a686cc562 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -183,12 +183,12 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         private String getInstalledStatus(final Apk apk) {
             // Definitely not installed.
             if (apk.vercode != app.installedVersionCode) {
-                return getString(R.string.not_inst);
+                return getString(R.string.app_not_installed);
             }
             // Definitely installed this version.
             if (mInstalledSigID != null && apk.sig != null
                     && apk.sig.equals(mInstalledSigID)) {
-                return getString(R.string.inst);
+                return getString(R.string.app_installed);
             }
             // Installed the same version, but from someplace else.
             final String installerPkgName;
@@ -196,14 +196,14 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                 installerPkgName = mPm.getInstallerPackageName(app.id);
             } catch (IllegalArgumentException e) {
                 Log.w(TAG, "Application " + app.id + " is not installed anymore");
-                return getString(R.string.not_inst);
+                return getString(R.string.app_not_installed);
             }
             if (TextUtils.isEmpty(installerPkgName)) {
-                return getString(R.string.inst_unknown_source);
+                return getString(R.string.app_inst_unknown_source);
             }
             final String installerLabel = InstalledAppProvider
                 .getApplicationLabel(mctx, installerPkgName);
-            return getString(R.string.inst_known_source, installerLabel);
+            return getString(R.string.app_inst_known_source, installerLabel);
         }
 
         @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
index 8e2fc727c..58e5eff3b 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
@@ -50,9 +50,9 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
     public String getPageTitle(int i) {
         switch (i) {
         case TabManager.INDEX_AVAILABLE:
-            return parent.getString(R.string.tab_noninstalled);
+            return parent.getString(R.string.tab_available_apps);
         case TabManager.INDEX_INSTALLED:
-            return parent.getString(R.string.inst);
+            return parent.getString(R.string.tab_installed_apps);
         case TabManager.INDEX_CAN_UPDATE:
             return getUpdateTabTitle();
         default:
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 098e739b9..24c3a95bc 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
@@ -21,7 +21,7 @@ public class InstalledAppsFragment extends AppListFragment {
 
     @Override
     protected String getFromTitle() {
-        return getString(R.string.inst);
+        return getString(R.string.tab_installed_apps);
     }
 
     @Override