From e667b93169875c22cb5e44e286b75552adcb24e6 Mon Sep 17 00:00:00 2001
From: Kasun <kasun-gitlab@tutanota.com>
Date: Wed, 23 Jan 2019 14:24:26 +0530
Subject: [PATCH 1/3] categorize settings

---
 app/src/main/res/layout/fragment_settings.xml | 206 ++++++++++++------
 app/src/main/res/values-af/strings.xml        |   6 +
 app/src/main/res/values-ar/strings.xml        |   6 +
 app/src/main/res/values-ca/strings.xml        |   6 +
 app/src/main/res/values-cs/strings.xml        |   6 +
 app/src/main/res/values-cy/strings.xml        |   6 +
 app/src/main/res/values-da/strings.xml        |   6 +
 app/src/main/res/values-de/strings.xml        |   6 +
 app/src/main/res/values-el/strings.xml        |   6 +
 app/src/main/res/values-es/strings.xml        |   6 +
 app/src/main/res/values-eu/strings.xml        |   6 +
 app/src/main/res/values-fa/strings.xml        |   6 +
 app/src/main/res/values-fi/strings.xml        |   6 +
 app/src/main/res/values-fr/strings.xml        |   6 +
 app/src/main/res/values-gl/strings.xml        |   6 +
 app/src/main/res/values-he/strings.xml        |   6 +
 app/src/main/res/values-hi/strings.xml        |   6 +
 app/src/main/res/values-hu/strings.xml        |   6 +
 app/src/main/res/values-hy/strings.xml        |   6 +
 app/src/main/res/values-id/strings.xml        |   6 +
 app/src/main/res/values-it/strings.xml        |   6 +
 app/src/main/res/values-ja/strings.xml        |   6 +
 app/src/main/res/values-kab/strings.xml       |   6 +
 app/src/main/res/values-ko/strings.xml        |   6 +
 app/src/main/res/values-lmo/strings.xml       |   6 +
 app/src/main/res/values-mk/strings.xml        |   6 +
 app/src/main/res/values-nl/strings.xml        |   6 +
 app/src/main/res/values-no/strings.xml        |   6 +
 app/src/main/res/values-oc/strings.xml        |   6 +
 app/src/main/res/values-pl/strings.xml        |   6 +
 app/src/main/res/values-pt/strings.xml        |   6 +
 app/src/main/res/values-ro/strings.xml        |   6 +
 app/src/main/res/values-ru/strings.xml        |   6 +
 app/src/main/res/values-si/strings.xml        |   6 +
 app/src/main/res/values-sl/strings.xml        |   6 +
 app/src/main/res/values-sr/strings.xml        |   6 +
 app/src/main/res/values-sv/strings.xml        |   6 +
 app/src/main/res/values-tr/strings.xml        |   6 +
 app/src/main/res/values-uk/strings.xml        |   6 +
 app/src/main/res/values-vi/strings.xml        |   6 +
 app/src/main/res/values-zh-rCN/strings.xml    |   6 +
 app/src/main/res/values-zh-rTW/strings.xml    |   6 +
 app/src/main/res/values/dimens.xml            |   2 +
 app/src/main/res/values/strings.xml           |   6 +
 44 files changed, 398 insertions(+), 62 deletions(-)

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index db32c99a7..1a7d33153 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -37,6 +37,11 @@
         android:paddingRight="@dimen/fab_margin"
         android:orientation="vertical"
         tools:ignore="UselessParent">
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labelconfirmations"/>
         <CheckBox
             android:id="@+id/set_share_validation"
             android:layout_width="wrap_content"
@@ -46,57 +51,69 @@
         <CheckBox
             android:id="@+id/set_share_validation_fav"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_share_validation_fav"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:id="@+id/set_auto_add_media_url"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_auto_add_media_url"
