diff --git a/F-Droid/res/values-ar/strings.xml b/F-Droid/res/values-ar/strings.xml
index 705eba857..70eaf1956 100644
--- a/F-Droid/res/values-ar/strings.xml
+++ b/F-Droid/res/values-ar/strings.xml
@@ -60,14 +60,14 @@
   <string name="repo_confirm_delete_title">حذف المستودع</string>
   <string name="app_icon">أيقونة التطبيق</string>
   <string name="repo_icon">أيقونة المستودع</string>
-  <string name="Development">التطوير</string>
-  <string name="Games">الألعاب</string>
-  <string name="Internet">الانترنت</string>
-  <string name="Multimedia">الوسائط المتعددة</string>
-  <string name="Phone_SMS">الهاتف و الرسائل</string>
-  <string name="Reading">القراءة</string>
-  <string name="Science_Education">العلوم و التعليم</string>
-  <string name="Security">الأمان</string>
-  <string name="System">النظام</string>
+  <string name="category_Development">التطوير</string>
+  <string name="category_Games">الألعاب</string>
+  <string name="category_Internet">الانترنت</string>
+  <string name="category_Multimedia">الوسائط المتعددة</string>
+  <string name="category_Phone_SMS">الهاتف و الرسائل</string>
+  <string name="category_Reading">القراءة</string>
+  <string name="category_Science_Education">العلوم و التعليم</string>
+  <string name="category_Security">الأمان</string>
+  <string name="category_System">النظام</string>
   <string name="update_all">تحديث الكل</string>
 </resources>
diff --git a/F-Droid/res/values-ast/strings.xml b/F-Droid/res/values-ast/strings.xml
index b513fa938..83ba94ea9 100644
--- a/F-Droid/res/values-ast/strings.xml
+++ b/F-Droid/res/values-ast/strings.xml
@@ -164,16 +164,16 @@ Deberíes tener procuru con aplicaciones baxaes dende índices ensin roblar.</st
   <string name="requires_features">Rique: %1$s</string>
   <string name="app_icon">Iconu d\'aplicación</string>
   <string name="repo_icon">Iconu de repositoriu</string>
-  <string name="Development">Desendolcu</string>
-  <string name="Games">Xuegos</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navegación</string>
-  <string name="Phone_SMS">Teléfonu y SMS</string>
-  <string name="Reading">Llectura</string>
-  <string name="Science_Education">Ciencia y educación</string>
-  <string name="Security">Seguranza</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Desendolcu</string>
+  <string name="category_Games">Xuegos</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navegación</string>
+  <string name="category_Phone_SMS">Teléfonu y SMS</string>
+  <string name="category_Reading">Llectura</string>
+  <string name="category_Science_Education">Ciencia y educación</string>
+  <string name="category_Security">Seguranza</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">Solicitando l\'accesu root…</string>
   <string name="root_access_denied_title">Refugóse l\'accesu root</string>
   <string name="root_access_denied_body">O\'l to preséu Android nun ta rootexáu o refuguesti l\'accesu root pa F-Droid.</string>
@@ -241,13 +241,13 @@ Deberíes tener procuru con aplicaciones baxaes dende índices ensin roblar.</st
     <string name="pref_language_default">Por defeutu del sistema</string>
 
     <string name="wifi">Wi-Fi</string>
-    <string name="Connectivity">Coneutividá</string>
-    <string name="Graphics">Gráficos</string>
-    <string name="Money">Dineru</string>
-    <string name="Sports_Health">Deporte y salú</string>
-    <string name="Theming">Temes</string>
-    <string name="Time">Tiempu</string>
-    <string name="Writing">Escritura</string>
+    <string name="category_Connectivity">Coneutividá</string>
+    <string name="category_Graphics">Gráficos</string>
+    <string name="category_Money">Dineru</string>
+    <string name="category_Sports_Health">Deporte y salú</string>
+    <string name="category_Theming">Temes</string>
+    <string name="category_Time">Tiempu</string>
+    <string name="category_Writing">Escritura</string>
 
     <string name="empty_installed_app_list">Nun hai aplicaciones instalaes.\n\nHai aplicaciones nel to preséu pero nun tán disponibles dende F-Droid. Esto quiciabes sía porque necesites anovar los tos repositorios o porque los repositorios nun tengan daveres les tos aplicaciones disponibles.</string>
     <string name="empty_available_app_list">Nun hai aplicaciones nesta estaya.\n\nIntenta esbillar una estaya distinta o anovar los tos repositorios pa consiguir un llistáu frescu d\'aplicaciones.</string>
diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index ef99ba1ff..877e7c991 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -141,16 +141,16 @@
   <string name="requires_features">Изисква: %1$s</string>
   <string name="app_icon">Икона на приложението</string>
   <string name="repo_icon">Икона на хранилището</string>
-  <string name="Development">Разработване</string>
-  <string name="Games">Игри</string>
-  <string name="Internet">Интернет</string>
-  <string name="Multimedia">Мултимедия</string>
-  <string name="Navigation">Навигация</string>
-  <string name="Phone_SMS">Телефон и SMS</string>
-  <string name="Reading">Четене</string>
-  <string name="Science_Education">Наука и образование</string>
-  <string name="Security">Сигурност</string>
-  <string name="System">Система</string>
+  <string name="category_Development">Разработване</string>
+  <string name="category_Games">Игри</string>
+  <string name="category_Internet">Интернет</string>
+  <string name="category_Multimedia">Мултимедия</string>
+  <string name="category_Navigation">Навигация</string>
+  <string name="category_Phone_SMS">Телефон и SMS</string>
+  <string name="category_Reading">Четене</string>
+  <string name="category_Science_Education">Наука и образование</string>
+  <string name="category_Security">Сигурност</string>
+  <string name="category_System">Система</string>
   <string name="requesting_root_access_body">Изисква Root достъп…</string>
   <string name="root_access_denied_title">Root достъпът е отказан</string>
   <string name="update_all">Актуализирай всички</string>
@@ -173,12 +173,12 @@
     <string name="pref_language_default">Стандартния за системата</string>
 
     <string name="wifi">Wi-Fi</string>
-    <string name="Money">Пари</string>
-    <string name="Graphics">Изображения</string>
-    <string name="Sports_Health">Спорт и здраве</string>
-    <string name="Theming">Теми</string>
-    <string name="Time">Час</string>
-    <string name="Writing">Писане</string>
+    <string name="category_Money">Пари</string>
+    <string name="category_Graphics">Изображения</string>
+    <string name="category_Sports_Health">Спорт и здраве</string>
+    <string name="category_Theming">Теми</string>
+    <string name="category_Time">Час</string>
+    <string name="category_Writing">Писане</string>
 
     <string name="install_error_title">Грешка при инсталирането</string>
     <string name="uninstall_error_title">Грешка при деинсталирането</string>
@@ -218,7 +218,7 @@
     <string name="unstable_updates">Нестабилни актуализации</string>
 	<string name="unstable_updates_summary">Предлага актуализиране до версии, които могат да бъдат нестабилни</string>
 	<string name="empty_available_app_list">В категорията няма приложения.\n\nИзберете друга категория или актуализирайте хранилищата за да получите актуалния списък с приложения.</string>
-    <string name="Connectivity">Свързаност</string>
+    <string name="category_Connectivity">Свързаност</string>
     <string name="menu_upgrade">Обнови</string>
 	<string name="links">Връзки</string>
 	<string name="empty_installed_app_list">Няма инсталирани приложения.\n\nСъществуващите приложения не са налични през F-Droid. Вероятна причина може да бъде неактуализирани хранилища или просто хранилищата не предлагат програмите, който ползвате.</string>
diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index b50fe8fde..2c6e66355 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -163,16 +163,16 @@ Tingueu compte amb aplicacions baixades des de dipòsits sense empremta digital.
   <string name="requires_features">Requereix: %1$s</string>
   <string name="app_icon">Icona de l\'aplicació</string>
   <string name="repo_icon">Icona del dipòsit</string>
-  <string name="Development">Desenvolupament</string>
-  <string name="Games">Jocs</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimèdia</string>
-  <string name="Navigation">Navegació</string>
-  <string name="Phone_SMS">Mòbil i missatgeria</string>
-  <string name="Reading">Per a llegir</string>
-  <string name="Science_Education">Ciència i educació</string>
-  <string name="Security">Seguretat</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Desenvolupament</string>
+  <string name="category_Games">Jocs</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimèdia</string>
+  <string name="category_Navigation">Navegació</string>
+  <string name="category_Phone_SMS">Mòbil i missatgeria</string>
+  <string name="category_Reading">Per a llegir</string>
+  <string name="category_Science_Education">Ciència i educació</string>
+  <string name="category_Security">Seguretat</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">S\'estan demanant privilegis d\'administrador…</string>
   <string name="root_access_denied_title">Accés com a administrador rebutjat</string>
   <string name="root_access_denied_body">Aquest dispositiu Android no permet actuar com a administrador o bé no heu donat privilegis d\'administrador a l\'F-Droid.</string>
@@ -198,13 +198,13 @@ Tingueu compte amb aplicacions baixades des de dipòsits sense empremta digital.
 	<string name="update_notification_more">+%1$d més…</string>
 	<string name="pref_language">Idioma</string>
     <string name="wifi">Wi-Fi</string>
-    <string name="Graphics">Gràfics</string>
-    <string name="Money">Diners</string>
-    <string name="Sports_Health">Esports i Salut</string>
-    <string name="Theming">Temes</string>
-    <string name="Connectivity">Connectivitat</string>
-    <string name="Time">Temps</string>
-    <string name="Writing">Per a escriure</string>
+    <string name="category_Graphics">Gràfics</string>
+    <string name="category_Money">Diners</string>
+    <string name="category_Sports_Health">Esports i Salut</string>
+    <string name="category_Theming">Temes</string>
+    <string name="category_Connectivity">Connectivitat</string>
+    <string name="category_Time">Temps</string>
+    <string name="category_Writing">Per a escriure</string>
 
     <string name="system_install_installing">Instal·lant…</string>
     <string name="system_install_uninstalling">Desinstal·lant…</string>
diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml
index 6dcb9333b..29bfbcd92 100644
--- a/F-Droid/res/values-cs/strings.xml
+++ b/F-Droid/res/values-cs/strings.xml
@@ -132,16 +132,16 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="requires_features">Vyžaduje: %1$s</string>
   <string name="app_icon">Ikona aplikace</string>
   <string name="repo_icon">Ikona repozitáře</string>
-  <string name="Development">Vývoj</string>
-  <string name="Games">Hry</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimédia</string>
-  <string name="Navigation">Navigace</string>
-  <string name="Phone_SMS">Telefon &amp; SMS</string>
-  <string name="Reading">Čtení</string>
-  <string name="Science_Education">Věda &amp; vzdělání</string>
-  <string name="Security">Bezpečnost</string>
-  <string name="System">Systém</string>
+  <string name="category_Development">Vývoj</string>
+  <string name="category_Games">Hry</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimédia</string>
+  <string name="category_Navigation">Navigace</string>
+  <string name="category_Phone_SMS">Telefon &amp; SMS</string>
+  <string name="category_Reading">Čtení</string>
+  <string name="category_Science_Education">Věda &amp; vzdělání</string>
+  <string name="category_Security">Bezpečnost</string>
+  <string name="category_System">Systém</string>
   <string name="requesting_root_access_body">Získávám root oprávnění…</string>
   <string name="root_access_denied_title">Root přístup odepřen</string>
   <string name="root_access_denied_body">Buď toto Android zařízení není rootnuté, nebo jsi odepřel F-Droidu opránění roota.</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index 021638f0d..0ec2e03a8 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -169,16 +169,16 @@ wird verbunden</string>
   <string name="requires_features">Erfordert: %1$s</string>
   <string name="app_icon">App-Symbol</string>
   <string name="repo_icon">Paketquellensymbol</string>
-  <string name="Development">Entwicklung</string>
-  <string name="Games">Spiele</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigation</string>
-  <string name="Phone_SMS">Telefon &amp; SMS</string>
-  <string name="Reading">Lesen</string>
-  <string name="Science_Education">Wissenschaft &amp; Bildung</string>
-  <string name="Security">Sicherheit</string>
-  <string name="System">System</string>
+  <string name="category_Development">Entwicklung</string>
+  <string name="category_Games">Spiele</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigation</string>
+  <string name="category_Phone_SMS">Telefon &amp; SMS</string>
+  <string name="category_Reading">Lesen</string>
+  <string name="category_Science_Education">Wissenschaft &amp; Bildung</string>
+  <string name="category_Security">Sicherheit</string>
+  <string name="category_System">System</string>
   <string name="requesting_root_access_body">Root-Rechte werden angefordert …</string>
   <string name="root_access_denied_title">Root-Zugriff verweigert</string>
   <string name="root_access_denied_body">Entweder ist Ihr Android-Gerät nicht gerootet oder Sie haben den Root-Zugriff für F-Droid verweigert.</string>
@@ -207,9 +207,9 @@ wird verbunden</string>
     <string name="pref_language_default">System Standard</string>
 
     <string name="wifi">WLAN</string>
-    <string name="Graphics">Grafik</string>
-    <string name="Money">Geld</string>
-    <string name="Time">Zeit</string>
+    <string name="category_Graphics">Grafik</string>
+    <string name="category_Money">Geld</string>
+    <string name="category_Time">Zeit</string>
     <string name="install_error_title">Installations-Fehler</string>
     <string name="install_error_unknown">Installation wegen unbekanntem Fehler fehlgeschlagen</string>
     <string name="install_error_cannot_parse">Es ist ein Fehler beim Auslesen des Pakets aufgetreten</string>
@@ -223,10 +223,10 @@ wird verbunden</string>
 
 	<string name="tab_installed_apps">Installiert</string>
 	<string name="menu_changelog">Änderungen</string>
-	<string name="Connectivity">Verbindung</string>
-    <string name="Sports_Health">Sport &amp; Gesundheit</string>
-    <string name="Theming">Aussehen</string>
-    <string name="Writing">Schreiben</string>
+	<string name="category_Connectivity">Verbindung</string>
+    <string name="category_Sports_Health">Sport &amp; Gesundheit</string>
+    <string name="category_Theming">Aussehen</string>
+    <string name="category_Writing">Schreiben</string>
 
     <string name="system_uninstall_button">Deinstallieren</string>
 
diff --git a/F-Droid/res/values-eo/strings.xml b/F-Droid/res/values-eo/strings.xml
index 229cb964a..7d70cf6ee 100644
--- a/F-Droid/res/values-eo/strings.xml
+++ b/F-Droid/res/values-eo/strings.xml
@@ -103,16 +103,16 @@
   <string name="requires_features">Postulas: %1$s</string>
   <string name="app_icon">Aplikaĵemblemo</string>
   <string name="repo_icon">Deponejemblemo</string>
-  <string name="Development">Programado</string>
-  <string name="Games">Ludoj</string>
-  <string name="Internet">Interreto</string>
-  <string name="Multimedia">Plurmedio</string>
-  <string name="Navigation">Navigado</string>
-  <string name="Phone_SMS">Telefono &amp; tekstmesaĝo</string>
-  <string name="Reading">Legado</string>
-  <string name="Science_Education">Scienco &amp; Edukado</string>
-  <string name="Security">Sekureco</string>
-  <string name="System">Sistemo</string>
+  <string name="category_Development">Programado</string>
+  <string name="category_Games">Ludoj</string>
+  <string name="category_Internet">Interreto</string>
+  <string name="category_Multimedia">Plurmedio</string>
+  <string name="category_Navigation">Navigado</string>
+  <string name="category_Phone_SMS">Telefono &amp; tekstmesaĝo</string>
+  <string name="category_Reading">Legado</string>
+  <string name="category_Science_Education">Scienco &amp; Edukado</string>
+  <string name="category_Security">Sekureco</string>
+  <string name="category_System">Sistemo</string>
   <string name="update_all">Ĝisdatigi ĉiujn</string>
   <string name="swap_no_wifi_network">Ankoraŭ neniu reto</string>
   <string name="swap_view_available_networks">(Tuŝu por montri disponeblajn retojn)</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 947021cec..a00c50bbf 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -169,16 +169,16 @@ Deberías tener cuidado con aplicaciones descargadas desde índices no firmados.
   <string name="requires_features">Requiere: %1$s</string>
   <string name="app_icon">Icono de la aplicación</string>
   <string name="repo_icon">Icono del repositorio</string>
-  <string name="Development">Desarrollo</string>
-  <string name="Games">Juegos</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navegación</string>
-  <string name="Phone_SMS">Teléfono y SMS</string>
-  <string name="Reading">Lectura</string>
-  <string name="Science_Education">Ciencia y educación</string>
-  <string name="Security">Seguridad</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Desarrollo</string>
+  <string name="category_Games">Juegos</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navegación</string>
+  <string name="category_Phone_SMS">Teléfono y SMS</string>
+  <string name="category_Reading">Lectura</string>
+  <string name="category_Science_Education">Ciencia y educación</string>
+  <string name="category_Security">Seguridad</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">Solicitando acceso «root»…</string>
   <string name="root_access_denied_title">Acceso «root» denegado</string>
   <string name="root_access_denied_body">El dispositivo Android no está «rooteado» o se ha denegado el acceso «root» para F-Droid.</string>
@@ -217,13 +217,13 @@ Deberías tener cuidado con aplicaciones descargadas desde índices no firmados.
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Punto de acceso</string>
 
-    <string name="Connectivity">Conectividad</string>
-    <string name="Graphics">Gráficos</string>
-    <string name="Money">Dinero</string>
-    <string name="Sports_Health">Deportes y salud</string>
-    <string name="Theming">Personalización del tema</string>
-    <string name="Time">Hora</string>
-    <string name="Writing">Escritura</string>
+    <string name="category_Connectivity">Conectividad</string>
+    <string name="category_Graphics">Gráficos</string>
+    <string name="category_Money">Dinero</string>
+    <string name="category_Sports_Health">Deportes y salud</string>
+    <string name="category_Theming">Personalización del tema</string>
+    <string name="category_Time">Hora</string>
+    <string name="category_Writing">Escritura</string>
 
     <string name="empty_installed_app_list">No hay aplicaciones instaladas.\n\nHay aplicaciones en tu dispositivo, pero no están disponibles desde F-Droid. Esto podría ser porque necesitas actualizar los repositorios, o los repositorios no contienen las aplicaciones que tienes.</string>
     <string name="empty_available_app_list">No hay aplicaciones en esta categoría.\n\nPrueba a seleccionar una categoría diferente o actualizar los repositorios para obtener una lista reciente de aplicaciones.</string>
diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml
index 8296b02b6..6200e3629 100644
--- a/F-Droid/res/values-eu/strings.xml
+++ b/F-Droid/res/values-eu/strings.xml
@@ -223,23 +223,23 @@ konektatzen</string>
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Wi-Fi gunea</string>
 
