From 53696f752aaeff6e2a936bfbdcad1d1d2f968814 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Mon, 29 Apr 2019 20:17:50 +0200
Subject: [PATCH] Fix translations (#1223)

* flatten string arrays

* delete empty ko translations

* delete crowdin comments

* fix warning in czech translation

* delete untranslated strings
---
 app/src/main/res/values-ar/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-ca/strings.xml     | 14 ++-----
 app/src/main/res/values-cs/strings.xml     | 43 ++++++++--------------
 app/src/main/res/values-cy/strings.xml     | 32 ++++++----------
 app/src/main/res/values-de/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-eo/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-es/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-eu/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-fa/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-fr/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-hu/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-it/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-ja/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-ko/strings.xml     | 11 ------
 app/src/main/res/values-nl/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-no-rNB/strings.xml | 19 ----------
 app/src/main/res/values-oc/strings.xml     | 34 +++++++----------
 app/src/main/res/values-pl/strings.xml     | 32 ++++++----------
 app/src/main/res/values-pt-rBR/strings.xml | 39 +++++++-------------
 app/src/main/res/values-ru/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-sv/strings.xml     | 41 ++++++++-------------
 app/src/main/res/values-ta/strings.xml     | 20 ++++------
 app/src/main/res/values-tr/strings.xml     | 40 ++++++++------------
 app/src/main/res/values-zh-rCN/strings.xml | 40 ++++++++------------
 app/src/main/res/values-zh-rHK/strings.xml | 40 ++++++++------------
 app/src/main/res/values-zh-rMO/strings.xml | 40 ++++++++------------
 app/src/main/res/values-zh-rSG/strings.xml | 40 ++++++++------------
 app/src/main/res/values-zh-rTW/strings.xml | 40 ++++++++------------
 app/src/main/res/values/string-arrays.xml  | 32 ++++++++++++++++
 app/src/main/res/values/strings.xml        | 40 ++++++++------------
 30 files changed, 418 insertions(+), 665 deletions(-)
 delete mode 100644 app/src/main/res/values-ko/strings.xml
 create mode 100644 app/src/main/res/values/string-arrays.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fe472167b..ff40cc057 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">وقع هناك خطأ.</string>
     <string name="error_network">حدث خطأ في الشبكة! يرجى التحقق من اتصالك ثم أعد المحاولة!</string>
@@ -177,13 +176,11 @@
     <string name="pref_title_app_theme">سمة التطبيق</string>
     <string name="pref_title_timelines">الخيوط</string>
     <string name="pref_title_timeline_filters">عوامل التصفية</string>
-    <string-array name="app_theme_names">
-        <item>داكنة</item>
-        <item>فاتحة</item>
-        <item>سوداء</item>
-        <item>تلقائي عند غروب الشمس</item>
-        <item>استخدم مظهر النظام</item>
-    </string-array>
+    <string name="app_them_dark">داكنة</string>
+    <string name="app_theme_light">فاتحة</string>
+    <string name="app_theme_black">سوداء</string>
+    <string name="app_theme_auto">تلقائي عند غروب الشمس</string>
+    <string name="app_theme_system">استخدم مظهر النظام</string>
     <string name="pref_title_browser_settings">المتصفح</string>
     <string name="pref_title_custom_tabs">إخفاء زر المتابعة أثناء تمرير الصفحة</string>
     <string name="pref_title_hide_follow_button">إخفاء زر التحرير عند التمرير</string>
@@ -202,25 +199,19 @@
     <string name="pref_default_media_sensitivity">تعيين الوسائط كمحتوى حساس دائمًا</string>
     <string name="pref_publishing">النشر</string>
     <string name="pref_failed_to_sync">فَشِلَت عملية مزامنة الإعدادات</string>
-    <string-array name="post_privacy_names">
-        <item>للعامة</item>
-        <item>غير مدرج</item>
-        <item>للمُتابِعين فقط</item>
-    </string-array>
+    <string name="post_privacy_public">للعامة</string>
+    <string name="post_privacy_unlisted">غير مدرج</string>
+    <string name="post_privacy_followers_only">للمُتابِعين فقط</string>
     <string name="pref_status_text_size">حجم الخط</string>
-    <string-array name="status_text_size_names">
-        <item>صغير جدا</item>
-        <item>صغير</item>
-        <item>متوسط</item>
-        <item>عريض</item>
-        <item>عريض جدا</item>
-    </string-array>
+    <string name="status_text_size_smallest">صغير جدا</string>
+    <string name="status_text_size_small">صغير</string>
+    <string name="status_text_size_medium">متوسط</string>
+    <string name="status_text_size_large">عريض</string>
+    <string name="status_text_size_largest">عريض جدا</string>
     <string name="pref_media_display">عرض الوسائط</string>
-    <string-array name="media_display_names">
-        <item>إخفاء الوسائط المعينة كحساسة</item>
-        <item>اظهار الوسائط المعينة كمحتوى حساس دائمًا</item>
-        <item>إخفاء كافة الوسائط دائما</item>
-    </string-array>
+    <string name="media_hide_sensitive">إخفاء الوسائط المعينة كحساسة</string>
+    <string name="media_hide_none">اظهار الوسائط المعينة كمحتوى حساس دائمًا</string>
+    <string name="media_hide_all">إخفاء كافة الوسائط دائما</string>
     <string name="notification_channel_mention_name">إشارات جديدة</string>
     <string name="notification_channel_mention_descriptions">الإخطارات عندما يشار إليك</string>
     <string name="notification_channel_follow_name">متابِعون جدد</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c5de9b289..2b88ce984 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -161,20 +161,12 @@
     <string name="pref_default_post_privacy">Privacitat predeterminada dels toots</string>
     <string name="pref_publishing">Publicació</string>
 
-    <string-array name="post_privacy_names">
-        <item>Pública</item>
-        <item>Sense llistar</item>
-        <item>Només seguidors</item>
-    </string-array>
+    <string name="post_privacy_public">Pública</string>
+    <string name="post_privacy_unlisted">Sense llistar</string>
+    <string name="post_privacy_followers_only">Només seguidors</string>
 
     <string name="pref_status_text_size">Mida de text de l\'estat</string>
 
-    <!--<string-array name="status_text_size_names">-->
-        <!--<item>Petita</item>-->
-        <!--<item>Mitjana</item>-->
-        <!--<item>Gran</item>-->
-    <!--</string-array>-->
-
     <string name="notification_channel_mention_name">Mencions noves</string>
     <string name="notification_channel_mention_descriptions">Notificacions sobre mencions noves</string>
     <string name="notification_channel_follow_name">Seguidors nous</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b41f9448a..048977bd6 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Vyskytla se chyba.</string>
     <string name="error_network">Vyskytla se chyba sítě! Prosím zkontrolujte své připojení a zkuste to znovu!</string>
@@ -183,13 +182,11 @@
     <string name="pref_title_app_theme">Motiv aplikace</string>
     <string name="pref_title_timelines">Časové osy</string>
     <string name="pref_title_timeline_filters">Filtry</string>
-    <string-array name="app_theme_names">
-        <item>Tmavý</item>
-        <item>Světlý</item>
-        <item>Černý</item>
-        <item>Automatický při západu slunce</item>
-        <item>Použít systémový design</item>
-    </string-array>
+    <string name="app_them_dark">Tmavý</string>
+    <string name="app_theme_light">Světlý</string>
+    <string name="app_theme_black">Černý</string>
+    <string name="app_theme_auto">Automatický při západu slunce</string>
+    <string name="app_theme_system">Použít systémový design</string>
     <string name="pref_title_browser_settings">Prohlížeč</string>
     <string name="pref_title_custom_tabs">Používat Vlastní karty Chrome</string>
     <string name="pref_title_hide_follow_button">Skrýt tlačítko pro psaní při rolování</string>
@@ -208,25 +205,19 @@
     <string name="pref_default_media_sensitivity">Vždy označovat média jako citlivá</string>
     <string name="pref_publishing">Publikování (synchronizováno se serverem)</string>
     <string name="pref_failed_to_sync">Nepodařilo se synchronizovsat nastavení</string>
-    <string-array name="post_privacy_names">
-        <item>Veřejné</item>
-        <item>Neuvedené</item>
-        <item>Pouze pro sledující</item>
-    </string-array>
+    <string name="post_privacy_public">Veřejné</string>
+    <string name="post_privacy_unlisted">Neuvedené</string>
+    <string name="post_privacy_followers_only">Pouze pro sledující</string>
     <string name="pref_status_text_size">Velikost textu příspěvků</string>
-    <string-array name="status_text_size_names">
-        <item>Nejmenší</item>
-        <item>Malý</item>
-        <item>Střední</item>
-        <item>Velký</item>
-        <item>Největší</item>
-    </string-array>
+    <string name="status_text_size_smallest">Nejmenší</string>
+    <string name="status_text_size_small">Malý</string>
+    <string name="status_text_size_medium">Střední</string>
+    <string name="status_text_size_large">Velký</string>
+    <string name="status_text_size_largest">Největší</string>
     <string name="pref_media_display">Zobrazení médií</string>
-    <string-array name="media_display_names">
-        <item>Skrýt média označená jako citlivá</item>
-        <item>Vždy zobrazovat média označená jako citlivá</item>
-        <item>Vždy skrývat všechna média</item>
-    </string-array>
+    <string name="media_hide_sensitive">Skrýt média označená jako citlivá</string>
+    <string name="media_hide_none">Vždy zobrazovat média označená jako citlivá</string>
+    <string name="media_hide_all">Vždy skrývat všechna média</string>
     <string name="notification_channel_mention_name">Nové zmínky</string>
     <string name="notification_channel_mention_descriptions">Oznámení o nových zmínkách</string>
     <string name="notification_channel_follow_name">Noví sledující</string>
@@ -352,8 +343,6 @@
     <plurals name="favs">
         <item quantity="one">&lt;b&gt;%1$s&lt;/b&gt; oblíbení</item>
         <item quantity="few">&lt;b&gt;%1$s&lt;/b&gt; oblíbení</item>
-        <item quantity="many">&lt;b&gt;%1$s&lt;/b&gt; oblíbení</item>
-        <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; oblíbení</item>
     </plurals>
     <plurals name="reblogs">
 	<item quantity="one"><b>%s</b> boost</item>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index e244e415d..ed1e2539a 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Roedd gwall.</string>
     <string name="error_empty">Ni all hwn fod yn wag.</string>
@@ -156,13 +155,10 @@
     <string name="pref_title_notification_filter_favourites">fy mhyst sy\'n ffefrynnau</string>
     <string name="pref_title_appearance_settings">Gwedd</string>
     <string name="pref_title_app_theme">Thema\'r App</string>
-    <string-array name="app_theme_names">
-        <item>Tywyll</item>
-        <item>Golau</item>
-        <item>Du</item>
-        <item>Awtomatig wrth iddi nosi</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Tywyll</string>
+    <string name="app_theme_light">Golau</string>
+    <string name="app_theme_black">Du</string>
+    <string name="app_theme_auto">Awtomatig wrth iddi nosi</string>
     <string name="pref_title_browser_settings">Porwr</string>
     <string name="pref_title_custom_tabs">Defnyddio Tabiau Personol Chrome </string>
     <string name="pref_title_hide_follow_button">Cuddio\'r botwm creu wrth sgrolio </string>
@@ -178,19 +174,15 @@
     <string name="pref_title_http_proxy_port">Porthol procsiHTTP </string>
     <string name="pref_default_post_privacy">Preifatrwydd postiadau rhagosodedig</string>
     <string name="pref_publishing">Cyhoeddi </string>
-    <string-array name="post_privacy_names">
-        <item>Cyhoeddus</item>
-        <item>Heb ei restru</item>
-        <item>Dilynwyr yn unig</item>
-    </string-array>
+    <string name="post_privacy_public">Cyhoeddus</string>
+    <string name="post_privacy_unlisted">Heb ei restru</string>
+    <string name="post_privacy_followers_only">Dilynwyr yn unig</string>
     <string name="pref_status_text_size">Maint testun statws</string>
-    <string-array name="status_text_size_names">
-        <item>Lleiaf</item>
-        <item>Bach </item>
-        <item>Canolig </item>
-        <item>Mawr </item>
-        <item>Mwyaf </item>
-    </string-array>
+    <string name="status_text_size_smallest">Lleiaf</string>
+    <string name="status_text_size_small">Bach </string>
+    <string name="status_text_size_medium">Canolig </string>
+    <string name="status_text_size_large">Mawr </string>
+    <string name="status_text_size_largest">Mwyaf </string>
     <string name="notification_channel_mention_name">Yn sôn amdanoch o\'r newydd </string>
     <string name="notification_channel_mention_descriptions">Hysbysiadau sôn amdanoch o\'r newydd</string>
     <string name="notification_channel_follow_name">Dilynwyr Newydd</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4d8608e09..be5bdffdd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Ein Fehler ist aufgetreten.</string>
     <string name="error_network">Ein Netzwerkfehler ist aufgetreten! Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut!</string>
@@ -180,13 +179,11 @@
     <string name="pref_title_app_theme">App-Thema</string>
     <string name="pref_title_timelines">Zeitleisten</string>
     <string name="pref_title_timeline_filters">Filter</string>
-    <string-array name="app_theme_names">
-        <item>Dunkel</item>
-        <item>Hell</item>
-        <item>Schwarz</item>
-        <item>Automatisch bei Sonnenuntergang</item>
-        <item>Systemthema verwenden</item>
-    </string-array>
+    <string name="app_them_dark">Dunkel</string>
+    <string name="app_theme_light">Hell</string>
+    <string name="app_theme_black">Schwarz</string>
+    <string name="app_theme_auto">Automatisch bei Sonnenuntergang</string>
+    <string name="app_theme_system">Systemthema verwenden</string>
     <string name="pref_title_browser_settings">Browser</string>
     <string name="pref_title_custom_tabs">Öffne Links in der App</string>
     <string name="pref_title_hide_follow_button">Verstecke Button bei Bildlauf </string>
@@ -205,25 +202,19 @@
     <string name="pref_default_media_sensitivity">Medien immer als heikel markieren</string>
     <string name="pref_publishing">Beiträge</string>
     <string name="pref_failed_to_sync">Fehler beim Synchronisieren</string>
-    <string-array name="post_privacy_names">
-        <item>Öffentlich</item>
-        <item>Nicht gelistet</item>
-        <item>Nur Folgende</item>
-    </string-array>
+    <string name="post_privacy_public">Öffentlich</string>
+    <string name="post_privacy_unlisted">Nicht gelistet</string>
+    <string name="post_privacy_followers_only">Nur Folgende</string>
     <string name="pref_status_text_size">Schriftgröße</string>
-    <string-array name="status_text_size_names">
-        <item>Kleiner</item>
-        <item>Klein</item>
-        <item>Normal</item>
-        <item>Groß</item>
-        <item>Größer</item>
-    </string-array>
+    <string name="status_text_size_smallest">Kleiner</string>
+    <string name="status_text_size_small">Klein</string>
+    <string name="status_text_size_medium">Normal</string>
+    <string name="status_text_size_large">Groß</string>
+    <string name="status_text_size_largest">Größer</string>
     <string name="pref_media_display">Medienanzeige</string>
-    <string-array name="media_display_names">
-        <item>Verberge Medien welche als heikel makiert sind</item>
-        <item>Medien, die als sensibel markiert sind, immer anzeigen</item>
-        <item>Medien immer verstecken</item>
-    </string-array>
+    <string name="media_hide_sensitive">Verberge Medien welche als heikel makiert sind</string>
+    <string name="media_hide_none">Medien, die als sensibel markiert sind, immer anzeigen</string>
+    <string name="media_hide_all">Medien immer verstecken</string>
     <string name="notification_channel_mention_name">Neue Erwähnungen</string>
     <string name="notification_channel_mention_descriptions">Benachrichtigungen über neue Erwähnungen</string>
     <string name="notification_channel_follow_name">Neue Folgende</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index dfae131c5..a30f2da94 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Eraro okazis.</string>
     <string name="error_network">Reta eraro okazis! Bonvolu kontroli vian konekton kaj klopodi denove!</string>
@@ -179,13 +178,11 @@
     <string name="pref_title_app_theme">Temo de la apo</string>
     <string name="pref_title_timelines">Tempolinioj</string>
     <string name="pref_title_timeline_filters">Filtriloj</string>
-    <string-array name="app_theme_names">
-        <item>Malhela</item>
-        <item>Hela</item>
-        <item>Nigra</item>
-        <item>Aŭtomata laŭ la horo</item>
-        <item>Uzi sisteman temon</item>
-    </string-array>
+    <string name="app_them_dark">Malhela</string>
+    <string name="app_theme_light">Hela</string>
+    <string name="app_theme_black">Nigra</string>
+    <string name="app_theme_auto">Aŭtomata laŭ la horo</string>
+    <string name="app_theme_system">Uzi sisteman temon</string>
     <string name="pref_title_browser_settings">Retumilo</string>
     <string name="pref_title_custom_tabs">Uzi la integritan retumilon</string>
     <string name="pref_title_hide_follow_button">Kâsi butonon de verko dum rulumado</string>
@@ -204,25 +201,19 @@
     <string name="pref_default_media_sensitivity">Ĉiam marki aŭdovidaĵojn kiel tiklaj</string>
     <string name="pref_publishing">Publikigante (sinkronigita kun la servilo)</string>
     <string name="pref_failed_to_sync">Sinkronigo de la preferoj malsukcesis</string>
-    <string-array name="post_privacy_names">
-        <item>Publika</item>
-        <item>Nelistigita</item>
-        <item>Nur por sekvantoj</item>
-    </string-array>
+    <string name="post_privacy_public">Publika</string>
+    <string name="post_privacy_unlisted">Nelistigita</string>
+    <string name="post_privacy_followers_only">Nur por sekvantoj</string>
     <string name="pref_status_text_size">Grando de teksto de mesaĝoj</string>
-    <string-array name="status_text_size_names">
-        <item>La plej malgranda</item>
-        <item>Malgranda</item>
-        <item>Meza</item>
-        <item>Granda</item>
-        <item>La plej granda</item>
-    </string-array>
+    <string name="status_text_size_smallest">La plej malgranda</string>
+    <string name="status_text_size_small">Malgranda</string>
+    <string name="status_text_size_medium">Meza</string>
+    <string name="status_text_size_large">Granda</string>
+    <string name="status_text_size_largest">La plej granda</string>
     <string name="pref_media_display">Apero de aŭdovidaĵoj</string>
-    <string-array name="media_display_names">
-        <item>Kaŝi aŭdovidaĵojn markitajn kiel tiklaj</item>
-        <item>Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj</item>
-        <item>Ĉiam kaŝi ĉiujn aŭdovidaĵojn</item>
-    </string-array>
+    <string name="media_hide_sensitive">Kaŝi aŭdovidaĵojn markitajn kiel tiklaj</string>
+    <string name="media_hide_none">Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj</string>
+    <string name="media_hide_all">Ĉiam kaŝi ĉiujn aŭdovidaĵojn</string>
     <string name="notification_channel_mention_name">Novaj mencioj</string>
     <string name="notification_channel_mention_descriptions">Sciigoj pri novajn menciojn</string>
     <string name="notification_channel_follow_name">Novaj sekvantoj</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4a5277267..3f85b38bd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Ha ocurrido un error.</string>
     <string name="error_network">¡Se ha producido un error de red! ¡Por favor, comprueba tu conexión e inténtalo de nuevo!</string>
@@ -168,13 +167,10 @@
     <string name="pref_title_appearance_settings">Interfaz</string>
     <string name="pref_title_app_theme">Tema</string>
     <string name="pref_title_timelines">Cronologia</string>
-    <string-array name="app_theme_names">
-        <item>Oscuro</item>
-        <item>Claro</item>
-        <item>Negro</item>
-        <item>Automático</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Oscuro</string>
+    <string name="app_theme_light">Claro</string>
+    <string name="app_theme_black">Negro</string>
+    <string name="app_theme_auto">Automático</string>
     <string name="pref_title_browser_settings">Navegador</string>
     <string name="pref_title_custom_tabs">Usar pestañas de Chrome</string>
     <string name="pref_title_hide_follow_button">Ocultar botón de redacción al bajar</string>
@@ -192,25 +188,19 @@
     <string name="pref_default_media_sensitivity">Marcar siempre medios como sensibles</string>
     <string name="pref_publishing">Publicaciones</string>
     <string name="pref_failed_to_sync">Error al sincronizar los ajustes</string>
-    <string-array name="post_privacy_names">
-        <item>Público</item>
-        <item>Oculto</item>
-        <item>Privado</item>
-    </string-array>
+    <string name="post_privacy_public">Público</string>
+    <string name="post_privacy_unlisted">Oculto</string>
+    <string name="post_privacy_followers_only">Privado</string>
     <string name="pref_status_text_size">Tamaño del texto</string>
-    <string-array name="status_text_size_names">
-        <item>Diminuto</item>
-        <item>Pequeño</item>
-        <item>Medio</item>
-        <item>Grande</item>
-        <item>Enorme</item>
-    </string-array>
+    <string name="status_text_size_smallest">Diminuto</string>
+    <string name="status_text_size_small">Pequeño</string>
+    <string name="status_text_size_medium">Medio</string>
+    <string name="status_text_size_large">Grande</string>
+    <string name="status_text_size_largest">Enorme</string>
     <string name="pref_media_display">Pantalla multimedia</string>
-    <string-array name="media_display_names">
-        <item>Ocultar medios marcados como sensibles</item>
-        <item>Mostrar siempre los medios marcados como sensibles</item>
-        <item>Ocultar siempre todos los medios</item>
-    </string-array>
+    <string name="media_hide_sensitive">Ocultar medios marcados como sensibles</string>
+    <string name="media_hide_none">Mostrar siempre los medios marcados como sensibles</string>
+    <string name="media_hide_all">Ocultar siempre todos los medios</string>
     <string name="notification_channel_mention_name">Nuevas menciones</string>
     <string name="notification_channel_mention_descriptions">Notificaciones de nuevas menciones</string>
     <string name="notification_channel_follow_name">Nuevos seguidores</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0a2387024..5d1b6d878 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Errorea gertatu da.</string>
     <string name="error_empty">Eremu hau ezin da hutsik egon.</string>
@@ -154,13 +153,10 @@
     <string name="pref_title_appearance_settings">Interfazea</string>
     <string name="pref_title_app_theme">Gaia</string>
     <string name="pref_title_timelines">Denbora lerroak</string>
-    <string-array name="app_theme_names">
-        <item>Iluna</item>
-        <item>Argia</item>
-        <item>Beltza</item>
-        <item>Automatikoa</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Iluna</string>
+    <string name="app_theme_light">Argia</string>
+    <string name="app_theme_black">Beltza</string>
+    <string name="app_theme_auto">Automatikoa</string>
     <string name="pref_title_browser_settings">Nabigatzailea</string>
     <string name="pref_title_custom_tabs">Chromeko fitxak erabili</string>
     <string name="pref_title_hide_follow_button">Tut egiteko botoia ezkutatu jaisterakoan.</string>
@@ -178,25 +174,19 @@
     <string name="pref_default_media_sensitivity">Beti markatu multimedia eduki mingarri gisa</string>
     <string name="pref_publishing">Bidalketak</string>
     <string name="pref_failed_to_sync">Aukerak sinkronizatzean akatsa</string>
-    <string-array name="post_privacy_names">
-        <item>Publikoa</item>
-        <item>Ezkutukoa</item>
-        <item>Pribatua</item>
-    </string-array>
+    <string name="post_privacy_public">Publikoa</string>
+    <string name="post_privacy_unlisted">Ezkutukoa</string>
+    <string name="post_privacy_followers_only">Pribatua</string>
     <string name="pref_status_text_size">Testuaren tamaina</string>
-    <string-array name="status_text_size_names">
-        <item>Oso txikia</item>
-        <item>Txikia</item>
-        <item>Erdikoa</item>
-        <item>Handia</item>
-        <item>Oso handia</item>
-    </string-array>
+    <string name="status_text_size_smallest">Oso txikia</string>
+    <string name="status_text_size_small">Txikia</string>
+    <string name="status_text_size_medium">Erdikoa</string>
+    <string name="status_text_size_large">Handia</string>
+    <string name="status_text_size_largest">Oso handia</string>
     <string name="pref_media_display">Erakutsi media</string>
-    <string-array name="media_display_names">
-        <item>Ezkutatu eduki mingarri gisa markatutako multimedia</item>
-        <item>Beti erakutsi eduki mingarri gisa markatutako multimedia</item>
-        <item>Beti ezkutatu multimedia guztiak</item>
-    </string-array>
+    <string name="media_hide_sensitive">Ezkutatu eduki mingarri gisa markatutako multimedia</string>
+    <string name="media_hide_none">Beti erakutsi eduki mingarri gisa markatutako multimedia</string>
+    <string name="media_hide_all">Beti ezkutatu multimedia guztiak</string>
     <string name="notification_channel_mention_name">Aipamen berriak</string>
     <string name="notification_channel_mention_descriptions">Aipamen berrien jakinarazpenak</string>
     <string name="notification_channel_follow_name">Jarritzaile berriak</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 773be8541..0307df0f0 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">خطایی رخ داد</string>
     <string name="error_empty">این نمی‌تواند خالی باشد.</string>
@@ -150,13 +149,10 @@
     <string name="pref_title_appearance_settings">ظاهر</string>
     <string name="pref_title_app_theme">تم برنامه</string>
     <string name="pref_title_timelines">خط‌های زمانی</string>
-    <string-array name="app_theme_names">
-        <item>روشن</item>
-        <item>سیاه</item>
-        <item>تیره</item>
-        <item>خودکار برحسب غروب خورشید</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">روشن</string>
+    <string name="app_theme_light">سیاه</string>
+    <string name="app_theme_black">تیره</string>
+    <string name="app_theme_auto">خودکار برحسب غروب خورشید</string>
     <string name="pref_title_browser_settings">مرورگر</string>
     <string name="pref_title_custom_tabs">استفاده از زبانه‌های سفارشی کروم</string>
     <string name="pref_title_hide_follow_button">پنهان کردن دکمه ایجاد هنگام پیمایش</string>
@@ -174,25 +170,19 @@
     <string name="pref_default_media_sensitivity">همواره رسانه را به عنوان حساس نشانه‌گذاری کن</string>
     <string name="pref_publishing">انتشار</string>
     <string name="pref_failed_to_sync">ناتوانی در هم‌گام‌سازی تنظیمات</string>
-    <string-array name="post_privacy_names">
-        <item>عمومی</item>
-        <item>لیست‌نشده</item>
-        <item>فقط دنبال‌کنندگان</item>
-    </string-array>
+    <string name="post_privacy_public">عمومی</string>
+    <string name="post_privacy_unlisted">لیست‌نشده</string>
+    <string name="post_privacy_followers_only">فقط دنبال‌کنندگان</string>
     <string name="pref_status_text_size">اندازه متن وضعیت</string>
-    <string-array name="status_text_size_names">
-        <item>کوچک‌ترین</item>
-        <item>کوچک</item>
-        <item>متوسط</item>
-        <item>بزرگ</item>
-        <item>بزرگ‌ترین</item>
-    </string-array>
+    <string name="status_text_size_smallest">کوچک‌ترین</string>
+    <string name="status_text_size_small">کوچک</string>
+    <string name="status_text_size_medium">متوسط</string>
+    <string name="status_text_size_large">بزرگ</string>
+    <string name="status_text_size_largest">بزرگ‌ترین</string>
     <string name="pref_media_display">نمایش رسانه</string>
-    <string-array name="media_display_names">
-        <item>رسانه‌های نشان‌گذاری شده به عنوان حساس را پنهان کن</item>
-        <item>رسانه‌های نشانه‌گذاری شده به عنوان حساس را همواره نشان بده</item>
-        <item>همه رسانه‌ها را همواره پنهان کن</item>
-    </string-array>
+    <string name="media_hide_sensitive">رسانه‌های نشان‌گذاری شده به عنوان حساس را پنهان کن</string>
+    <string name="media_hide_none">رسانه‌های نشانه‌گذاری شده به عنوان حساس را همواره نشان بده</string>
+    <string name="media_hide_all">همه رسانه‌ها را همواره پنهان کن</string>
     <string name="notification_channel_mention_name">صدا زدن جدید</string>
     <string name="notification_channel_mention_descriptions">هشدار در مورد صدازدن جدید</string>
     <string name="notification_channel_follow_name">دنبال‌کننده‌های جدید</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 29efb0111..0d2a5e573 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Une erreur s’est produite.</string>
     <string name="error_network">Une erreur réseau s’est produite ! Veuillez vérifier votre connexion puis réessayez !</string>
@@ -183,13 +182,11 @@
     <string name="pref_title_app_theme">Thème de l’application</string>
     <string name="pref_title_timelines">Fils chronologiques</string>
     <string name="pref_title_timeline_filters">Filtres</string>
-    <string-array name="app_theme_names">
-        <item>Sombre</item>
-        <item>Clair</item>
-        <item>Noir</item>
-        <item>Basé sur le coucher du soleil</item>
-        <item>Utiliser le thème système</item>
-    </string-array>
+    <string name="app_them_dark">Sombre</string>
+    <string name="app_theme_light">Clair</string>
+    <string name="app_theme_black">Noir</string>
+    <string name="app_theme_auto">Basé sur le coucher du soleil</string>
+    <string name="app_theme_system">Utiliser le thème système</string>
     <string name="pref_title_browser_settings">Navigateur</string>
     <string name="pref_title_custom_tabs">Utiliser le navigateur intégré</string>
     <string name="pref_title_hide_follow_button">Masquer le bouton de composition lors du défilement</string>
@@ -208,25 +205,19 @@
     <string name="pref_default_media_sensitivity">Toujours marquer les médias comme sensibles</string>
     <string name="pref_publishing">Publication</string>
     <string name="pref_failed_to_sync">Échec de synchronisation des paramètres</string>
-    <string-array name="post_privacy_names">
-        <item>Public</item>
-        <item>Non listé</item>
-        <item>Abonné·e·s uniquement</item>
-    </string-array>
+    <string name="post_privacy_public">Public</string>
+    <string name="post_privacy_unlisted">Non listé</string>
+    <string name="post_privacy_followers_only">Abonné·e·s uniquement</string>
     <string name="pref_status_text_size">Taille du texte pour les statuts</string>
-    <string-array name="status_text_size_names">
-        <item>Plus petit</item>
-        <item>Petit</item>
-        <item>Moyen</item>
-        <item>Grand</item>
-        <item>Plus grand</item>
-    </string-array>
+    <string name="status_text_size_smallest">Plus petit</string>
+    <string name="status_text_size_small">Petit</string>
+    <string name="status_text_size_medium">Moyen</string>
+    <string name="status_text_size_large">Grand</string>
+    <string name="status_text_size_largest">Plus grand</string>
     <string name="pref_media_display">Affichage des médias</string>
-    <string-array name="media_display_names">
-        <item>Masquer les médias marqués comme sensibles</item>
-        <item>Toujours afficher les médias marqués comme sensibles</item>
-        <item>Toujours masquer tous les médias</item>
-    </string-array>
+    <string name="media_hide_sensitive">Masquer les médias marqués comme sensibles</string>
+    <string name="media_hide_none">Toujours afficher les médias marqués comme sensibles</string>
+    <string name="media_hide_all">Toujours masquer tous les médias</string>
     <string name="notification_channel_mention_name">Nouvelles mentions</string>
     <string name="notification_channel_mention_descriptions">Notifications pour les nouvelles mentions</string>
     <string name="notification_channel_follow_name">Nouveaux abonnés</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 568435ea1..3cc8b1f7b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Hiba történt.</string>
     <string name="error_network">Hálózati hiba történt! Kérjük, ellenőrizze a kapcsolatot, és próbálja meg újra!</string>
@@ -172,13 +171,10 @@
     <string name="pref_title_notification_filter_favourites">posztjaimat kedvencé teszik</string>
     <string name="pref_title_appearance_settings">Kinézet</string>
     <string name="pref_title_timelines">Idővonalak</string>
-    <string-array name="app_theme_names">
-        <item>Sötét</item>
-        <item>Világos</item>
-        <item>Fekete</item>
-        <item>Automatikus naplementekor</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Sötét</string>
+    <string name="app_theme_light">Világos</string>
+    <string name="app_theme_black">Fekete</string>
+    <string name="app_theme_auto">Automatikus naplementekor</string>
     <string name="pref_title_browser_settings">Böngésző</string>
     <string name="pref_title_custom_tabs">Linkek megnyitása applikáción belül</string>
     <string name="pref_title_hide_follow_button">Szerkesztési gomb elérejtése görgetés közben</string>
@@ -195,24 +191,18 @@
     <string name="pref_default_post_privacy">Alapértelmezett poszt láthatóság</string>
     <string name="pref_default_media_sensitivity">Minden médiát jelölj meg érzékenynek</string>
     <string name="pref_failed_to_sync">A beállítások szinkronizálása nem sikerült</string>
-    <string-array name="post_privacy_names">
-        <item>Nyilvános</item>
-        <item>Unlisted</item>
-        <item>Csak követőknek</item>
-    </string-array>
+    <string name="post_privacy_public">Nyilvános</string>
+    <string name="post_privacy_unlisted">Unlisted</string>
+    <string name="post_privacy_followers_only">Csak követőknek</string>
     <string name="pref_status_text_size">Státusz szöveg mérete</string>
-    <string-array name="status_text_size_names">
-        <item>Legkisebb</item>
-        <item>Kicsi</item>
-        <item>Közepes</item>
-        <item>Nagy</item>
-        <item>Legnagyobb</item>
-    </string-array>
-    <string-array name="media_display_names">
-        <item>Rejtsd el az érzékenynek jelölt médiát</item>
-        <item>Mindig mutasd az érzékenynek jelölt médiát</item>
-        <item>Mindig rejtsd el a média tartalmakat</item>
-    </string-array>
+    <string name="status_text_size_smallest">Legkisebb</string>
+    <string name="status_text_size_small">Kicsi</string>
+    <string name="status_text_size_medium">Közepes</string>
+    <string name="status_text_size_large">Nagy</string>
+    <string name="status_text_size_largest">Legnagyobb</string>
+    <string name="media_hide_sensitive">Rejtsd el az érzékenynek jelölt médiát</string>
+    <string name="media_hide_none">Mindig mutasd az érzékenynek jelölt médiát</string>
+    <string name="media_hide_all">Mindig rejtsd el a média tartalmakat</string>
     <string name="notification_channel_mention_name">Új említések</string>
     <string name="notification_channel_mention_descriptions">Értesítések új említések esetén</string>
     <string name="notification_channel_follow_name">Új követők</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 77ad42ad2..6113b1513 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Si è verificato un errore.</string>
     <string name="error_network">Si è verificato un errore di rete! Per favore controlla la tua connessione e riprova!</string>
@@ -179,13 +178,11 @@
     <string name="pref_title_app_theme">Tema dell\'app</string>
     <string name="pref_title_timelines">Timeline</string>
     <string name="pref_title_timeline_filters">Filtri</string>
-    <string-array name="app_theme_names">
-        <item>Scuro</item>
-        <item>Chiaro</item>
-        <item>Nero</item>
-        <item>Automatico al tramonto</item>
-        <item>Usa Tema di Sistema</item>
-    </string-array>
+    <string name="app_them_dark">Scuro</string>
+    <string name="app_theme_light">Chiaro</string>
+    <string name="app_theme_black">Nero</string>
+    <string name="app_theme_auto">Automatico al tramonto</string>
+    <string name="app_theme_system">Usa Tema di Sistema</string>
     <string name="pref_title_browser_settings">Browser</string>
     <string name="pref_title_custom_tabs">Usa Tab Personalizzate di Chrome</string>
     <string name="pref_title_hide_follow_button">Nascondi il pulsante componi mentre scorri</string>
@@ -204,25 +201,19 @@
     <string name="pref_default_media_sensitivity">Segna sempre media come contenuto sensibile</string>
     <string name="pref_publishing">Pubblicando (sincronizzato con il server)</string>
     <string name="pref_failed_to_sync">Sincronizzazione delle impostazioni fallita</string>
-    <string-array name="post_privacy_names">
-        <item>Pubblico</item>
-        <item>Non elencato</item>
-        <item>Solo per chi ti segue</item>
-    </string-array>
+    <string name="post_privacy_public">Pubblico</string>
+    <string name="post_privacy_unlisted">Non elencato</string>
+    <string name="post_privacy_followers_only">Solo per chi ti segue</string>
     <string name="pref_status_text_size">Dimensione del testo degli stati</string>
-    <string-array name="status_text_size_names">
-        <item>Piccolissimo</item>
-        <item>Piccolo</item>
-        <item>Normale</item>
-        <item>Grande</item>
-        <item>Grandissimo</item>
-    </string-array>
+    <string name="status_text_size_smallest">Piccolissimo</string>
+    <string name="status_text_size_small">Piccolo</string>
+    <string name="status_text_size_medium">Normale</string>
+    <string name="status_text_size_large">Grande</string>
+    <string name="status_text_size_largest">Grandissimo</string>
     <string name="pref_media_display">Media mostrati</string>
-    <string-array name="media_display_names">
-        <item>Nascondi media segnati come sensibili</item>
-        <item>Mostra sempre media segnati come sensibili</item>
-        <item>Nascondi sempre tutti i media</item>
-    </string-array>
+    <string name="media_hide_sensitive">Nascondi media segnati come sensibili</string>
+    <string name="media_hide_none">Mostra sempre media segnati come sensibili</string>
+    <string name="media_hide_all">Nascondi sempre tutti i media</string>
     <string name="notification_channel_mention_name">Nuove Menzioni</string>
     <string name="notification_channel_mention_descriptions">Notifiche quando qualcuno ti menziona</string>
     <string name="notification_channel_follow_name">Nuove persone che ti seguono</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c81443432..dd84b5284 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">エラーが発生しました。</string>
     <string name="error_empty">本文なしでは投稿できません。</string>
@@ -172,13 +171,10 @@
     <string name="pref_title_app_theme">アプリテーマ</string>
     <string name="pref_title_timelines">タイムライン</string>
     <string name="pref_title_timeline_filters">フィルター</string>
-    <string-array name="app_theme_names">
-        <item>ダーク</item>
-        <item>ライト</item>
-        <item>ブラック</item>
-        <item>日没による自動設定</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">ダーク</string>
+    <string name="app_theme_light">ライト</string>
+    <string name="app_theme_black">ブラック</string>
+    <string name="app_theme_auto">日没による自動設定</string>
     <string name="pref_title_browser_settings">ブラウザ</string>
     <string name="pref_title_custom_tabs">Chrome Custom Tabsを使用する</string>
     <string name="pref_title_hide_follow_button">スクロール中はフォローボタンを隠す</string>
@@ -197,25 +193,19 @@
     <string name="pref_default_media_sensitivity">メディアを常に閲覧注意としてマークする</string>
     <string name="pref_publishing">投稿</string>
     <string name="pref_failed_to_sync">設定の同期に失敗しました</string>
-    <string-array name="post_privacy_names">
-        <item>公開</item>
-        <item>未収載</item>
-        <item>フォロワーに限定</item>
-    </string-array>
+    <string name="post_privacy_public">公開</string>
+    <string name="post_privacy_unlisted">未収載</string>
+    <string name="post_privacy_followers_only">フォロワーに限定</string>
     <string name="pref_status_text_size">トゥートのテキストサイズ</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>中</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">中</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">メディアの表示</string>
-    <string-array name="media_display_names">
-        <item>閲覧注意としてマークされたメディアは隠す</item>
-        <item>閲覧注意としてマークされたメディアも常に表示する</item>
-        <item>全てのメディアを常に隠す</item>
-    </string-array>
+    <string name="media_hide_sensitive">閲覧注意としてマークされたメディアは隠す</string>
+    <string name="media_hide_none">閲覧注意としてマークされたメディアも常に表示する</string>
+    <string name="media_hide_all">全てのメディアを常に隠す</string>
     <string name="notification_channel_mention_name">新しい返信</string>
     <string name="notification_channel_mention_descriptions">新しい返信の通知</string>
     <string name="notification_channel_follow_name">新しいフォロワー</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
deleted file mode 100644
index 1cbc9f6db..000000000
--- a/app/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<resources>
-    <!-- note to translators:
-         * you should think of “free” as in “free speech,” not as in “free beer”.
-           We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
-           to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
-         * the url can be changed to link to the localized version of the license.
-    -->
-    <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1809beedb..9bc0dece9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Er deed zich een fout voor.</string>
     <string name="error_network">Er deed zich een netwerkfout voor! Controleer je verbinding en probeer opnieuw!</string>
@@ -178,13 +177,11 @@
     <string name="pref_title_appearance_settings">Uiterlijk</string>
     <string name="pref_title_app_theme">Thema</string>
     <string name="pref_title_timelines">Tijdlijnen</string>
-    <string-array name="app_theme_names">
-        <item>Donker</item>
-        <item>Licht</item>
-        <item>Zwart</item>
-        <item>Automatisch tijdens zonsondergang</item>
-        <item>Systeemthema gebruiken</item>
-    </string-array>
+    <string name="app_them_dark">Donker</string>
+    <string name="app_theme_light">Licht</string>
+    <string name="app_theme_black">Zwart</string>
+    <string name="app_theme_auto">Automatisch tijdens zonsondergang</string>
+    <string name="app_theme_system">Systeemthema gebruiken</string>
     <string name="pref_title_browser_settings">Webbrowser</string>
     <string name="pref_title_custom_tabs">Aangepaste tabbladen gebruiken</string>
     <string name="pref_title_hide_follow_button">Verberg zwevende tootknop tijdens scrollen</string>
@@ -203,25 +200,19 @@
     <string name="pref_default_media_sensitivity">Media altijd als gevoelig markeren</string>
     <string name="pref_publishing">Publiceren</string>
     <string name="pref_failed_to_sync">Synchroniseren</string>
-    <string-array name="post_privacy_names">
-        <item>Openbaar</item>
-        <item>Minder openbaar</item>
-        <item>Alleen volgers</item>
-    </string-array>
+    <string name="post_privacy_public">Openbaar</string>
+    <string name="post_privacy_unlisted">Minder openbaar</string>
+    <string name="post_privacy_followers_only">Alleen volgers</string>
     <string name="pref_status_text_size">Tekstgrootte van toots</string>
-    <string-array name="status_text_size_names">
-        <item>Kleinst</item>
-        <item>Klein</item>
-        <item>Standaard</item>
-        <item>Groot</item>
-        <item>Grootst</item>
-    </string-array>
+    <string name="status_text_size_smallest">Kleinst</string>
+    <string name="status_text_size_small">Klein</string>
+    <string name="status_text_size_medium">Standaard</string>
+    <string name="status_text_size_large">Groot</string>
+    <string name="status_text_size_largest">Grootst</string>
     <string name="pref_media_display">Mediaweergave</string>
-    <string-array name="media_display_names">
-        <item>Als gevoelig gemarkeerde media verbergen</item>
-        <item>Als gevoelig gemarkeerde media altijd verbergen</item>
-        <item>Media altijd verbergen</item>
-    </string-array>
+    <string name="media_hide_sensitive">Als gevoelig gemarkeerde media verbergen</string>
+    <string name="media_hide_none">Als gevoelig gemarkeerde media altijd verbergen</string>
+    <string name="media_hide_all">Media altijd verbergen</string>
     <string name="notification_channel_mention_name">Nieuwe vermeldingen</string>
     <string name="notification_channel_mention_descriptions">Meldingen over nieuwe vermeldingen</string>
     <string name="notification_channel_follow_name">Nieuwe volgers</string>
diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml
index 881145435..1fddfa408 100644
--- a/app/src/main/res/values-no-rNB/strings.xml
+++ b/app/src/main/res/values-no-rNB/strings.xml
@@ -202,13 +202,6 @@
     <string name="pref_title_timelines">Tidslinjer</string>
     <string name="pref_title_timeline_filters">Filtre</string>
 
-    <string-array name="app_theme_names">
-        <item>Dark</item>
-        <item>Light</item>
-        <item>Black</item>
-        <item>Automatic at sunset</item>
-        <item>Use System Design</item>
-    </string-array>
 
     <string name="pref_title_browser_settings">Nettleser</string>
     <string name="pref_title_custom_tabs">Bruke Chrome tilpassede faner</string>
@@ -225,18 +218,6 @@
     <string name="pref_title_http_proxy_server">Serveradresse</string>
     <string name="pref_title_http_proxy_port">Serverport</string>
 
-    <string-array name="post_privacy_names">
-        <item>Public</item>
-        <item>Unlisted</item>
-        <item>Followers-only</item>
-    </string-array>
-
-    <string-array name="media_display_names">
-        <item>Hide media marked as sensitive</item>
-        <item>Always show media marked as sensitive</item>
-        <item>Always hide all media</item>
-    </string-array>
-
 
     <string name="description_status"> <!-- Display name, cw\?, content\?, relative date, reposted by\?, reposted\?, favorited\?, username, media\?; visibility, fav number\?, reblog number\?--> %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s </string>
 
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 7ba106f84..8955e0118 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">S\'es produch una error.</string>
     <string name="error_empty">Aquò pot pas èsser void.</string>
@@ -152,13 +151,10 @@
     <string name="pref_title_notification_filter_favourites">òm me met mos tuts en favorit</string>
     <string name="pref_title_appearance_settings">Aparença</string>
     <string name="pref_title_app_theme">Tèma de l’app</string>
-    <string-array name="app_theme_names">
-        <item>Escur</item>
-        <item>Luminós</item>
-        <item>Negre</item>
-        <item>Alba automatica</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Escur</string>
+    <string name="app_theme_light">Luminós</string>
+    <string name="app_theme_black">Negre</string>
+    <string name="app_theme_auto">Alba automatica</string>
     <string name="pref_title_browser_settings">Navegador</string>
     <string name="pref_title_custom_tabs">Onglets personalizats de Chrome</string>
     <string name="pref_title_hide_follow_button">Amagar lo boton de redaccion en desplaçament</string>
@@ -173,19 +169,15 @@
     <string name="pref_title_http_proxy_port">Pòrt del servidor proxy HTTP</string>
     <string name="pref_default_post_privacy">Privacitat predeterminada dels tuts</string>
     <string name="pref_publishing">Publicacion</string>
-    <string-array name="post_privacy_names">
-        <item>Publica</item>
-        <item>Pas listada</item>
-        <item>Seguidors solament</item>
-    </string-array>
+    <string name="post_privacy_public">Publica</string>
+    <string name="post_privacy_unlisted">Pas listada</string>
+    <string name="post_privacy_followers_only">Seguidors solament</string>
     <string name="pref_status_text_size">Talha de text de l\'estatut</string>
-    <string-array name="status_text_size_names">
-        <item>Mendre</item>
-        <item>Pichona</item>
-        <item>Mejana</item>
-        <item>Granda</item>
-        <item>Grandassa</item>
-    </string-array>
+    <string name="status_text_size_smallest">Mendre</string>
+    <string name="status_text_size_small">Pichona</string>
+    <string name="status_text_size_medium">Mejana</string>
+    <string name="status_text_size_large">Granda</string>
+    <string name="status_text_size_largest">Grandassa</string>
     <string name="notification_channel_mention_name">Mencions nòvas</string>
     <string name="notification_channel_mention_descriptions">Notificacions de mencions noves</string>
     <string name="notification_channel_follow_name">Seguidors nòus</string>
@@ -283,7 +275,7 @@
     <string name="label_remote_account">Las informacions çai-jos son pas lo rebat del perfil complèt de l’utilizaire. Tocatz per dobrir lo perfil complèt dins lo navigador.</string>
     <string name="unpin_action">Tirar del perfil</string>
     <string name="pin_action">Penjar</string>
-<string name="error_network">Una error ret se’s producha ! Mercés de verificar la connexion e tornar ensajar !</string>
+    <string name="error_network">Una error ret se’s producha ! Mercés de verificar la connexion e tornar ensajar !</string>
     <string name="title_public_local">Local</string>
     <string name="title_direct_messages">Messatges dirèctes</string>
     <string name="title_tab_preferences">Onglets</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b3bd829ef..d68d6ba67 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Wystąpił błąd.</string>
     <string name="error_empty">To nie może pozostać puste.</string>
@@ -151,13 +150,10 @@
     <string name="pref_title_notification_filter_favourites">moje posty zostaną dodane do ulubionych</string>
     <string name="pref_title_appearance_settings">Wygląd</string>
     <string name="pref_title_app_theme">Motyw</string>
-    <string-array name="app_theme_names">
-        <item>Ciemny</item>
-        <item>Jasny</item>
-        <item>Czarny</item>
-        <item>Zmieniaj automatycznie po zachodzie słońca</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Ciemny</string>
+    <string name="app_theme_light">Jasny</string>
+    <string name="app_theme_black">Czarny</string>
+    <string name="app_theme_auto">Zmieniaj automatycznie po zachodzie słońca</string>
     <string name="pref_title_browser_settings">Przeglądarka</string>
     <string name="pref_title_custom_tabs">Używaj niestandardowych kart Chrome</string>
     <string name="pref_title_hide_follow_button">Ukryj przycisk śledzenia podczas przewijania</string>
@@ -172,19 +168,15 @@
     <string name="pref_title_http_proxy_port">Port proxy HTTP</string>
     <string name="pref_default_post_privacy">Domyślne ustawienia prywatności wpisów</string>
     <string name="pref_publishing">Publikowanie</string>
-    <string-array name="post_privacy_names">
-        <item>Publiczne</item>
-        <item>Niewypisane</item>
-        <item>Tylko dla śledzonych</item>
-    </string-array>
+    <string name="post_privacy_public">Publiczne</string>
+    <string name="post_privacy_unlisted">Niewypisane</string>
+    <string name="post_privacy_followers_only">Tylko dla śledzonych</string>
     <string name="pref_status_text_size">Rozmiar tekstu wpisów</string>
-    <string-array name="status_text_size_names">
-        <item>Najmniejszy</item>
-        <item>Mały</item>
-        <item>Średni</item>
-        <item>Duży</item>
-        <item>Ogromny</item>
-    </string-array>
+    <string name="status_text_size_smallest">Najmniejszy</string>
+    <string name="status_text_size_small">Mały</string>
+    <string name="status_text_size_medium">Średni</string>
+    <string name="status_text_size_large">Duży</string>
+    <string name="status_text_size_largest">Ogromny</string>
     <string name="notification_channel_mention_name">Nowe wspomnienia</string>
     <string name="notification_channel_mention_descriptions">Powiadomienia o nowych wspomnieniach</string>
     <string name="notification_channel_follow_name">Nowi śledzący</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 36916ec93..8824c145e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Ocorreu um erro.</string>
     <string name="error_empty">Isso não pode ficar vazio.</string>
@@ -166,13 +165,11 @@
     <string name="pref_title_appearance_settings">Aparência</string>
     <string name="pref_title_app_theme">Temas do app</string>
     <string name="pref_title_timelines">Linhas do tempo</string>
-    <string-array name="app_theme_names">
-        <item>Noturno</item>
-        <item>Diurno</item>
-        <item>AMOLED</item>
-        <item>Automático</item>
-        <item>Usar o tema do sistema</item>
-    </string-array>
+    <string name="app_them_dark">Noturno</string>
+    <string name="app_theme_light">Diurno</string>
+    <string name="app_theme_black">AMOLED</string>
+    <string name="app_theme_auto">Automático</string>
+    <string name="app_theme_system">Usar o tema do sistema</string>
     <string name="pref_title_browser_settings">Navegador</string>
     <string name="pref_title_custom_tabs">Usar abas do Chrome</string>
     <string name="pref_title_hide_follow_button">Esconder botão de composição ao rolar página</string>
@@ -190,24 +187,16 @@
     <string name="pref_default_media_sensitivity">Sempre marcar mídia como sensível</string>
     <string name="pref_publishing">Publicação</string>
     <string name="pref_failed_to_sync">Falha ao sincronizar configurações</string>
-    <string-array name="post_privacy_names">
-        <item>Público</item>
-        <item>Não-listado</item>
-        <item>Privado</item>
-    </string-array>
+    <string name="post_privacy_public">Público</string>
+    <string name="post_privacy_unlisted">Não-listado</string>
     <string name="pref_status_text_size">Tamanho da fonte das postagens</string>
-    <string-array name="status_text_size_names">
-        <item>Menor</item>
-        <item>Pequeno</item>
-        <item>Médio</item>
-        <item>Grande</item>
-        <item>Maior</item>
-    </string-array>
-    <string-array name="media_display_names">
-        <item>Ocultar mídia marcada como sensível</item>
-        <item>Always show media marked as sensitive</item>
-        <item>Always hide all media</item>
-    </string-array>
+    <string name="status_text_size_smallest">Menor</string>
+    <string name="status_text_size_small">Pequeno</string>
+    <string name="status_text_size_medium">Médio</string>
+    <string name="status_text_size_large">Grande</string>
+    <string name="status_text_size_largest">Maior</string>
+    <string name="media_hide_sensitive">Ocultar mídia marcada como sensível</string>
+
     <string name="notification_channel_mention_name">Novas Menções</string>
     <string name="notification_channel_mention_descriptions">Notificações sobre novas menções</string>
     <string name="notification_channel_follow_name">Novos Seguidores</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d6fd17e5c..e69814ef6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -186,13 +186,11 @@
     <string name="pref_title_app_theme">Тема</string>
     <string name="pref_title_timelines">Ленты</string>
 
-    <string-array name="app_theme_names">
-        <item>Тёмная</item>
-        <item>Светлая</item>
-        <item>Черная</item>
-        <item>Автоматическая (по времени)</item>
-        <item>Как в системе</item>
-    </string-array>
+    <string name="app_them_dark">Тёмная</string>
+    <string name="app_theme_light">Светлая</string>
+    <string name="app_theme_black">Черная</string>
+    <string name="app_theme_auto">Автоматическая (по времени)</string>
+    <string name="app_theme_system">Как в системе</string>
 
     <string name="pref_title_browser_settings">Браузер</string>
     <string name="pref_title_custom_tabs">Использовать Chrome Custom Tabs</string>
@@ -214,28 +212,22 @@
     <string name="pref_publishing">Публикация (синхронизировано с сервером)</string>
     <string name="pref_failed_to_sync">Не удалось синхронизировать настройки</string>
 
-    <string-array name="post_privacy_names">
-        <item>Публичные</item>
-        <item>Скрытые</item>
-        <item>Для подписчиков</item>
-    </string-array>
+    <string name="post_privacy_public">Публичные</string>
+    <string name="post_privacy_unlisted">Скрытые</string>
+    <string name="post_privacy_followers_only">Для подписчиков</string>
 
     <string name="pref_status_text_size">Размер текста статусов</string>
 
-    <string-array name="status_text_size_names">
-        <item>Крохотный</item>
-        <item>Маленький</item>
-        <item>Средний</item>
-        <item>Большой</item>
-        <item>Огромный</item>
-    </string-array>
+    <string name="status_text_size_smallest">Крохотный</string>
+    <string name="status_text_size_small">Маленький</string>
+    <string name="status_text_size_medium">Средний</string>
+    <string name="status_text_size_large">Большой</string>
+    <string name="status_text_size_largest">Огромный</string>
 
     <string name="pref_media_display">Отображение медиафайлов</string>
-    <string-array name="media_display_names">
-        <item>Скрывать чувствительные медиафайлы</item>
-        <item>Всегда показывать чувствительные медиафайлы</item>
-        <item>Всегда скрывать все медиафайлы</item>
-    </string-array>
+    <string name="media_hide_sensitive">Скрывать чувствительные медиафайлы</string>
+    <string name="media_hide_none">Всегда показывать чувствительные медиафайлы</string>
+    <string name="media_hide_all">Всегда скрывать все медиафайлы</string>
 
     <string name="notification_channel_mention_name">Новые упоминания</string>
     <string name="notification_channel_mention_descriptions">Уведомлять о новых упоминаниях</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 11bd54871..9c3307751 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Ett fel har uppstått.</string>
     <string name="error_network">Ett nätverksfel inträffade! Kontrollera att du är ansluten till internet och försök igen! </string>
@@ -180,13 +179,11 @@
     <string name="pref_title_app_theme">App Tema</string>
     <string name="pref_title_timelines">Tidslinjer</string>
     <string name="pref_title_timeline_filters">Filter</string>
-    <string-array name="app_theme_names">
-        <item>Mörk</item>
-        <item>Ljus</item>
-        <item>Svart</item>
-        <item>Automatiskt vid solnedgång</item>
-        <item>Använda systemdesign</item>
-    </string-array>
+    <string name="app_them_dark">Mörk</string>
+    <string name="app_theme_light">Ljus</string>
+    <string name="app_theme_black">Svart</string>
+    <string name="app_theme_auto">Automatiskt vid solnedgång</string>
+    <string name="app_theme_system">Använda systemdesign</string>
     <string name="pref_title_browser_settings">Webbläsare</string>
     <string name="pref_title_custom_tabs">Använd Chrome-anpassade flikar</string>
     <string name="pref_title_hide_follow_button">Dölj skriv-knappen medan du scrollar</string>
@@ -205,25 +202,19 @@
     <string name="pref_default_media_sensitivity">Markera alltid media som känsligt</string>
     <string name="pref_publishing">Publicering (synkroniserad med server)</string>
     <string name="pref_failed_to_sync">Misslyckades att synkronisera inställningar</string>
-    <string-array name="post_privacy_names">
-        <item>Offentlig</item>
-        <item>Olistad</item>
-        <item>Endast följare</item>
-    </string-array>
+    <string name="post_privacy_public">Offentlig</string>
+    <string name="post_privacy_unlisted">Olistad</string>
+    <string name="post_privacy_followers_only">Endast följare</string>
     <string name="pref_status_text_size">Textstorlek på status</string>
-    <string-array name="status_text_size_names">
-        <item>Minsta</item>
-        <item>Liten</item>
-        <item>Mellan</item>
-        <item>Stor</item>
-        <item>Största</item>
-    </string-array>
+    <string name="status_text_size_smallest">Minsta</string>
+    <string name="status_text_size_small">Liten</string>
+    <string name="status_text_size_medium">Mellan</string>
+    <string name="status_text_size_large">Stor</string>
+    <string name="status_text_size_largest">Största</string>
     <string name="pref_media_display">Visa media</string>
-    <string-array name="media_display_names">
-        <item>Dölj media som markerat känsligt</item>
-        <item>Visa alltid media som markerat känsligt</item>
-        <item>Dölj alltid media</item>
-    </string-array>
+    <string name="media_hide_sensitive">Dölj media som markerat känsligt</string>
+    <string name="media_hide_none">Visa alltid media som markerat känsligt</string>
+    <string name="media_hide_all">Dölj alltid media</string>
     <string name="notification_channel_mention_name">Nya omnämnanden</string>
     <string name="notification_channel_mention_descriptions">Notifieringar om nya omnämnanden</string>
     <string name="notification_channel_follow_name">Nya följare</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 226344b52..28d4f1442 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">பிழை ஏற்பட்டது.</string>
     <string name="error_empty">இது காலியாக இருக்க கூடாது.</string>
@@ -141,13 +140,10 @@
     <string name="pref_title_notification_filter_favourites">என் பதிவுகள் பிடித்தவையானால்</string>
     <string name="pref_title_appearance_settings">தோற்றம்</string>
     <string name="pref_title_app_theme">செயலியின் தீம்</string>
-    <string-array name="app_theme_names">
-        <item>கருமை</item>
-        <item>வெளிச்சம்</item>
-        <item>பிளாக்</item>
-        <item>தானியங்கி</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">கருமை</string>
+    <string name="app_theme_light">வெளிச்சம்</string>
+    <string name="app_theme_black">பிளாக்</string>
+    <string name="app_theme_auto">தானியங்கி</string>
     <string name="pref_title_browser_settings">உலாவி</string>
     <string name="pref_title_custom_tabs">Chrome தனிப்பயன் கீற்றை பயன்படுத்து</string>
     <string name="pref_title_hide_follow_button">உருளலின் போது எழுது பொத்தானை மறை</string>
@@ -163,11 +159,9 @@
     <string name="pref_title_http_proxy_port">HTTP ப்ராக்ஸி போர்ட்</string>
     <string name="pref_default_post_privacy">தனியுரிமையில் பதிவிடுவதை முன்னிருப்பாக்கு</string>
     <string name="pref_publishing">வெளியீடு</string>
-    <string-array name="post_privacy_names">
-        <item>அனைவருக்கும்</item>
-        <item>பட்டியலிடப்படாதவர்களுக்கு</item>
-        <item>பின்பற்றுபவர்களுக்கு மட்டும்</item>
-    </string-array>
+    <string name="post_privacy_public">அனைவருக்கும்</string>
+    <string name="post_privacy_unlisted">பட்டியலிடப்படாதவர்களுக்கு</string>
+    <string name="post_privacy_followers_only">பின்பற்றுபவர்களுக்கு மட்டும்</string>
     <string name="pref_status_text_size">நிலை உரை அளவு</string>
     <string name="notification_channel_mention_name">புதிய குறிப்புகள்</string>
     <string name="notification_channel_mention_descriptions">புதிய குறிப்புகள் பற்றிய அறிவிப்புகள்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index debbce6da..32b045c8e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Bir hata oluştu.</string>
     <string name="error_network">Bir ağ hatası oluştu! Lütfen bağlantınızı kontrol edin ve tekrar deneyin!</string>
@@ -167,13 +166,10 @@
     <string name="pref_title_appearance_settings">Görünüş</string>
     <string name="pref_title_app_theme">Uygulama teması</string>
     <string name="pref_title_timelines">Zaman çizelgeleri</string>
-    <string-array name="app_theme_names">
-        <item>Koyu</item>
-        <item>Açık</item>
-        <item>Siyah</item>
-        <item>Gün batımında otomatik</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Koyu</string>
+    <string name="app_theme_light">Açık</string>
+    <string name="app_theme_black">Siyah</string>
+    <string name="app_theme_auto">Gün batımında otomatik</string>
     <string name="pref_title_browser_settings">Tarayacı</string>
     <string name="pref_title_custom_tabs">Chrome Özel Şekmelerini Kullan</string>
     <string name="pref_title_hide_follow_button">Kaydırırken takip düğmesi gizlensin</string>
@@ -191,25 +187,19 @@
     <string name="pref_default_media_sensitivity">Her zaman hassas medya olarak işaretle</string>
     <string name="pref_publishing">Yayınlama (sunucuyla eşitlenir)</string>
     <string name="pref_failed_to_sync">Ayarları eşitleme başarısız</string>
-    <string-array name="post_privacy_names">
-        <item>Herkese Açık</item>
-        <item>Liste dışı</item>
-        <item>Sadece takip edenler</item>
-    </string-array>
+    <string name="post_privacy_public">Herkese Açık</string>
+    <string name="post_privacy_unlisted">Liste dışı</string>
+    <string name="post_privacy_followers_only">Sadece takip edenler</string>
     <string name="pref_status_text_size">Durum metin boyutu</string>
-    <string-array name="status_text_size_names">
-        <item>En küçük</item>
-        <item>Küçük</item>
-        <item>Orta</item>
-        <item>Büyük</item>
-        <item>En büyük</item>
-    </string-array>
+    <string name="status_text_size_smallest">En küçük</string>
+    <string name="status_text_size_small">Küçük</string>
+    <string name="status_text_size_medium">Orta</string>
+    <string name="status_text_size_large">Büyük</string>
+    <string name="status_text_size_largest">En büyük</string>
     <string name="pref_media_display">Medya göster</string>
-    <string-array name="media_display_names">
-        <item>Hassas olarak işaretlenmiş medyayı gizle</item>
-        <item>Hassas olarak işaretlenmiş medyayı göster</item>
-        <item>Tüm medyayı gizle</item>
-    </string-array>
+    <string name="media_hide_sensitive">Hassas olarak işaretlenmiş medyayı gizle</string>
+    <string name="media_hide_none">Hassas olarak işaretlenmiş medyayı göster</string>
+    <string name="media_hide_all">Tüm medyayı gizle</string>
     <string name="notification_channel_mention_name">Yeni Bahsedilenler</string>
     <string name="notification_channel_mention_descriptions">Yeni bahsedilenler hakkında bildirim</string>
     <string name="notification_channel_follow_name">Yeni Takipçiler</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9021bcf8d..172ebe0c0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">应用程序出现异常</string>
     <string name="error_network">网络请求出错，请检查互联网连接并重试</string>
@@ -161,13 +160,10 @@
     <string name="pref_title_appearance_settings">外观</string>
     <string name="pref_title_app_theme">应用主题</string>
     <string name="pref_title_timelines">时间轴</string>
-    <string-array name="app_theme_names">
-        <item>黑夜</item>
-        <item>白天</item>
-        <item>暗色</item>
-        <item>自动切换</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">黑夜</string>
+    <string name="app_theme_light">白天</string>
+    <string name="app_theme_black">暗色</string>
+    <string name="app_theme_auto">自动切换</string>
     <string name="pref_title_browser_settings">浏览器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">浏览时自动隐藏发嘟按钮</string>
@@ -185,25 +181,19 @@
     <string name="pref_default_media_sensitivity">自动标记媒体为敏感内容</string>
     <string name="pref_publishing">发布（与服务器同步）</string>
     <string name="pref_failed_to_sync">同步设置失败</string>
-    <string-array name="post_privacy_names">
-        <item>公开</item>
-        <item>不公开</item>
-        <item>仅关注者</item>
-    </string-array>
+    <string name="post_privacy_public">公开</string>
+    <string name="post_privacy_unlisted">不公开</string>
+    <string name="post_privacy_followers_only">仅关注者</string>
     <string name="pref_status_text_size">字体大小</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>标准</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">标准</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">媒体显示</string>
-    <string-array name="media_display_names">
-        <item>自动隐藏敏感媒体</item>
-        <item>总是显示敏感媒体</item>
-        <item>总是隐藏所有媒体</item>
-    </string-array>
+    <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
+    <string name="media_hide_none">总是显示敏感媒体</string>
+    <string name="media_hide_all">总是隐藏所有媒体</string>
     <string name="notification_channel_mention_name">被提及</string>
     <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
     <string name="notification_channel_follow_name">关注者</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 37ae24883..99ed28e02 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">應用程式出現異常</string>
     <string name="error_empty">內容不能為空</string>
@@ -150,13 +149,10 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
-    <string-array name="app_theme_names">
-        <item>黑夜</item>
-        <item>白天</item>
-        <item>黑色</item>
-        <item>自動切換</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">黑夜</string>
+    <string name="app_theme_light">白天</string>
+    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_auto">自動切換</string>
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
@@ -174,25 +170,19 @@
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
-    <string-array name="post_privacy_names">
-        <item>公開</item>
-        <item>不公開</item>
-        <item>僅關注者</item>
-    </string-array>
+    <string name="post_privacy_public">公開</string>
+    <string name="post_privacy_unlisted">不公開</string>
+    <string name="post_privacy_followers_only">僅關注者</string>
     <string name="pref_status_text_size">字體大小</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>標準</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">標準</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">媒體顯示</string>
-    <string-array name="media_display_names">
-        <item>自動隱藏敏感媒體</item>
-        <item>總是顯示敏感媒體</item>
-        <item>總是隱藏所有媒體</item>
-    </string-array>
+    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
+    <string name="media_hide_none">總是顯示敏感媒體</string>
+    <string name="media_hide_all">總是隱藏所有媒體</string>
     <string name="notification_channel_mention_name">被提及</string>
     <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_channel_follow_name">關注者</string>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 37ae24883..99ed28e02 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">應用程式出現異常</string>
     <string name="error_empty">內容不能為空</string>
@@ -150,13 +149,10 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
-    <string-array name="app_theme_names">
-        <item>黑夜</item>
-        <item>白天</item>
-        <item>黑色</item>
-        <item>自動切換</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">黑夜</string>
+    <string name="app_theme_light">白天</string>
+    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_auto">自動切換</string>
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
@@ -174,25 +170,19 @@
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
-    <string-array name="post_privacy_names">
-        <item>公開</item>
-        <item>不公開</item>
-        <item>僅關注者</item>
-    </string-array>
+    <string name="post_privacy_public">公開</string>
+    <string name="post_privacy_unlisted">不公開</string>
+    <string name="post_privacy_followers_only">僅關注者</string>
     <string name="pref_status_text_size">字體大小</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>標準</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">標準</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">媒體顯示</string>
-    <string-array name="media_display_names">
-        <item>自動隱藏敏感媒體</item>
-        <item>總是顯示敏感媒體</item>
-        <item>總是隱藏所有媒體</item>
-    </string-array>
+    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
+    <string name="media_hide_none">總是顯示敏感媒體</string>
+    <string name="media_hide_all">總是隱藏所有媒體</string>
     <string name="notification_channel_mention_name">被提及</string>
     <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_channel_follow_name">關注者</string>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 5c13993e4..29c414340 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">应用程序出现异常。</string>
     <string name="error_empty">内容不能为空。</string>
@@ -153,13 +152,10 @@
     <string name="pref_title_appearance_settings">外观</string>
     <string name="pref_title_app_theme">应用主题</string>
     <string name="pref_title_timelines">时间线</string>
-    <string-array name="app_theme_names">
-        <item>黑夜</item>
-        <item>白天</item>
-        <item>黑色</item>
-        <item>自动切换</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">黑夜</string>
+    <string name="app_theme_light">白天</string>
+    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_auto">自动切换</string>
     <string name="pref_title_browser_settings">浏览器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">浏览时自动隐藏发嘟按钮</string>
@@ -176,25 +172,19 @@
     <string name="pref_default_post_privacy">嘟文默认可见范围</string>
     <string name="pref_publishing">发布</string>
     <string name="pref_failed_to_sync">同步失败设置</string>
-    <string-array name="post_privacy_names">
-        <item>公开</item>
-        <item>不公开</item>
-        <item>仅关注者</item>
-    </string-array>
+    <string name="post_privacy_public">公开</string>
+    <string name="post_privacy_unlisted">不公开</string>
+    <string name="post_privacy_followers_only">仅关注者</string>
     <string name="pref_status_text_size">字体大小</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>标准</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">标准</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">媒体显示</string>
-    <string-array name="media_display_names">
-        <item>自动隐藏敏感媒体</item>
-        <item>总是显示敏感媒体</item>
-        <item>总是隐藏所有媒体</item>
-    </string-array>
+    <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
+    <string name="media_hide_none">总是显示敏感媒体</string>
+    <string name="media_hide_all">总是隐藏所有媒体</string>
     <string name="notification_channel_mention_name">被提及</string>
     <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
     <string name="notification_channel_follow_name">关注者</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 37ae24883..99ed28e02 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">應用程式出現異常</string>
     <string name="error_empty">內容不能為空</string>
@@ -150,13 +149,10 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
-    <string-array name="app_theme_names">
-        <item>黑夜</item>
-        <item>白天</item>
-        <item>黑色</item>
-        <item>自動切換</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">黑夜</string>
+    <string name="app_theme_light">白天</string>
+    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_auto">自動切換</string>
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
@@ -174,25 +170,19 @@
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
-    <string-array name="post_privacy_names">
-        <item>公開</item>
-        <item>不公開</item>
-        <item>僅關注者</item>
-    </string-array>
+    <string name="post_privacy_public">公開</string>
+    <string name="post_privacy_unlisted">不公開</string>
+    <string name="post_privacy_followers_only">僅關注者</string>
     <string name="pref_status_text_size">字體大小</string>
-    <string-array name="status_text_size_names">
-        <item>最小</item>
-        <item>小</item>
-        <item>標準</item>
-        <item>大</item>
-        <item>最大</item>
-    </string-array>
+    <string name="status_text_size_smallest">最小</string>
+    <string name="status_text_size_small">小</string>
+    <string name="status_text_size_medium">標準</string>
+    <string name="status_text_size_large">大</string>
+    <string name="status_text_size_largest">最大</string>
     <string name="pref_media_display">媒體顯示</string>
-    <string-array name="media_display_names">
-        <item>自動隱藏敏感媒體</item>
-        <item>總是顯示敏感媒體</item>
-        <item>總是隱藏所有媒體</item>
-    </string-array>
+    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
+    <string name="media_hide_none">總是顯示敏感媒體</string>
+    <string name="media_hide_all">總是隱藏所有媒體</string>
     <string name="notification_channel_mention_name">被提及</string>
     <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_channel_follow_name">關注者</string>
diff --git a/app/src/main/res/values/string-arrays.xml b/app/src/main/res/values/string-arrays.xml
new file mode 100644
index 000000000..935dc1245
--- /dev/null
+++ b/app/src/main/res/values/string-arrays.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="app_theme_names">
+        <item>@string/app_them_dark</item>
+        <item>@string/app_theme_light</item>
+        <item>@string/app_theme_black</item>
+        <item>@string/app_theme_auto</item>
+        <item>@string/app_theme_system</item>
+    </string-array>
+
+    <string-array name="post_privacy_names">
+        <item>@string/post_privacy_public</item>
+        <item>@string/post_privacy_unlisted</item>
+        <item>@string/post_privacy_followers_only</item>
+    </string-array>
+
+    <string-array name="status_text_size_names">
+        <item>@string/status_text_size_smallest</item>
+        <item>@string/status_text_size_small</item>
+        <item>@string/status_text_size_medium</item>
+        <item>@string/status_text_size_large</item>
+        <item>@string/status_text_size_largest</item>
+    </string-array>
+
+    <string-array name="media_display_names">
+        <item>@string/media_hide_sensitive</item>
+        <item>@string/media_hide_none</item>
+        <item>@string/media_hide_all</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9bccf1afa..518153348 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -205,13 +205,11 @@
     <string name="pref_title_timelines">Timelines</string>
     <string name="pref_title_timeline_filters">Filters</string>
 
-    <string-array name="app_theme_names">
-        <item>Dark</item>
-        <item>Light</item>
-        <item>Black</item>
-        <item>Automatic at sunset</item>
-        <item>Use System Design</item>
-    </string-array>
+    <string name="app_them_dark">Dark</string>
+    <string name="app_theme_light">Light</string>
+    <string name="app_theme_black">Black</string>
+    <string name="app_theme_auto">Automatic at sunset</string>
+    <string name="app_theme_system">Use System Design</string>
 
     <string name="pref_title_browser_settings">Browser</string>
     <string name="pref_title_custom_tabs">Use Chrome Custom Tabs</string>
@@ -233,29 +231,23 @@
     <string name="pref_publishing">Publishing (synced with server)</string>
     <string name="pref_failed_to_sync">Failed to sync settings</string>
 
-    <string-array name="post_privacy_names">
-        <item>Public</item>
-        <item>Unlisted</item>
-        <item>Followers-only</item>
-    </string-array>
+    <string name="post_privacy_public">Public</string>
+    <string name="post_privacy_unlisted">Unlisted</string>
+    <string name="post_privacy_followers_only">Followers-only</string>
 
     <string name="pref_status_text_size">Status text size</string>
 
-    <string-array name="status_text_size_names">
-        <item>Smallest</item>
-        <item>Small</item>
-        <item>Medium</item>
-        <item>Large</item>
-        <item>Largest</item>
-    </string-array>
+    <string name="status_text_size_smallest">Smallest</string>
+    <string name="status_text_size_small">Small</string>
+    <string name="status_text_size_medium">Medium</string>
+    <string name="status_text_size_large">Large</string>
+    <string name="status_text_size_largest">Largest</string>
 
     <string name="pref_media_display">Media display</string>
 
-    <string-array name="media_display_names">
-        <item>Hide media marked as sensitive</item>
-        <item>Always show media marked as sensitive</item>
-        <item>Always hide all media</item>
-    </string-array>
+    <string name="media_hide_sensitive">Hide media marked as sensitive</string>
+    <string name="media_hide_none">Always show media marked as sensitive</string>
+    <string name="media_hide_all">Always hide all media</string>
 
     <string name="notification_channel_mention_name">New Mentions</string>
     <string name="notification_channel_mention_descriptions">Notifications about new mentions</string>