-            android:layout_height="wrap_content" />
-
-        <CheckBox
-            android:id="@+id/set_auto_store"
-            android:layout_width="wrap_content"
-            android:text="@string/set_auto_store_toot"
-            android:layout_height="wrap_content" />
-
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labeltimelines"/>
 
         <CheckBox
             android:id="@+id/set_display_direct"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_direct"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_local"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_local"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_global"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_global"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_art"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_art"
             android:layout_height="wrap_content" />
 
-        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
         <CheckBox
-            android:id="@+id/set_capitalize"
+            android:id="@+id/set_old_direct_timeline"
             android:layout_width="wrap_content"
-            android:text="@string/set_capitalize"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_old_direct_timeline"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labelnotification"/>
+
         <!-- LIVE NOTIFICATIONS SETTINGS -->
         <CheckBox
             android:id="@+id/set_live_notify"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/live_notif"
             android:layout_height="wrap_content" />
 
@@ -104,49 +121,23 @@
         <CheckBox
             android:id="@+id/set_keep_background_process"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_keep_background_process"
             android:layout_height="wrap_content" />
 
-        <!-- GIF AVATARS -->
-        <CheckBox
-            android:id="@+id/set_disable_gif"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_disable_gif"
-            android:layout_height="wrap_content" />
-
-
-        <!-- EXPAND CW -->
-        <CheckBox
-            android:id="@+id/set_expand_cw"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_cw"
-            android:layout_height="wrap_content" />
-
-        <!-- EXPAND Images -->
-        <CheckBox
-            android:id="@+id/set_expand_image"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_image"
-            android:layout_height="wrap_content" />
-
-        <!-- DISPLAY BOOKMARK BUTTON -->
-        <CheckBox
-            android:id="@+id/set_display_bookmarks"
-            android:layout_width="wrap_content"
-            android:text="@string/set_display_bookmark_button"
-            android:layout_height="wrap_content" />
-
-        <!-- FIT PREVIEWS  -->
-        <CheckBox
-            android:id="@+id/set_fit_preview"
-            android:layout_width="wrap_content"
-            android:text="@string/set_fit_preview"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labelinterface"/>
 
         <!-- COMPACT MODE  -->
         <CheckBox
             android:id="@+id/set_compact_mode"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_compact_mode"
             android:layout_height="wrap_content" />
 
@@ -154,53 +145,144 @@
         <CheckBox
             android:id="@+id/set_display_follow_instance"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_follow_instance"
             android:layout_height="wrap_content" />
 
-        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <!-- DISPLAY BOOKMARK BUTTON -->
         <CheckBox
-            android:id="@+id/set_share_details"
+            android:id="@+id/set_display_bookmarks"
             android:layout_width="wrap_content"
-            android:text="@string/set_share_details"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_bookmark_button"
             android:layout_height="wrap_content" />
 
+        <!-- FIT PREVIEWS  -->
         <CheckBox
-            android:id="@+id/set_automatically_split_toot"
+            android:id="@+id/set_fit_preview"
             android:layout_width="wrap_content"
-            android:text="@string/set_automatically_split_toot"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_fit_preview"
             android:layout_height="wrap_content" />
 
-
+        <!-- GIF AVATARS -->
         <CheckBox
-            android:id="@+id/set_display_emoji"
+            android:id="@+id/set_disable_gif"
             android:layout_width="wrap_content"
-            android:text="@string/set_display_emoji"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_disable_gif"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_card"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_card"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_video_preview"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_video_preview"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:id="@+id/set_old_direct_timeline"
-            android:layout_width="wrap_content"
-            android:text="@string/set_old_direct_timeline"
-            android:layout_height="wrap_content" />
-
         <CheckBox
             android:id="@+id/set_display_content_after_fetch_more"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_content_after_fetch_more"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labelcomposing"/>