-    <string name="Connectivity">Sareak</string>
-    <string name="Development">Garapena</string>
-    <string name="Games">Jokoak</string>
-    <string name="Graphics">Grafikoak</string>
-    <string name="Internet">Internet</string>
-    <string name="Money">Dirua</string>
-    <string name="Multimedia">Multimedia</string>
-    <string name="Navigation">Nabigazioa</string>
-    <string name="Phone_SMS">Telefonoa eta SMS</string>
-    <string name="Reading">Irakurketa</string>
-    <string name="Science_Education">Zientzia eta hezkuntza</string>
-    <string name="Security">Segurtasuna</string>
-    <string name="Sports_Health">Kirola eta osasuna</string>
-    <string name="System">Sistema</string>
-    <string name="Theming">Gaiak</string>
-    <string name="Time">Denbora</string>
-    <string name="Writing">Idazketa</string>
+    <string name="category_Connectivity">Sareak</string>
+    <string name="category_Development">Garapena</string>
+    <string name="category_Games">Jokoak</string>
+    <string name="category_Graphics">Grafikoak</string>
+    <string name="category_Internet">Internet</string>
+    <string name="category_Money">Dirua</string>
+    <string name="category_Multimedia">Multimedia</string>
+    <string name="category_Navigation">Nabigazioa</string>
+    <string name="category_Phone_SMS">Telefonoa eta SMS</string>
+    <string name="category_Reading">Irakurketa</string>
+    <string name="category_Science_Education">Zientzia eta hezkuntza</string>
+    <string name="category_Security">Segurtasuna</string>
+    <string name="category_Sports_Health">Kirola eta osasuna</string>
+    <string name="category_System">Sistema</string>
+    <string name="category_Theming">Gaiak</string>
+    <string name="category_Time">Denbora</string>
+    <string name="category_Writing">Idazketa</string>
 
     <string name="not_on_same_wifi">Zure gailua eta gehitu berri duzun biltegia ez daude Wi-Fi berean! Saiatu sare honetara sartzen: %s</string>
     <string name="requires_features">Behar du: %1$s</string>
diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml
index 92e4118bb..cdb2c94fc 100644
--- a/F-Droid/res/values-fi/strings.xml
+++ b/F-Droid/res/values-fi/strings.xml
@@ -137,16 +137,16 @@ Sinun pitää
   <string name="requires_features">Vaatii: %1$s</string>
   <string name="app_icon">Sovelluskuvake</string>
   <string name="repo_icon">Säilön kuvake</string>
-  <string name="Development">Kehitys</string>
-  <string name="Games">Pelit</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigointi</string>
-  <string name="Phone_SMS">Puhelin &amp; SMS</string>
-  <string name="Reading">Luetaan</string>
-  <string name="Science_Education">Tiede &amp; koulutus</string>
-  <string name="Security">Tietoturva</string>
-  <string name="System">Järjestelmä</string>
+  <string name="category_Development">Kehitys</string>
+  <string name="category_Games">Pelit</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigointi</string>
+  <string name="category_Phone_SMS">Puhelin &amp; SMS</string>
+  <string name="category_Reading">Luetaan</string>
+  <string name="category_Science_Education">Tiede &amp; koulutus</string>
+  <string name="category_Security">Tietoturva</string>
+  <string name="category_System">Järjestelmä</string>
   <string name="requesting_root_access_body">Pyydetään root-oikeuksia…</string>
   <string name="root_access_denied_title">Root-oikeudet kielletty</string>
   <string name="root_access_denied_body">Joko Android-laitettasi ei ole rootattu tai olet kieltänyt F-Droidin root-oikeuksiin pääsyn.</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 6960932e6..823f8d40c 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -167,16 +167,16 @@ Publiée sous licence GNU GPLv3.</string>
   <string name="requires_features">Nécessiteu00A0: %1$s</string>
   <string name="app_icon">Icône de l\'application</string>
   <string name="repo_icon">Icône du dépôt</string>
-  <string name="Development">Développement</string>
-  <string name="Games">Jeux</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimédia</string>
-  <string name="Navigation">Navigation</string>
-  <string name="Phone_SMS">Téléphone &amp; SMS</string>
-  <string name="Reading">Lecture</string>
-  <string name="Science_Education">Science &amp; Éducation</string>
-  <string name="Security">Sécurité</string>
-  <string name="System">Système</string>
+  <string name="category_Development">Développement</string>
+  <string name="category_Games">Jeux</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimédia</string>
+  <string name="category_Navigation">Navigation</string>
+  <string name="category_Phone_SMS">Téléphone &amp; SMS</string>
+  <string name="category_Reading">Lecture</string>
+  <string name="category_Science_Education">Science &amp; Éducation</string>
+  <string name="category_Security">Sécurité</string>
+  <string name="category_System">Système</string>
   <string name="requesting_root_access_body">Demande des droits root…</string>
   <string name="root_access_denied_title">Droits root refusés</string>
   <string name="root_access_denied_body">Soit votre système Android n\'a pas les droits root/SuperUser, soit vous les avez refusés à F-Droid.</string>
@@ -214,8 +214,8 @@ Publiée sous licence GNU GPLv3.</string>
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Point d\'accès</string>
 
-    <string name="Connectivity">Connectivité</string>
-    <string name="Sports_Health">Sport et santé</string>
+    <string name="category_Connectivity">Connectivité</string>
+    <string name="category_Sports_Health">Sport et santé</string>
     <string name="empty_available_app_list">Aucune applications dans cette catégorie.\n\nEssayer de sélectionner une autre catégorie ou mettez à jour vos dépots pour avoir une liste d\'applications récente.</string>
     <string name="empty_can_update_app_list">Tout les applications sont à jour.\n\nFélicitation ! Toutes vos applications sont à jours (ou vos dépots ne le sont pas).</string>
 
@@ -265,7 +265,7 @@ Publiée sous licence GNU GPLv3.</string>
 	<string name="repo_added">Enregistrement du dépôt F-Droid %1$s.</string>
     <string name="repo_searching_address">Recherche d\'un dépôt F-Droid à
 \n%1$s</string>
-    <string name="Graphics">Graphiques</string>
+    <string name="category_Graphics">Graphiques</string>
     <string name="empty_installed_app_list">Aucune application installée.\n\nIl y a des applications sur votre appareil mais aucune n\'est disponible sur F-Droid. Vos dépôts ne sont peut-être plus à jour, ou alors vos applications ne sont pas disponibles dans ces dépôts.</string>
     <string name="install_error_unknown">l\'installation a échouée pour une raison inconnue</string>
     <string name="install_error_cannot_parse">Une erreur s\'est produite pendant l\'analyse du paquet</string>
@@ -306,9 +306,9 @@ Publiée sous licence GNU GPLv3.</string>
 	<string name="status_download_unknown_size">Téléchargement\n%2$s sur\n%1$s</string>
 	<string name="repo_details">Dépôt</string>
     <string name="repo_url">Adresse</string>
-    <string name="Money">Finances</string>
-    <string name="Theming">Habillage d\'interface</string>
-    <string name="Writing">Écriture</string>
+    <string name="category_Money">Finances</string>
+    <string name="category_Theming">Habillage d\'interface</string>
+    <string name="category_Writing">Écriture</string>
 
     <string name="system_install_denied_signature">La signature de l\'extension est erronée ! Merci de créer un rapport de bogue.</string>
     <string name="system_install_denied_permissions">Les permissions privilégiées n\'ont pas été accordée à l\'extension ! Merci de créer un rapport de bogue.</string>
@@ -332,5 +332,5 @@ Publiée sous licence GNU GPLv3.</string>
     <string name="swap_attempt_install">Essayer d\'installer</string>
     <string name="swap_connection_misc_error">Une erreur a eu lieu lors de la connexion à l\'appareil, on dirait que nous ne pouvons pas faire l\'échange avec.</string>
     <string name="swap_not_enabled">Échange désactivé</string>
-    <string name="Time">Temps</string>
+    <string name="category_Time">Temps</string>
     </resources>
diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml
index 904bddadb..7a3a27b7d 100644
--- a/F-Droid/res/values-he/strings.xml
+++ b/F-Droid/res/values-he/strings.xml
@@ -182,16 +182,16 @@
     <string name="app_icon">סמל אפליקציה</string>
     <string name="repo_icon">סמל מאגר</string>
 
-    <string name="Development">פיתוח</string>
-    <string name="Games">משחקים</string>
-    <string name="Internet">אינטרנט</string>
-    <string name="Multimedia">מולטימדיה</string>
-    <string name="Navigation">ניווט</string>
-    <string name="Phone_SMS">טלפון וגם SMS</string>
-    <string name="Reading">קריאה</string>
-    <string name="Science_Education">חינוך ומדע</string>
-    <string name="Security">אבטחה</string>
-    <string name="System">מערכת</string>
+    <string name="category_Development">פיתוח</string>
+    <string name="category_Games">משחקים</string>
+    <string name="category_Internet">אינטרנט</string>
+    <string name="category_Multimedia">מולטימדיה</string>
+    <string name="category_Navigation">ניווט</string>
+    <string name="category_Phone_SMS">טלפון וגם SMS</string>
+    <string name="category_Reading">קריאה</string>
+    <string name="category_Science_Education">חינוך ומדע</string>
+    <string name="category_Security">אבטחה</string>
+    <string name="category_System">מערכת</string>
     <string name="empty_installed_app_list">אין אפליקציות מותקנות.\n\nאין אפליקציות מותקנות על מכשירך, אך אלו אינן זמינות מתוך F-Droid. אפשרי כי זה כך מפני שעליך לעדכן את המאגרים שלך, או שלמאגרים באמת אין את האפליקציות שלך זמינות.</string>
     <string name="empty_available_app_list">אין אפליקציות בתוך קטגוריה זו.\n\nנסה לבחור קטגוריה אחרת או לעדכן את המאגרים שלך כדי להשיג רשימה רעננה של אפליקציות.</string>
     <string name="empty_can_update_app_list">כל האפליקציות מעודכנות.\n\nברכותינו! כל האפליקציות שלך הינן מעודכנות (או שהמאגרים שלך אינם מעודכנים).</string>
@@ -262,13 +262,13 @@
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">נקודה חמה</string>
 