+
+        <CheckBox
+            android:id="@+id/set_auto_add_media_url"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_add_media_url"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_auto_store"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_store_toot"
+            android:layout_height="wrap_content" />
+
+        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
+        <CheckBox
+            android:id="@+id/set_capitalize"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_capitalize"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_automatically_split_toot"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_automatically_split_toot"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_display_emoji"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_emoji"
+            android:layout_height="wrap_content" />
+
+        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <CheckBox
+            android:id="@+id/set_share_details"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_share_details"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_labelhiddencontent"/>
+
+        <!-- EXPAND CW -->
+        <CheckBox
+            android:id="@+id/set_expand_cw"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_cw"
+            android:layout_height="wrap_content" />
+
+        <!-- EXPAND Images -->
+        <CheckBox
+            android:id="@+id/set_expand_image"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_image"
+            android:layout_height="wrap_content" />
+
+
+
         <!-- TRUNCATE LONG TOOTS -->
         <TextView
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 81c15a927..55bf992ed 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -746,6 +746,12 @@
     <string name="toots_client">التبويقات (الجهاز)</string>
     <string name="modify">تغيير</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>تورنت</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0400f0077..148e785ad 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d27111fbb..850d9dd25 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -736,6 +736,12 @@ Začněte psát první znaky pro návrh.\n\n
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index c43d9aa82..43659a484 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -747,6 +747,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b7b7bcff9..26274c577 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -722,6 +722,12 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
     <string name="toots_client">Toots (Gerät)</string>
     <string name="modify">Bearbeiten</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 9305900d0..f0910b9b2 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9049ebbf9..d6180358e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -727,6 +727,12 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 32620c895..4ea56d7ad 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -730,6 +730,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 9985de026..883644202 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a216b9f67..54926e546 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -729,6 +729,12 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="toots_client">Pouets (Appreil)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 53803fe19..adf08883f 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -733,6 +733,12 @@
     <string name="toots_client">Toots (Dispositivo)</string>
     <string name="modify">Modificar</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 51f3286e8..3672b88b3 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -740,6 +740,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index b93e3b715..efbeb97f9 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -721,6 +721,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index dddb6f4da..bee662f0b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index ede66bf3d..92f629839 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -731,6 +731,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 6f2193c30..99e9d5282 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -730,6 +730,12 @@ https://yandex.ru/legal/confidential/?lang=en
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1a4e2750c..cfc8b18dd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toot (Dispositivo)</string>
     <string name="modify">Modifica</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9738f33ec..93f7ad914 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -720,6 +720,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 68067e8cc..7ba974ec5 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index efa5c03fd..bff3b6866 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -728,6 +728,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-lmo/strings.xml b/app/src/main/res/values-lmo/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-lmo/strings.xml
+++ b/app/src/main/res/values-lmo/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 744dd75be..bedb97b75 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -729,6 +729,12 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
     <string name="toots_client">Toots (Apparaat)</string>
     <string name="modify">Aanpassen</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 297de69e4..e2a0b66c6 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -720,6 +720,12 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
     <string name="toots_client">Toots (enhet)</string>
     <string name="modify">Endre</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 761a00c80..c1b14c9ae 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index acd7b209e..3e57f8bca 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -734,6 +734,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3f48b8b55..b9944094d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1c7bbcd4b..ce6545b96 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -733,6 +733,12 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ed4afa0ce..b14a6a58d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -740,6 +740,12 @@
     <string name="toots_client">Туты (Устройство)</string>
     <string name="modify">Изменить</string>
     <string name="set_display_content_after_fetch_more">Отображать новые туты над кнопкой \"Получить больше\"</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 820219f90..d5311fdbc 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -731,6 +731,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 14ac78578..a15c3a7eb 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -740,6 +740,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ecb4b1a01..5873e7aa8 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -736,6 +736,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 236d9c9fc..f6ac69e83 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -732,6 +732,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6735f87c5..d5389e46b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -725,6 +725,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 830192455..4917436be 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -730,6 +730,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 5c398b371..cd287418d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -726,6 +726,12 @@ và %d toots khác để khám phá</item>
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 20c10f5f6..5724d4f76 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -728,6 +728,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 661aadaed..4ba362dfa 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -728,6 +728,12 @@
     <string name="toots_client">嘟文（裝置）</string>
     <string name="modify">修改</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 91e2fcdb8..72484f073 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,4 +12,6 @@
     <dimen name="layout_height_header">180dp</dimen>
     <dimen name="fab_margin_floating">16dp</dimen>
     <dimen name="item_offset">5dp</dimen>