-    <string name="Connectivity">קישוריות</string>
-    <string name="Graphics">גרפיקה</string>
-    <string name="Money">כספים</string>
-    <string name="Sports_Health">ספורט ובריאות</string>
-    <string name="Theming">עיצוב</string>
-    <string name="Time">זמן</string>
-    <string name="Writing">כתיבה</string>
+    <string name="category_Connectivity">קישוריות</string>
+    <string name="category_Graphics">גרפיקה</string>
+    <string name="category_Money">כספים</string>
+    <string name="category_Sports_Health">ספורט ובריאות</string>
+    <string name="category_Theming">עיצוב</string>
+    <string name="category_Time">זמן</string>
+    <string name="category_Writing">כתיבה</string>
 
     <string name="install_error_cannot_parse">אירעה שגיאה במהלך פענוח החבילה</string>
     <string name="swap_choose_apps">בחר אפליקציות</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index d30ae3ba1..6d23ced12 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -165,16 +165,16 @@ Prova a collegarti a questa rete: %s</string>
   <string name="requires_features">Richiede: %1$s</string>
   <string name="app_icon">Icona App</string>
   <string name="repo_icon">Icona della Repo</string>
-  <string name="Development">Sviluppo</string>
-  <string name="Games">Giochi</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigazione</string>
-  <string name="Phone_SMS">Telefono e SMS</string>
-  <string name="Reading">Lettura</string>
-  <string name="Science_Education">Scienza &amp; Educazione</string>
-  <string name="Security">Sicurezza</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Sviluppo</string>
+  <string name="category_Games">Giochi</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigazione</string>
+  <string name="category_Phone_SMS">Telefono e SMS</string>
+  <string name="category_Reading">Lettura</string>
+  <string name="category_Science_Education">Scienza &amp; Educazione</string>
+  <string name="category_Security">Sicurezza</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">Richiedo i permessi root…</string>
   <string name="root_access_denied_title">Accesso Root negato</string>
   <string name="root_access_denied_body">Il tuo telefono non ha i permessi di root oppure li hai negati ad F-Droid.</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 13ab11382..6b6549f9a 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -164,16 +164,16 @@
   <string name="requires_features">必須: %1$s</string>
   <string name="app_icon">ｱﾌﾟﾘｱｲｺﾝ</string>
   <string name="repo_icon">ﾘﾎﾟｼﾞﾄﾘのｱｲｺﾝ</string>
-  <string name="Development">開発</string>
-  <string name="Games">ｹﾞｰﾑ</string>
-  <string name="Internet">ｲﾝﾀｰﾈｯﾄ</string>
-  <string name="Multimedia">ﾏﾙﾁﾒﾃﾞｨｱ</string>
-  <string name="Navigation">ﾅﾋﾞｹﾞｰｼｮﾝ</string>
-  <string name="Phone_SMS">電話とSMS</string>
-  <string name="Reading">閲覧</string>
-  <string name="Science_Education">科学と教育</string>
-  <string name="Security">ｾｷｭﾘﾃｨ</string>
-  <string name="System">ｼｽﾃﾑ</string>
+  <string name="category_Development">開発</string>
+  <string name="category_Games">ｹﾞｰﾑ</string>
+  <string name="category_Internet">ｲﾝﾀｰﾈｯﾄ</string>
+  <string name="category_Multimedia">ﾏﾙﾁﾒﾃﾞｨｱ</string>
+  <string name="category_Navigation">ﾅﾋﾞｹﾞｰｼｮﾝ</string>
+  <string name="category_Phone_SMS">電話とSMS</string>
+  <string name="category_Reading">閲覧</string>
+  <string name="category_Science_Education">科学と教育</string>
+  <string name="category_Security">ｾｷｭﾘﾃｨ</string>
+  <string name="category_System">ｼｽﾃﾑ</string>
   <string name="requesting_root_access_body">管理者権限の要求中…</string>
   <string name="root_access_denied_title">管理者権限での接続が拒絶されました</string>
   <string name="root_access_denied_body">この端末はroot化されていないか､F-Droidの管理者権限要求が拒絶されされました｡</string>
@@ -301,13 +301,13 @@
     <string name="theme_light">ﾗｲﾄ</string>
     <string name="theme_dark">ﾀﾞｰｸ</string>
 <string name="about_source">ｿｰｽ:</string>
-	<string name="Connectivity">接続</string>
-    <string name="Graphics">ｸﾞﾗﾌｨｯｸ</string>
-    <string name="Money">ﾏﾈｰ</string>
-    <string name="Sports_Health">ｽﾎﾟｰﾂ &amp; 健康</string>
-    <string name="Theming">ﾃｰﾏ</string>
-    <string name="Time">時間</string>
-    <string name="Writing">文書</string>
+	<string name="category_Connectivity">接続</string>
+    <string name="category_Graphics">ｸﾞﾗﾌｨｯｸ</string>
+    <string name="category_Money">ﾏﾈｰ</string>
+    <string name="category_Sports_Health">ｽﾎﾟｰﾂ &amp; 健康</string>
+    <string name="category_Theming">ﾃｰﾏ</string>
+    <string name="category_Time">時間</string>
+    <string name="category_Writing">文書</string>
 
     <string name="unstable_updates">非安定版の更新</string>
 	<string name="unstable_updates_summary">非安定版への更新を提案します</string>
diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml
index 1205a7592..587d4d220 100644
--- a/F-Droid/res/values-ko/strings.xml
+++ b/F-Droid/res/values-ko/strings.xml
@@ -164,16 +164,16 @@ GNU GPLv3 라이센스 하에 배포됩니다.</string>
   <string name="requires_features">다음이 필요함: %1$s</string>
   <string name="app_icon">앱 아이콘</string>
   <string name="repo_icon">저장소 아이콘</string>
-  <string name="Development">개발</string>
-  <string name="Games">게임</string>
-  <string name="Internet">인터넷</string>
-  <string name="Multimedia">멀티미디어</string>
-  <string name="Navigation">탐색</string>
-  <string name="Phone_SMS">전화 및 문자</string>
-  <string name="Reading">독서</string>
-  <string name="Science_Education">과학 및 교육</string>
-  <string name="Security">보안</string>
-  <string name="System">시스템</string>
+  <string name="category_Development">개발</string>
+  <string name="category_Games">게임</string>
+  <string name="category_Internet">인터넷</string>
+  <string name="category_Multimedia">멀티미디어</string>
+  <string name="category_Navigation">탐색</string>
+  <string name="category_Phone_SMS">전화 및 문자</string>
+  <string name="category_Reading">독서</string>
+  <string name="category_Science_Education">과학 및 교육</string>
+  <string name="category_Security">보안</string>
+  <string name="category_System">시스템</string>
   <string name="requesting_root_access_body">루트 권한 요청하는 중…</string>
   <string name="root_access_denied_title">루트 권한 거부됨</string>
   <string name="root_access_denied_body">기기가 루팅되지 않았거나 F-Droid의 루트 권한 요청을 거부한 경우입니다.</string>
diff --git a/F-Droid/res/values-lt/strings.xml b/F-Droid/res/values-lt/strings.xml
index 47da3a6a2..8faef6d20 100644
--- a/F-Droid/res/values-lt/strings.xml
+++ b/F-Droid/res/values-lt/strings.xml
@@ -77,7 +77,7 @@
   <string name="repo_confirm_delete_body">Ištrynus saugyklą, jos programų katalogas nebebus pasiekiamas su F-Droid. Tačiau iki trynimo iš saugyklos įkeltos programos pašalintos nebus.</string>
   <string name="repo_disabled_notification">\"%1$s\" pažymėta kaip nenaudotina. Jei norite įkelti programas iš šios saugyklos, turite pirma leisti tai savo nustatymuose.</string>
   <string name="requires_features">Reikalauja: %1$s</string>
-  <string name="Science_Education">Mokslas ir mokymasis</string>
+  <string name="category_Science_Education">Mokslas ir mokymasis</string>
   <string name="menu_swap">Dalintis programom</string>
   <string name="swap_welcome">Sveikiname, jūs naudojate F-Droid!</string>
 </resources>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index 5a638000a..3c2e8d115 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -171,16 +171,16 @@ Du må
   <string name="requires_features">Krever: %1$s</string>
   <string name="app_icon">App ikon</string>
   <string name="repo_icon">Pakkebrønns-ikon</string>
-  <string name="Development">Utvikling</string>
-  <string name="Games">Spill</string>
-  <string name="Internet">Internett</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigasjon</string>
-  <string name="Phone_SMS">Telefon og SMS</string>
-  <string name="Reading">Leser</string>
-  <string name="Science_Education">Vitenskap &amp; Opplæring</string>
-  <string name="Security">Sikkerhet</string>
-  <string name="System">System</string>
+  <string name="category_Development">Utvikling</string>
+  <string name="category_Games">Spill</string>
+  <string name="category_Internet">Internett</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigasjon</string>
+  <string name="category_Phone_SMS">Telefon og SMS</string>
+  <string name="category_Reading">Leser</string>
+  <string name="category_Science_Education">Vitenskap &amp; Opplæring</string>
+  <string name="category_Security">Sikkerhet</string>
+  <string name="category_System">System</string>
   <string name="requesting_root_access_body">Etterspørr root-tilgang…</string>
   <string name="root_access_denied_title">Root tilgang nektet</string>
   <string name="root_access_denied_body">Enten mangler din Android-enhet superbrukertilgang, eller så har du nektet F-droid root-tilgang.</string>
@@ -226,11 +226,11 @@ Du må
     <string name="pref_language_default">Systemforvalg</string>
 
     <string name="wifi">Wi-Fi</string>