+    <dimen name="settings_checkbox_margin">2dp</dimen>
+    <dimen name="settings_category_label_margin">5dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 56f079ff8..02e707b39 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -835,6 +835,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
+    <string name="settings_category_labelconfirmations">Confirmations</string>
+    <string name="settings_category_labeltimelines">Timelines</string>
+    <string name="settings_category_labelnotification">Notification service</string>
+    <string name="settings_category_labelinterface">Interface</string>
+    <string name="settings_category_labelhiddencontent">Hidden content</string>
+    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
 
 

From 29dab9d9511693072b493be404bfd8656d290d80 Mon Sep 17 00:00:00 2001
From: Kasun <kasun-gitlab@tutanota.com>
Date: Wed, 23 Jan 2019 18:09:54 +0530
Subject: [PATCH 2/3] fix modified strings

---
 app/src/main/res/values-af/strings.xml     | 6 ------
 app/src/main/res/values-ar/strings.xml     | 6 ------
 app/src/main/res/values-ca/strings.xml     | 6 ------
 app/src/main/res/values-cs/strings.xml     | 6 ------
 app/src/main/res/values-cy/strings.xml     | 6 ------
 app/src/main/res/values-da/strings.xml     | 6 ------
 app/src/main/res/values-de/strings.xml     | 6 ------
 app/src/main/res/values-el/strings.xml     | 6 ------
 app/src/main/res/values-es/strings.xml     | 6 ------
 app/src/main/res/values-eu/strings.xml     | 6 ------
 app/src/main/res/values-fa/strings.xml     | 6 ------
 app/src/main/res/values-fi/strings.xml     | 6 ------
 app/src/main/res/values-fr/strings.xml     | 6 ------
 app/src/main/res/values-gl/strings.xml     | 6 ------
 app/src/main/res/values-he/strings.xml     | 6 ------
 app/src/main/res/values-hi/strings.xml     | 6 ------
 app/src/main/res/values-hu/strings.xml     | 6 ------
 app/src/main/res/values-hy/strings.xml     | 6 ------
 app/src/main/res/values-id/strings.xml     | 6 ------
 app/src/main/res/values-it/strings.xml     | 6 ------
 app/src/main/res/values-ja/strings.xml     | 6 ------
 app/src/main/res/values-kab/strings.xml    | 6 ------
 app/src/main/res/values-ko/strings.xml     | 6 ------
 app/src/main/res/values-lmo/strings.xml    | 6 ------
 app/src/main/res/values-mk/strings.xml     | 6 ------
 app/src/main/res/values-nl/strings.xml     | 6 ------
 app/src/main/res/values-no/strings.xml     | 6 ------
 app/src/main/res/values-oc/strings.xml     | 6 ------
 app/src/main/res/values-pl/strings.xml     | 6 ------
 app/src/main/res/values-pt/strings.xml     | 6 ------
 app/src/main/res/values-ro/strings.xml     | 6 ------
 app/src/main/res/values-ru/strings.xml     | 6 ------
 app/src/main/res/values-si/strings.xml     | 6 ------
 app/src/main/res/values-sl/strings.xml     | 6 ------
 app/src/main/res/values-sr/strings.xml     | 6 ------
 app/src/main/res/values-sv/strings.xml     | 6 ------
 app/src/main/res/values-tr/strings.xml     | 6 ------
 app/src/main/res/values-uk/strings.xml     | 6 ------
 app/src/main/res/values-vi/strings.xml     | 6 ------
 app/src/main/res/values-zh-rCN/strings.xml | 6 ------
 app/src/main/res/values-zh-rTW/strings.xml | 6 ------
 41 files changed, 246 deletions(-)

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 55bf992ed..81c15a927 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -746,12 +746,6 @@
     <string name="toots_client">التبويقات (الجهاز)</string>
     <string name="modify">تغيير</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>تورنت</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 148e785ad..0400f0077 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 850d9dd25..d27111fbb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -736,12 +736,6 @@ Začněte psát první znaky pro návrh.\n\n
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 43659a484..c43d9aa82 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -747,12 +747,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 26274c577..b7b7bcff9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -722,12 +722,6 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
     <string name="toots_client">Toots (Gerät)</string>
     <string name="modify">Bearbeiten</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f0910b9b2..9305900d0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d6180358e..9049ebbf9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -727,12 +727,6 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 4ea56d7ad..32620c895 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -730,12 +730,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 883644202..9985de026 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 54926e546..a216b9f67 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -729,12 +729,6 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="toots_client">Pouets (Appreil)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index adf08883f..53803fe19 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -733,12 +733,6 @@
     <string name="toots_client">Toots (Dispositivo)</string>
     <string name="modify">Modificar</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 3672b88b3..51f3286e8 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -740,12 +740,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index efbeb97f9..b93e3b715 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -721,12 +721,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index bee662f0b..dddb6f4da 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 92f629839..ede66bf3d 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -731,12 +731,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 99e9d5282..6f2193c30 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -730,12 +730,6 @@ https://yandex.ru/legal/confidential/?lang=en
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cfc8b18dd..1a4e2750c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toot (Dispositivo)</string>
     <string name="modify">Modifica</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 93f7ad914..9738f33ec 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -720,12 +720,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 7ba974ec5..68067e8cc 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bff3b6866..efa5c03fd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -728,12 +728,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-lmo/strings.xml b/app/src/main/res/values-lmo/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-lmo/strings.xml