-    <string name="Graphics">Grafikk</string>
-    <string name="Money">Penger</string>
-    <string name="Sports_Health">Idrett og helse</string>
-    <string name="Time">Tid</string>
-    <string name="Writing">Skriving</string>
+    <string name="category_Graphics">Grafikk</string>
+    <string name="category_Money">Penger</string>
+    <string name="category_Sports_Health">Idrett og helse</string>
+    <string name="category_Time">Tid</string>
+    <string name="category_Writing">Skriving</string>
 
     <string name="install_error_title">Installasjonsfeil</string>
     <string name="install_error_unknown">Som følge av ukjent feil gikk installasjonen i vasken</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 6af4f7071..81998c080 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -162,16 +162,16 @@
   <string name="requires_features">Benodigd: %1$s</string>
   <string name="app_icon">App icoon</string>
   <string name="repo_icon">Bron icoon</string>
-  <string name="Development">Ontwikkeling</string>
-  <string name="Games">Spellen</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigatie</string>
-  <string name="Phone_SMS">Telefoon &amp; SMS</string>
-  <string name="Reading">Lezen</string>
-  <string name="Science_Education">Wetenschap &amp; Educatie</string>
-  <string name="Security">Beveiliging</string>
-  <string name="System">Systeem</string>
+  <string name="category_Development">Ontwikkeling</string>
+  <string name="category_Games">Spellen</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigatie</string>
+  <string name="category_Phone_SMS">Telefoon &amp; SMS</string>
+  <string name="category_Reading">Lezen</string>
+  <string name="category_Science_Education">Wetenschap &amp; Educatie</string>
+  <string name="category_Security">Beveiliging</string>
+  <string name="category_System">Systeem</string>
   <string name="requesting_root_access_body">Root toegang aanvragen…</string>
   <string name="root_access_denied_title">Root toegang geweigerd</string>
   <string name="root_access_denied_body">Uw Android apparaat is niet geroot, of u heeft F-Droid geen root toegang gegeven.</string>
@@ -230,13 +230,13 @@
     <string name="app_name">F-Droid</string>
 
 	<string name="about_source">Bron:</string>
-	<string name="Connectivity">Connectiviteit</string>
-    <string name="Graphics">Grafisch</string>
-    <string name="Money">Geld</string>
-    <string name="Sports_Health">Sport &amp; Gezondheid</string>
-    <string name="Theming">Thema\'s</string>
-    <string name="Time">Tijd</string>
-    <string name="Writing">Schrijven</string>
+	<string name="category_Connectivity">Connectiviteit</string>
+    <string name="category_Graphics">Grafisch</string>
+    <string name="category_Money">Geld</string>
+    <string name="category_Sports_Health">Sport &amp; Gezondheid</string>
+    <string name="category_Theming">Thema\'s</string>
+    <string name="category_Time">Tijd</string>
+    <string name="category_Writing">Schrijven</string>
 
     <string name="swap_scan_or_type_url">Een iemand moet de code scannen, of de URL van de ander in een browser openen.</string>
     <string name="swap_choose_apps">Kies Apps</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index 038129e63..ca93ded79 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -123,16 +123,16 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
   <string name="requires_features">Wymaga: %1$s</string>
   <string name="app_icon">Ikona aplikacji</string>
   <string name="repo_icon">Ikona repozytorium</string>
-  <string name="Development">Tworzenie</string>
-  <string name="Games">Gry</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Nawigacja</string>
-  <string name="Phone_SMS">Telefon i SMS</string>
-  <string name="Reading">Czytanie</string>
-  <string name="Science_Education">Nauka i edukacja</string>
-  <string name="Security">Bezpieczeństwo</string>
-  <string name="System">System</string>
+  <string name="category_Development">Tworzenie</string>
+  <string name="category_Games">Gry</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Nawigacja</string>
+  <string name="category_Phone_SMS">Telefon i SMS</string>
+  <string name="category_Reading">Czytanie</string>
+  <string name="category_Science_Education">Nauka i edukacja</string>
+  <string name="category_Security">Bezpieczeństwo</string>
+  <string name="category_System">System</string>
   <string name="requesting_root_access_body">Żądanie uprawnień roota…</string>
   <string name="root_access_denied_title">Odmówiono uprawnień roota</string>
   <string name="root_access_denied_body">Urządzenie nie zostało zrootowane lub odmówiono uprawnień roota F-Droidowi.</string>
@@ -242,13 +242,13 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
     <string name="update_interval_zero">Wyłącz automatyczne aktualizacje</string>
 	<string name="about_source">Kod źródłowy:</string>
 	<string name="not_on_same_wifi">Twoje urządzenie nie jest w tej samej sieci Wi-Fi co lokalne repozytorium które zostało dodane! Spróbuj połączyć się z siecią %s</string>
-    <string name="Connectivity">Łączność</string>
-    <string name="Graphics">Grafika</string>
-    <string name="Money">Finanse</string>
-    <string name="Sports_Health">Sport i zdrowie</string>
-    <string name="Theming">Motywy</string>
-    <string name="Time">Czas</string>
-    <string name="Writing">Edycja tekstu</string>
+    <string name="category_Connectivity">Łączność</string>
+    <string name="category_Graphics">Grafika</string>
+    <string name="category_Money">Finanse</string>
+    <string name="category_Sports_Health">Sport i zdrowie</string>
+    <string name="category_Theming">Motywy</string>
+    <string name="category_Time">Czas</string>
+    <string name="category_Writing">Edycja tekstu</string>
 
     <string name="swap_tap_to_select_apps">Dotknij by wybrać aplikacje, które chcesz przesłać.</string>
     <string name="swap_dont_show_again">Nie pokazuj więcej tego okna</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index b0315e789..59daa1057 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -163,16 +163,16 @@ com aplicativos baixados a partir de índices não assinados.</string>
   <string name="requires_features">Requer: %1$s</string>
   <string name="app_icon">Ícone do aplicativo</string>
   <string name="repo_icon">Ícone do repositório</string>
-  <string name="Development">Desenvolvimento</string>
-  <string name="Games">Jogos</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimídia</string>
-  <string name="Navigation">Navegação</string>
-  <string name="Phone_SMS">Telefone e SMS</string>
-  <string name="Reading">Leitura</string>
-  <string name="Science_Education">Ciência e Educação</string>
-  <string name="Security">Segurança</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Desenvolvimento</string>
+  <string name="category_Games">Jogos</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimídia</string>
+  <string name="category_Navigation">Navegação</string>
+  <string name="category_Phone_SMS">Telefone e SMS</string>
+  <string name="category_Reading">Leitura</string>
+  <string name="category_Science_Education">Ciência e Educação</string>
+  <string name="category_Security">Segurança</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">Solicitando acesso root…</string>
   <string name="root_access_denied_title">Acesso root negado</string>
   <string name="root_access_denied_body">Ou o seu dispositivo Android não está \"rooteado\" ou você recusou o acesso root para o F-Droid.</string>
@@ -241,13 +241,13 @@ com aplicativos baixados a partir de índices não assinados.</string>
     <string name="swap_active_hotspot">%1$s (seu ponto de acesso)</string>
     <string name="swap_switch_to_wifi">Toque para mudar para uma rede Wi-Fi</string>
     <string name="about_source">Fonte:</string>
-	<string name="Connectivity">Conectividade</string>
-    <string name="Graphics">Gráficos</string>
-    <string name="Money">Dinheiro</string>
-    <string name="Sports_Health">Esportes e saúde</string>
-    <string name="Theming">Temas</string>
-    <string name="Time">Tempo</string>
-    <string name="Writing">Escrita</string>
+	<string name="category_Connectivity">Conectividade</string>
+    <string name="category_Graphics">Gráficos</string>
+    <string name="category_Money">Dinheiro</string>
+    <string name="category_Sports_Health">Esportes e saúde</string>
+    <string name="category_Theming">Temas</string>
+    <string name="category_Time">Tempo</string>
+    <string name="category_Writing">Escrita</string>
 
     <string name="swap_tap_to_select_apps">Toque para selecionar os aplicativos que você quer permutar.</string>
     <string name="swap_dont_show_again">Não mostrar isto novamente</string>
diff --git a/F-Droid/res/values-pt-rPT/strings.xml b/F-Droid/res/values-pt-rPT/strings.xml
index c1e55174d..3423a3383 100644
--- a/F-Droid/res/values-pt-rPT/strings.xml
+++ b/F-Droid/res/values-pt-rPT/strings.xml
@@ -213,23 +213,23 @@
     <string name="category_all">Todas</string>
     <string name="category_whatsnew">Novidades</string>
     <string name="category_recentlyupdated">Atualizadas recentemente</string>
-    <string name="Connectivity">Conectividade</string>
-    <string name="Development">Desenvolvimento</string>
-    <string name="Games">Jogos</string>
-    <string name="Graphics">Gráficos</string>
-    <string name="Internet">Internet</string>
-    <string name="Money">Finanças</string>
-    <string name="Multimedia">Multimédia</string>
-    <string name="Navigation">Navegação</string>
-    <string name="Phone_SMS">Telefone e SMS</string>
-    <string name="Reading">Leitura</string>
-    <string name="Science_Education">Ciência e educação</string>
-    <string name="Security">Segurança</string>
-    <string name="Sports_Health">Desporto e saúde</string>
-    <string name="System">Sistema</string>
-    <string name="Theming">Temas</string>
-    <string name="Time">Tempo</string>
-    <string name="Writing">Escrita</string>
+    <string name="category_Connectivity">Conectividade</string>
+    <string name="category_Development">Desenvolvimento</string>
+    <string name="category_Games">Jogos</string>
+    <string name="category_Graphics">Gráficos</string>
+    <string name="category_Internet">Internet</string>
+    <string name="category_Money">Finanças</string>
+    <string name="category_Multimedia">Multimédia</string>
+    <string name="category_Navigation">Navegação</string>
+    <string name="category_Phone_SMS">Telefone e SMS</string>
+    <string name="category_Reading">Leitura</string>
+    <string name="category_Science_Education">Ciência e educação</string>
+    <string name="category_Security">Segurança</string>
+    <string name="category_Sports_Health">Desporto e saúde</string>
+    <string name="category_System">Sistema</string>
+    <string name="category_Theming">Temas</string>
+    <string name="category_Time">Tempo</string>
+    <string name="category_Writing">Escrita</string>
 
     <string name="empty_installed_app_list">Não existem aplicações instaladas.\n\nExistem aplicações no seu dispositivo mas que não existem no F-Droid. Pode ser necessário atualizar os seus repositórios ou então os repositórios não possuem aplicações.</string>
     <string name="empty_available_app_list">Não existem aplicações nesta categoria.\n\nSelecione uma categoria diferente ou atualize os repositórios para obter uma lista de aplicações.</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index d259a1cf5..37f45512a 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -163,16 +163,16 @@
   <string name="requires_features">Требуется: %1$s</string>
   <string name="app_icon">Иконка приложения</string>
   <string name="repo_icon">Иконка репозитория</string>
-  <string name="Development">Разработка</string>
-  <string name="Games">Игры</string>
-  <string name="Internet">Интернет</string>
-  <string name="Multimedia">Мультимедиа</string>
-  <string name="Navigation">Навигация</string>
-  <string name="Phone_SMS">Телефон и SMS</string>
-  <string name="Reading">Чтение</string>
-  <string name="Science_Education">Наука и образование</string>
-  <string name="Security">Безопасность</string>
-  <string name="System">Системные</string>
+  <string name="category_Development">Разработка</string>
+  <string name="category_Games">Игры</string>
+  <string name="category_Internet">Интернет</string>
+  <string name="category_Multimedia">Мультимедиа</string>
+  <string name="category_Navigation">Навигация</string>
+  <string name="category_Phone_SMS">Телефон и SMS</string>
+  <string name="category_Reading">Чтение</string>
+  <string name="category_Science_Education">Наука и образование</string>
+  <string name="category_Security">Безопасность</string>
+  <string name="category_System">Системные</string>
   <string name="requesting_root_access_body">Запрос root доступа…</string>
   <string name="root_access_denied_title">Отказано в root доступе</string>
   <string name="root_access_denied_body">Либо у вашего устройства нет root доступа, либо вы отклонили запрос от F-Droid.</string>
@@ -204,10 +204,10 @@
 	<string name="unstable_updates_summary">Предлагать обновления до нестабильных версий</string>
 	<string name="pref_language">Язык</string>
     <string name="wifi">Wi-Fi</string>
-    <string name="Graphics">Графика</string>
-    <string name="Money">Деньги</string>
-    <string name="Sports_Health">Спорт и здоровье</string>
-    <string name="Time">Время</string>
+    <string name="category_Graphics">Графика</string>
+    <string name="category_Money">Деньги</string>
+    <string name="category_Sports_Health">Спорт и здоровье</string>
+    <string name="category_Time">Время</string>
     <string name="app_name">F-Droid</string>
 
 	<string name="tab_installed_apps">Установлено</string>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index 60947fcf2..9d5b5a8e8 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -165,16 +165,16 @@ Intregadu cun sa litzèntzia
   <string name="requires_features">Netzessitat de: %1$s</string>
   <string name="app_icon">Icona de s\'aplicatzione</string>
   <string name="repo_icon">Icona depòsitu</string>
-  <string name="Development">Isvilupu</string>
-  <string name="Games">Giogos</string>
-  <string name="Internet">Ìnternet</string>
-  <string name="Multimedia">Multimèdia</string>
-  <string name="Navigation">Nàvigu</string>
-  <string name="Phone_SMS">Telèfonu &amp; SMS</string>
-  <string name="Reading">Leghidura</string>
-  <string name="Science_Education">Iscièntzia e educatzione</string>
-  <string name="Security">Seguràntzia</string>
-  <string name="System">Sistema</string>
+  <string name="category_Development">Isvilupu</string>
+  <string name="category_Games">Giogos</string>
+  <string name="category_Internet">Ìnternet</string>
+  <string name="category_Multimedia">Multimèdia</string>
+  <string name="category_Navigation">Nàvigu</string>
+  <string name="category_Phone_SMS">Telèfonu &amp; SMS</string>
+  <string name="category_Reading">Leghidura</string>
+  <string name="category_Science_Education">Iscièntzia e educatzione</string>
+  <string name="category_Security">Seguràntzia</string>
+  <string name="category_System">Sistema</string>
   <string name="requesting_root_access_body">Pedinde s\'atzessu root…</string>
   <string name="root_access_denied_title">Atzessu root dennegadu</string>
   <string name="root_access_denied_body">Su dispositivu tuo non tenet sos permissos de root o non los as datu a F-droid.</string>
@@ -226,13 +226,13 @@ Intregadu cun sa litzèntzia
 	<string name="about_source">Mitza:</string>
 	<string name="tab_installed_apps">Installadas</string>
 	<string name="bad_fingerprint">Imprenta/arrastu isballiada</string>
-	<string name="Connectivity">Connetividade</string>
-    <string name="Graphics">Gràfica</string>
-    <string name="Money">Dinare</string>
-    <string name="Sports_Health">Isport e Salude</string>
-    <string name="Theming">Temas</string>
-    <string name="Time">Tempus</string>
-    <string name="Writing">Iscritura</string>
+	<string name="category_Connectivity">Connetividade</string>
+    <string name="category_Graphics">Gràfica</string>
+    <string name="category_Money">Dinare</string>
+    <string name="category_Sports_Health">Isport e Salude</string>
+    <string name="category_Theming">Temas</string>
+    <string name="category_Time">Tempus</string>
+    <string name="category_Writing">Iscritura</string>
 
     <string name="system_install_first_time_notification">Installare s’estensione F-Droid cun permissos de sistema?</string>
     <string name="system_install_first_time_notification_message_short">Toca pro àteras informatziones.</string>
diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml
index 90037fc87..66a2d0ad1 100644
--- a/F-Droid/res/values-sk/strings.xml
+++ b/F-Droid/res/values-sk/strings.xml
@@ -161,16 +161,16 @@ Vydaný pod licenciou
   <string name="requires_features">Vyžaduje: %1$s</string>
   <string name="app_icon">Ikona aplikácie</string>
   <string name="repo_icon">Ikona repa</string>
-  <string name="Development">Vývoj</string>
-  <string name="Games">Hry</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimédiá</string>
-  <string name="Navigation">Navigácia</string>
-  <string name="Phone_SMS">Telefón a SMS</string>
-  <string name="Reading">Čítanie</string>
-  <string name="Science_Education">Veda a výuka</string>
-  <string name="Security">Bezpečnosť</string>
-  <string name="System">Systém</string>
+  <string name="category_Development">Vývoj</string>
+  <string name="category_Games">Hry</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimédiá</string>
+  <string name="category_Navigation">Navigácia</string>
+  <string name="category_Phone_SMS">Telefón a SMS</string>
+  <string name="category_Reading">Čítanie</string>
+  <string name="category_Science_Education">Veda a výuka</string>
+  <string name="category_Security">Bezpečnosť</string>
+  <string name="category_System">Systém</string>
   <string name="requesting_root_access_body">Žiadame root prístup…</string>
   <string name="root_access_denied_title">Root prístup zamietnutý</string>
   <string name="root_access_denied_body">Buď vaše zariadenie s Androidom nemá urobený root alebo ste odmietli root prístup pre F-Droid.</string>
@@ -215,10 +215,10 @@ Vydaný pod licenciou
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Hotspot</string>
 
-    <string name="Connectivity">Pripojiteľnosť</string>
-    <string name="Graphics">Grafika</string>
-    <string name="Money">Financie</string>
-    <string name="Sports_Health">Šport &amp; Zdravie</string>
+    <string name="category_Connectivity">Pripojiteľnosť</string>
+    <string name="category_Graphics">Grafika</string>
+    <string name="category_Money">Financie</string>
+    <string name="category_Sports_Health">Šport &amp; Zdravie</string>
     <string name="empty_can_update_app_list">Všetky aplikácie sú aktuálne.\n\nGratulujeme! Všetky vaše aplikácie sú aktuálne (alebo vaše repozitáre sú neaktuálne).</string>
 
     <string name="install_error_title">Chyba pri inštalácií</string>
@@ -227,7 +227,7 @@ Vydaný pod licenciou
     <string name="system_install_first_time_notification">Inštalovať Oprávnené Rozšírenie F-Droidu?</string>
     <string name="menu_bitcoin">Bitcoin</string>
 	<string name="menu_litecoin">Litecoin</string>
-	<string name="Time">Čas</string>
+	<string name="category_Time">Čas</string>
     <string name="empty_installed_app_list">Nenainštalované žiadne aplikácie.
 \n\nMáte aplikácie v zariadení, ale nie sú dostupné z F-Droidu. Možné dôvody: treba aktualizovať repozitáre, v repozitároch nie sú k dispozícií aplikácie.</string>
     <string name="empty_available_app_list">Žiadne aplikácie v tejto kategórií\n\nSkúste inú kategóriu alebo aktualizujte repozitáre pre aktuálny zoznam aplikácií.</string>
@@ -278,9 +278,9 @@ Vydaný pod licenciou
 
     <string name="theme_light">Svetlá</string>
     <string name="theme_dark">Tmavá</string>
-<string name="Writing">Písanie</string>
+<string name="category_Writing">Písanie</string>
 
-    <string name="Theming">Témy</string>
+    <string name="category_Theming">Témy</string>
     <string name="swap_not_visible_bluetooth">Nie je viditeľný cez Bluetooth</string>
     <string name="swap_not_visible_wifi">Nie je viditeľný cez Wi-Fi</string>
     <string name="swap_cant_send_no_bluetooth">Nemožno poslať F-Droid, pretože Bluetooh nie je dostupný na tomto zariadení.</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index b108812f7..115f006cc 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -161,16 +161,16 @@
   <string name="requires_features">Захтева: %1$s</string>
   <string name="app_icon">Икона апликације</string>
   <string name="repo_icon">Икона ризнице</string>