+++ b/app/src/main/res/values-lmo/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bedb97b75..744dd75be 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -729,12 +729,6 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
     <string name="toots_client">Toots (Apparaat)</string>
     <string name="modify">Aanpassen</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index e2a0b66c6..297de69e4 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -720,12 +720,6 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
     <string name="toots_client">Toots (enhet)</string>
     <string name="modify">Endre</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c1b14c9ae..761a00c80 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3e57f8bca..acd7b209e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -734,12 +734,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b9944094d..3f48b8b55 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ce6545b96..1c7bbcd4b 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -733,12 +733,6 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b14a6a58d..ed4afa0ce 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -740,12 +740,6 @@
     <string name="toots_client">Туты (Устройство)</string>
     <string name="modify">Изменить</string>
     <string name="set_display_content_after_fetch_more">Отображать новые туты над кнопкой \"Получить больше\"</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index d5311fdbc..820219f90 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -731,12 +731,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a15c3a7eb..14ac78578 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -740,12 +740,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5873e7aa8..ecb4b1a01 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -736,12 +736,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f6ac69e83..236d9c9fc 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -732,12 +732,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d5389e46b..6735f87c5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -725,12 +725,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4917436be..830192455 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -730,12 +730,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index cd287418d..5c398b371 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -726,12 +726,6 @@ và %d toots khác để khám phá</item>
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5724d4f76..20c10f5f6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -728,12 +728,6 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Webview</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4ba362dfa..661aadaed 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -728,12 +728,6 @@
     <string name="toots_client">嘟文（裝置）</string>
     <string name="modify">修改</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
     <!-- end languages -->
     <string-array name="settings_video_mode">
         <item>Torrent</item>