-  <string name="Development">Програмирање</string>
-  <string name="Games">Игре</string>
-  <string name="Internet">Интернет</string>
-  <string name="Multimedia">Мултимедија</string>
-  <string name="Navigation">Навигација</string>
-  <string name="Phone_SMS">Телефон и СМС</string>
-  <string name="Reading">Читање</string>
-  <string name="Science_Education">Наука и образовање</string>
-  <string name="Security">Безбедност</string>
-  <string name="System">Систем</string>
+  <string name="category_Development">Програмирање</string>
+  <string name="category_Games">Игре</string>
+  <string name="category_Internet">Интернет</string>
+  <string name="category_Multimedia">Мултимедија</string>
+  <string name="category_Navigation">Навигација</string>
+  <string name="category_Phone_SMS">Телефон и СМС</string>
+  <string name="category_Reading">Читање</string>
+  <string name="category_Science_Education">Наука и образовање</string>
+  <string name="category_Security">Безбедност</string>
+  <string name="category_System">Систем</string>
   <string name="requesting_root_access_body">Захтевам корени приступ…</string>
   <string name="root_access_denied_title">Корени приступ одбијен</string>
   <string name="root_access_denied_body">Или ваш Андроид уређај није рутован или сте Ф-дроиду одбили корени приступ.</string>
@@ -212,13 +212,13 @@
     <string name="wifi">Бежични</string>
     <string name="wifi_ap">Хотспот</string>
 
-    <string name="Connectivity">Повезивање</string>
-    <string name="Graphics">Графика</string>
-    <string name="Money">Финансије</string>
-    <string name="Sports_Health">Спорт и здравље</string>
-    <string name="Theming">Теме</string>
-    <string name="Time">Време</string>
-    <string name="Writing">Писање</string>
+    <string name="category_Connectivity">Повезивање</string>
+    <string name="category_Graphics">Графика</string>
+    <string name="category_Money">Финансије</string>
+    <string name="category_Sports_Health">Спорт и здравље</string>
+    <string name="category_Theming">Теме</string>
+    <string name="category_Time">Време</string>
+    <string name="category_Writing">Писање</string>
 
     <string name="install_error_title">Грешка инсталације</string>
     <string name="install_error_cannot_parse">Десила се грешка приликом рашчлањивања пакета</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index f26f59a41..0dc1a3561 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -163,16 +163,16 @@ Släppt under licensen GNU GPLv3.</string>
   <string name="requires_features">Kräver: %1$s</string>
   <string name="app_icon">Appikon</string>
   <string name="repo_icon">Förrådsikon</string>
-  <string name="Development">Utveckling</string>
-  <string name="Games">Spel</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Multimedia</string>
-  <string name="Navigation">Navigation</string>
-  <string name="Phone_SMS">Telefon &amp; SMS</string>
-  <string name="Reading">Läsning</string>
-  <string name="Science_Education">Vetenskap &amp; utbildning</string>
-  <string name="Security">Säkerhet</string>
-  <string name="System">System</string>
+  <string name="category_Development">Utveckling</string>
+  <string name="category_Games">Spel</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Multimedia</string>
+  <string name="category_Navigation">Navigation</string>
+  <string name="category_Phone_SMS">Telefon &amp; SMS</string>
+  <string name="category_Reading">Läsning</string>
+  <string name="category_Science_Education">Vetenskap &amp; utbildning</string>
+  <string name="category_Security">Säkerhet</string>
+  <string name="category_System">System</string>
   <string name="requesting_root_access_body">Efterfrågar root-åtkomst…</string>
   <string name="root_access_denied_title">Root-åtkomst nekad</string>
   <string name="root_access_denied_body">Antingen är din Android-enhet inte rootad eller så har du nekat root-åtkomst för F-Droid.</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index 34b7a8539..7305fe73b 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -176,16 +176,16 @@ Ondan uygulama indirmek için bu depoyu tekrar etkinleştirmeniz gerekecektir.</
   <string name="requires_features">Gerektirdiği: %1$s</string>
   <string name="app_icon">Uygulama ikonu</string>
   <string name="repo_icon">Depo ikonu</string>
-  <string name="Development">Geliştirme</string>
-  <string name="Games">Oyunlar</string>
-  <string name="Internet">İnternet</string>
-  <string name="Multimedia">Çoklu Ortam</string>
-  <string name="Navigation">Gezinim</string>
-  <string name="Phone_SMS">Telefon &amp; SMS</string>
-  <string name="Reading">Okuma</string>
-  <string name="Science_Education">Bilim &amp; Eğitim</string>
-  <string name="Security">Güvenlik</string>
-  <string name="System">Sistem</string>
+  <string name="category_Development">Geliştirme</string>
+  <string name="category_Games">Oyunlar</string>
+  <string name="category_Internet">İnternet</string>
+  <string name="category_Multimedia">Çoklu Ortam</string>
+  <string name="category_Navigation">Gezinim</string>
+  <string name="category_Phone_SMS">Telefon &amp; SMS</string>
+  <string name="category_Reading">Okuma</string>
+  <string name="category_Science_Education">Bilim &amp; Eğitim</string>
+  <string name="category_Security">Güvenlik</string>
+  <string name="category_System">Sistem</string>
   <string name="requesting_root_access_body">Root erişimi isteniyor…</string>
   <string name="root_access_denied_title">Root erişimi engellendi</string>
   <string name="root_access_denied_body">Ya Android cihazınız rootlu değil ya da F-Droid için root erişimini engellediniz.</string>
diff --git a/F-Droid/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml
index e71779397..362fa4918 100644
--- a/F-Droid/res/values-uk/strings.xml
+++ b/F-Droid/res/values-uk/strings.xml
@@ -167,19 +167,19 @@
     <string name="app_icon">Піктограма додатку</string>
     <string name="repo_icon">Піктограма репозиторію</string>
     <string name="wifi">Wi-Fi</string>
-    <string name="Games">Ігри</string>
-    <string name="Graphics">Графіка</string>
-    <string name="Internet">Інтернет</string>
-    <string name="Money">Фінанси</string>
-    <string name="Multimedia">Мультимедіа</string>
-    <string name="Navigation">Навігація</string>
-    <string name="Phone_SMS">Дзвінки та SMS</string>
-    <string name="Reading">Читання</string>
-    <string name="Science_Education">Освіта та наука</string>
-    <string name="Security">Безпека</string>
-    <string name="Sports_Health">Спорт та здоров\'я</string>
-    <string name="System">Система</string>
-    <string name="Time">Час</string>
+    <string name="category_Games">Ігри</string>
+    <string name="category_Graphics">Графіка</string>
+    <string name="category_Internet">Інтернет</string>
+    <string name="category_Money">Фінанси</string>
+    <string name="category_Multimedia">Мультимедіа</string>
+    <string name="category_Navigation">Навігація</string>
+    <string name="category_Phone_SMS">Дзвінки та SMS</string>
+    <string name="category_Reading">Читання</string>
+    <string name="category_Science_Education">Освіта та наука</string>
+    <string name="category_Security">Безпека</string>
+    <string name="category_Sports_Health">Спорт та здоров\'я</string>
+    <string name="category_System">Система</string>
+    <string name="category_Time">Час</string>
     <string name="update_all">Оновити всі</string>
     <string name="install_error_title">Помилка встановлення</string>
     <string name="install_error_cannot_parse">Трапилася помилка під час обробки пакунку</string>
@@ -270,7 +270,7 @@
     <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="Development">Розробка</string>
+    <string name="category_Development">Розробка</string>
     <string name="requesting_root_access_body">Запит root доступу…</string>
     <string name="root_access_denied_title">У root доступі відмовлено</string>
     <string name="root_access_denied_body">Або ваш пристрій не має root доступу, або ж ви відхилили запит від F-Droid.</string>
@@ -297,7 +297,7 @@
     <string name="swap_not_enabled">Обмін не увімкнено</string>
     <string name="wifi_ap">Точка доступу</string>
 
-    <string name="Writing">Редагування</string>
+    <string name="category_Writing">Редагування</string>
 
     <string name="system_install_denied_permissions">Привілейований доступ не був наданий розширенню! Будь ласка, відзвітуйте про цю ваду!</string>
     <string name="system_install_post_success_message">Привілейоване розширення F-Droid встановлено. Це дозволить встановлювати, оновлювати та вилучати додатки за допомогою F-Droid.</string>
@@ -327,7 +327,7 @@
     <string name="swap_qr_isnt_for_swap">QR-код, який ви просканувати, не містить коду для обміну.</string>
     <string name="devicePerms">Доступ до пристрою</string>
     <string name="repo_added">F-Droid ропозиторій %1$s збережено.</string>
-    <string name="Theming">Графічні теми</string>
+    <string name="category_Theming">Графічні теми</string>
     <string name="swap_connection_misc_error">Трапилася помилка під час доступу до пристрою, не можливо продовжити обмін з ним.</string>
     <string name="system_install_first_time_message">Схоже, що у вас є root доступ на вашому пристрою. Ви можете встановити привілейоване розширення F-Droid, що інтегрується з операційною системою Android. Це дозволить додатку F-Droid встановлювати, оновлювати та видаляти додатки своїми засобами.</string>
     <string name="repo_details">Репозиторій</string>
diff --git a/F-Droid/res/values-vi/strings.xml b/F-Droid/res/values-vi/strings.xml
index 3ac90ae6d..07c80ed12 100644
--- a/F-Droid/res/values-vi/strings.xml
+++ b/F-Droid/res/values-vi/strings.xml
@@ -147,16 +147,16 @@
   <string name="requires_features">Yêu cầu: %1$s</string>
   <string name="app_icon">Biểu tượng ứng dụng</string>
   <string name="repo_icon">Biểu tượng kho</string>