From a53f88f9bf2f8fd86bafd7606ff75adc0baf796e Mon Sep 17 00:00:00 2001
From: Kasun <kasun-gitlab@tutanota.com>
Date: Wed, 23 Jan 2019 18:08:47 +0530
Subject: [PATCH 3/3] categorize tablet ui

---
 .../res/layout-sw600dp/fragment_settings.xml  | 216 +++++++++++++-----
 app/src/main/res/layout/fragment_settings.xml |  12 +-
 app/src/main/res/values/dimens.xml            |   2 +-
 app/src/main/res/values/strings.xml           |  12 +-
 4 files changed, 167 insertions(+), 75 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index b151a9147..2c30a0391 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -33,67 +33,86 @@
         android:orientation="vertical"
         tools:ignore="UselessParent">
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_confirmations"/>
 
         <CheckBox
             android:id="@+id/set_share_validation"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_share_validation"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_share_validation_fav"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_share_validation_fav"
             android:layout_height="wrap_content" />
 
-
-        <CheckBox
-            android:id="@+id/set_auto_add_media_url"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_auto_add_media_url"
-            android:layout_height="wrap_content" />
-
-        <CheckBox
-            android:id="@+id/set_auto_store"
-            android:layout_width="wrap_content"
-            android:text="@string/set_auto_store_toot"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_timelines"/>
 
         <CheckBox
             android:id="@+id/set_display_direct"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_direct"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_local"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_local"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_global"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_global"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_art"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_art"
             android:layout_height="wrap_content" />
 
-        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
         <CheckBox
-            android:id="@+id/set_capitalize"
+            android:id="@+id/set_old_direct_timeline"
             android:layout_width="wrap_content"
-            android:text="@string/set_capitalize"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_old_direct_timeline"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_notification"/>
+
         <!-- LIVE NOTIFICATIONS SETTINGS -->
         <CheckBox
             android:id="@+id/set_live_notify"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/live_notif"
             android:layout_height="wrap_content" />
 
@@ -101,49 +120,23 @@
         <CheckBox
             android:id="@+id/set_keep_background_process"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_keep_background_process"
             android:layout_height="wrap_content" />
 
-        <!-- GIF AVATARS -->
-        <CheckBox
-            android:id="@+id/set_disable_gif"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_disable_gif"
-            android:layout_height="wrap_content" />
-
-
-        <!-- EXPAND CW -->
-        <CheckBox
-            android:id="@+id/set_expand_cw"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_cw"
-            android:layout_height="wrap_content" />
-
-        <!-- EXPAND Images -->
-        <CheckBox
-            android:id="@+id/set_expand_image"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_image"
-            android:layout_height="wrap_content" />
-
-        <!-- DISPLAY BOOKMARK BUTTON -->
-        <CheckBox
-            android:id="@+id/set_display_bookmarks"
-            android:layout_width="wrap_content"
-            android:text="@string/set_display_bookmark_button"
-            android:layout_height="wrap_content" />
-
-        <!-- FIT PREVIEWS  -->
-        <CheckBox
-            android:id="@+id/set_fit_preview"
-            android:layout_width="wrap_content"
-            android:text="@string/set_fit_preview"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_interface"/>
 
         <!-- COMPACT MODE  -->
         <CheckBox
             android:id="@+id/set_compact_mode"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_compact_mode"
             android:layout_height="wrap_content" />
 
@@ -151,53 +144,152 @@
         <CheckBox
             android:id="@+id/set_display_follow_instance"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_follow_instance"
             android:layout_height="wrap_content" />
 
-        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <!-- DISPLAY BOOKMARK BUTTON -->
         <CheckBox
-            android:id="@+id/set_share_details"
+            android:id="@+id/set_display_bookmarks"
             android:layout_width="wrap_content"
-            android:text="@string/set_share_details"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_bookmark_button"
             android:layout_height="wrap_content" />
 
+        <!-- FIT PREVIEWS  -->
         <CheckBox