-  <string name="Development">Lập trình</string>
-  <string name="Games">Trò chơi</string>
-  <string name="Internet">Internet</string>
-  <string name="Multimedia">Đa phương tiện</string>
-  <string name="Navigation">Điều hướng</string>
-  <string name="Phone_SMS">Gọi &amp; nhắn tin</string>
-  <string name="Reading">Đọc</string>
-  <string name="Science_Education">Khoa học &amp; giáo dục</string>
-  <string name="Security">Bảo mật</string>
-  <string name="System">Hệ thống</string>
+  <string name="category_Development">Lập trình</string>
+  <string name="category_Games">Trò chơi</string>
+  <string name="category_Internet">Internet</string>
+  <string name="category_Multimedia">Đa phương tiện</string>
+  <string name="category_Navigation">Điều hướng</string>
+  <string name="category_Phone_SMS">Gọi &amp; nhắn tin</string>
+  <string name="category_Reading">Đọc</string>
+  <string name="category_Science_Education">Khoa học &amp; giáo dục</string>
+  <string name="category_Security">Bảo mật</string>
+  <string name="category_System">Hệ thống</string>
   <string name="requesting_root_access_body">Đang yêu cầu quyền root…</string>
   <string name="root_access_denied_title">Bị từ chối quyền root</string>
   <string name="root_access_denied_body">Thiết bị của bạn chưa được root hoặc bạn đã từ chối quyền root của F-Droid.</string>
@@ -212,13 +212,13 @@
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Điểm truy cập</string>
 
-    <string name="Connectivity">Kết nối</string>
-    <string name="Graphics">Đồ hoạ</string>
-    <string name="Money">Chi tiêu</string>
-    <string name="Sports_Health">Thể thao &amp; Sức khoẻ</string>
-    <string name="Theming">Giao diện</string>
-    <string name="Time">Thời gian</string>
-    <string name="Writing">Soạn thảo</string>
+    <string name="category_Connectivity">Kết nối</string>
+    <string name="category_Graphics">Đồ hoạ</string>
+    <string name="category_Money">Chi tiêu</string>
+    <string name="category_Sports_Health">Thể thao &amp; Sức khoẻ</string>
+    <string name="category_Theming">Giao diện</string>
+    <string name="category_Time">Thời gian</string>
+    <string name="category_Writing">Soạn thảo</string>
 
     <string name="empty_installed_app_list">Chưa cài đặt ứng dụng nào.\n\nCó ứng dụng trên máy của bạn, nhưng những ứng dụng này không có trên F-Droid. Có thể bạn cần phải cập nhật các kho ứng dụng, hoặc không ứng dụng nào của bạn có trên các kho này.</string>
     <string name="empty_available_app_list">Không có ứng dụng nào trong mục này.\n\nHãy chọn một mục khác hoặc cập nhật kho ứng dụng để có danh sách ứng dụng mới.</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index f36bae09c..b362bc29c 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -152,16 +152,16 @@
   <string name="requires_features">需要：%1$s</string>
   <string name="app_icon">应用程序图标</string>
   <string name="repo_icon">软件源图标</string>
-  <string name="Development">软件开发</string>
-  <string name="Games">游戏</string>
-  <string name="Internet">互联网</string>
-  <string name="Multimedia">多媒体</string>
-  <string name="Navigation">导航</string>
-  <string name="Phone_SMS">电话和短信</string>
-  <string name="Reading">阅读</string>
-  <string name="Science_Education">科学和教育</string>
-  <string name="Security">安全</string>
-  <string name="System">系统</string>
+  <string name="category_Development">软件开发</string>
+  <string name="category_Games">游戏</string>
+  <string name="category_Internet">互联网</string>
+  <string name="category_Multimedia">多媒体</string>
+  <string name="category_Navigation">导航</string>
+  <string name="category_Phone_SMS">电话和短信</string>
+  <string name="category_Reading">阅读</string>
+  <string name="category_Science_Education">科学和教育</string>
+  <string name="category_Security">安全</string>
+  <string name="category_System">系统</string>
   <string name="requesting_root_access_body">正在请求root权限…</string>
   <string name="root_access_denied_title">root权限取得失败</string>
   <string name="update_all">更新全部</string>
diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml
index 23a6a8a5a..843542bb9 100644
--- a/F-Droid/res/values-zh-rHK/strings.xml
+++ b/F-Droid/res/values-zh-rHK/strings.xml
@@ -132,16 +132,16 @@
   <string name="requires_features">需要：%1$s</string>
   <string name="app_icon">應用程式圖示</string>
   <string name="repo_icon">倉庫圖示</string>
-  <string name="Development">開發</string>
-  <string name="Games">遊戲</string>
-  <string name="Internet">互聯網</string>
-  <string name="Multimedia">多媒體</string>
-  <string name="Navigation">導航</string>
-  <string name="Phone_SMS">通話與短訊</string>
-  <string name="Reading">閱讀</string>
-  <string name="Science_Education">科學與教育</string>
-  <string name="Security">安全性</string>
-  <string name="System">系統</string>
+  <string name="category_Development">開發</string>
+  <string name="category_Games">遊戲</string>
+  <string name="category_Internet">互聯網</string>
+  <string name="category_Multimedia">多媒體</string>
+  <string name="category_Navigation">導航</string>
+  <string name="category_Phone_SMS">通話與短訊</string>
+  <string name="category_Reading">閱讀</string>
+  <string name="category_Science_Education">科學與教育</string>
+  <string name="category_Security">安全性</string>
+  <string name="category_System">系統</string>
   <string name="requesting_root_access_body">要求 root 權限中…</string>
   <string name="root_access_denied_title">Root 權限被拒絕</string>
   <string name="update_all">更新所有應用程式</string>
@@ -176,13 +176,13 @@
     <string name="wifi">Wi-Fi</string>
     <string name="wifi_ap">Wi-Fi 熱點</string>
 
-    <string name="Connectivity">網絡</string>
-    <string name="Graphics">繪圖</string>
-    <string name="Money">財經</string>
-    <string name="Sports_Health">體育與健康</string>
-    <string name="Theming">主題</string>
-    <string name="Time">時間</string>
-    <string name="Writing">文書</string>
+    <string name="category_Connectivity">網絡</string>
+    <string name="category_Graphics">繪圖</string>
+    <string name="category_Money">財經</string>
+    <string name="category_Sports_Health">體育與健康</string>
+    <string name="category_Theming">主題</string>
+    <string name="category_Time">時間</string>
+    <string name="category_Writing">文書</string>
 
     <string name="empty_available_app_list">此分類沒有任何應用程式。\n\n請選擇另一個分類或嘗試更新您的軟件倉庫以取得最新的程式清單。</string>
     <string name="empty_can_update_app_list">所有應用程式都是最新的。\n\n恭喜您！您所有的應用程式都是最新的版本 (或許您的軟件倉庫已過期)。</string>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index fe5dd259d..27006cfb8 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -236,23 +236,23 @@
     <string name="category_all">All</string>
     <string name="category_whatsnew">What\'s New</string>
     <string name="category_recentlyupdated">Recently Updated</string>
-    <string name="Connectivity">Connectivity</string>
-    <string name="Development">Development</string>
-    <string name="Games">Games</string>
-    <string name="Graphics">Graphics</string>
-    <string name="Internet">Internet</string>
-    <string name="Money">Money</string>
-    <string name="Multimedia">Multimedia</string>
-    <string name="Navigation">Navigation</string>
-    <string name="Phone_SMS">Phone &amp; SMS</string>
-    <string name="Reading">Reading</string>
-    <string name="Science_Education">Science &amp; Education</string>
-    <string name="Security">Security</string>
-    <string name="Sports_Health">Sports &amp; Health</string>
-    <string name="System">System</string>
-    <string name="Theming">Theming</string>
-    <string name="Time">Time</string>
-    <string name="Writing">Writing</string>
+    <string name="category_Connectivity">Connectivity</string>
+    <string name="category_Development">Development</string>
+    <string name="category_Games">Games</string>
+    <string name="category_Graphics">Graphics</string>
+    <string name="category_Internet">Internet</string>
+    <string name="category_Money">Money</string>
+    <string name="category_Multimedia">Multimedia</string>
+    <string name="category_Navigation">Navigation</string>
+    <string name="category_Phone_SMS">Phone &amp; SMS</string>
+    <string name="category_Reading">Reading</string>
+    <string name="category_Science_Education">Science &amp; Education</string>
+    <string name="category_Security">Security</string>
+    <string name="category_Sports_Health">Sports &amp; Health</string>
+    <string name="category_System">System</string>
+    <string name="category_Theming">Theming</string>
+    <string name="category_Time">Time</string>
+    <string name="category_Writing">Writing</string>
 
     <string name="empty_installed_app_list">No apps installed.\n\nThere are apps on your device, but they are not available from F-Droid. This could be because you need to update your repositories, or the repositories genuinely don\'t have your apps available.</string>
     <string name="empty_available_app_list">No apps in this category.\n\nTry selecting a different category or updating your repositories to get a fresh list of apps.</string>
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 8ce67a395..28e58df3a 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -113,8 +113,10 @@ public class AvailableAppsFragment extends AppListFragment implements
     private List<String> translateCategories(List<String> categories) {
         List<String> translatedCategories = new ArrayList<>(categories.size());
         Resources res = getResources();
+        String pkgName = getActivity().getPackageName();
         for (final String category : categories) {
-            int id = res.getIdentifier(category.replace(" & ", "_"), "string", getActivity().getPackageName());
+            String resName = "category_" + category.replace(" & ", "_");
+            int id = res.getIdentifier(resName, "string", pkgName);
             translatedCategories.add(id == 0 ? category : getString(id));
         }
         return translatedCategories;