-            android:id="@+id/set_automatically_split_toot"
+            android:id="@+id/set_fit_preview"
             android:layout_width="wrap_content"
-            android:text="@string/set_automatically_split_toot"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_fit_preview"
             android:layout_height="wrap_content" />
 
+        <!-- GIF AVATARS -->
         <CheckBox
-            android:id="@+id/set_display_emoji"
+            android:id="@+id/set_disable_gif"
             android:layout_width="wrap_content"
-            android:text="@string/set_display_emoji"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_disable_gif"
             android:layout_height="wrap_content" />
 
-
         <CheckBox
             android:id="@+id/set_display_card"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_card"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_video_preview"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_video_preview"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:id="@+id/set_old_direct_timeline"
-            android:layout_width="wrap_content"
-            android:text="@string/set_old_direct_timeline"
-            android:layout_height="wrap_content" />
-
         <CheckBox
             android:id="@+id/set_display_content_after_fetch_more"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_content_after_fetch_more"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_composing"/>
+
+        <CheckBox
+            android:id="@+id/set_auto_add_media_url"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_add_media_url"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_auto_store"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_store_toot"
+            android:layout_height="wrap_content" />
+
+        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
+        <CheckBox
+            android:id="@+id/set_capitalize"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_capitalize"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_automatically_split_toot"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_automatically_split_toot"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_display_emoji"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_emoji"
+            android:layout_height="wrap_content" />
+
+        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <CheckBox
+            android:id="@+id/set_share_details"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_share_details"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_hiddencontent"/>
+
+        <!-- EXPAND CW -->
+        <CheckBox
+            android:id="@+id/set_expand_cw"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_cw"
+            android:layout_height="wrap_content" />
+
+        <!-- EXPAND Images -->
+        <CheckBox
+            android:id="@+id/set_expand_image"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_image"
+            android:layout_height="wrap_content" />
+
+
+
+
+
+
+
+
+
+
+
         <!-- TRUNCATE LONG TOOTS -->
         <TextView
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 1a7d33153..55f5f4364 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -41,7 +41,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelconfirmations"/>
+            android:text="@string/settings_category_label_confirmations"/>
         <CheckBox
             android:id="@+id/set_share_validation"
             android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labeltimelines"/>
+            android:text="@string/settings_category_label_timelines"/>
 
         <CheckBox
             android:id="@+id/set_display_direct"
@@ -106,7 +106,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelnotification"/>
+            android:text="@string/settings_category_label_notification"/>
 
         <!-- LIVE NOTIFICATIONS SETTINGS -->
         <CheckBox
@@ -130,7 +130,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelinterface"/>
+            android:text="@string/settings_category_label_interface"/>
 
         <!-- COMPACT MODE  -->
         <CheckBox
@@ -205,7 +205,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelcomposing"/>
+            android:text="@string/settings_category_label_composing"/>
 
         <CheckBox
             android:id="@+id/set_auto_add_media_url"
@@ -261,7 +261,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelhiddencontent"/>
+            android:text="@string/settings_category_label_hiddencontent"/>
 
         <!-- EXPAND CW -->
         <CheckBox
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 72484f073..1dcd8109c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,5 +13,5 @@
     <dimen name="fab_margin_floating">16dp</dimen>
     <dimen name="item_offset">5dp</dimen>
     <dimen name="settings_checkbox_margin">2dp</dimen>
-    <dimen name="settings_category_label_margin">5dp</dimen>
+    <dimen name="settings_category_label_margin">2dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02e707b39..42faea042 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -835,12 +835,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
+    <string name="settings_category_label_confirmations">Confirmations</string>
+    <string name="settings_category_label_timelines">Timelines</string>
+    <string name="settings_category_label_notification">Notification service</string>
+    <string name="settings_category_label_interface">Interface</string>
+    <string name="settings_category_label_hiddencontent">Hidden content</string>
+    <string name="settings_category_label_composing">Composing</string>
     <!-- end languages -->