From 48a00b099e24e97cfe0d592444a92ce23557bd39 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Tue, 4 Sep 2018 17:02:34 +0200
Subject: [PATCH] .

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../activity/AboutActivity.java               |  26 +--
 .../activity/MainActivity.java                |   4 +-
 .../activity/SettingsActivity.java            |   8 +-
 .../ui/SearchOrCustomTextDialogCreator.java   |   4 +-
 .../main/res/layout/about__fragment_about.xml |  30 +--
 .../main/res/layout/about__fragment_debug.xml |   8 +-
 .../res/layout/about__fragment_license.xml    |  16 +-
 .../main/res/layout/podselection__dialog.xml  |   2 +-
 app/src/main/res/values-ar-rSA/strings.xml    |   2 +-
 app/src/main/res/values-da/strings.xml        |  52 +++---
 app/src/main/res/values-de/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-es/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-fr/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-gl/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-hu/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-it/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-ja/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-kab/strings.xml       | 174 +++++++++---------
 app/src/main/res/values-ml/strings.xml        | 106 +++++------
 app/src/main/res/values-nl/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-no-rNO/strings.xml    |   2 +-
 app/src/main/res/values-pl/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-pt-rBR/strings.xml    | 112 +++++------
 app/src/main/res/values-ro-rRO/strings.xml    |  32 ++--
 app/src/main/res/values-ru/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-sc/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-sv/strings.xml        | 174 +++++++++---------
 app/src/main/res/values-tr-rTR/strings.xml    | 108 +++++------
 app/src/main/res/values-uk-rUA/strings.xml    | 174 +++++++++---------
 app/src/main/res/values-zh-rTW/strings.xml    | 174 +++++++++---------
 app/src/main/res/values/arrays.xml            |  14 +-
 .../res/values/strings-not_translatable.xml   |  14 +-
 app/src/main/res/values/strings.xml           | 174 +++++++++---------
 app/src/main/res/xml/preferences__master.xml  |  56 +++---
 .../res/xml/preferences__sub_debugging.xml    |   6 +-
 .../main/res/xml/preferences__sub_proxy.xml   |  12 +-
 .../main/res/xml/preferences__sub_themes.xml  |   2 +-
 38 files changed, 1701 insertions(+), 1701 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dd74c774..ba46503f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
         <activity
             android:name="com.github.dfa.diaspora_android.activity.AboutActivity"
             android:configChanges="locale"
-            android:label="@string/about_activity__title_about_app"
+            android:label="@string/about"
             android:theme="@style/DiasporaLight.NoActionBar" />
 
         <activity
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
index cd43fb88..a11f0027 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
@@ -169,7 +169,7 @@ public class AboutActivity extends ThemedActivity
             if (isAdded()) {
                 try {
                     PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
-                    appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")"));
+                    appVersion.setText(getString(R.string.app_version_with_arg, pInfo.versionName + " (" + pInfo.versionCode + ")"));
 
                 } catch (PackageManager.NameNotFoundException e) {
                     e.printStackTrace();
@@ -213,7 +213,7 @@ public class AboutActivity extends ThemedActivity
                     Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                     sharingIntent.setType("text/plain");
                     sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_name));
-                    sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.fragment_about__spread_the_word_share_text, getString(R.string.fragment_about__fdroid_link)));
+                    sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.hey_checkout_dandelion_tag__appspecific, getString(R.string.fragment_about__fdroid_link)));
                     startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
                     break;
             }
@@ -258,9 +258,9 @@ public class AboutActivity extends ThemedActivity
             ButterKnife.bind(this, view);
             accentColor = ContextUtils.get().colorToHexString(ThemeHelper.getAccentColor());
 
-            maintainers.setTextFormatted(getString(R.string.fragment_license__maintainers_text,
+            maintainers.setTextFormatted(getString(R.string.this_app_is_currently_developed_and_maintained_by_witharg,
                     ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.maintainers, "")));
-            contributors.setTextFormatted(getString(R.string.fragment_license__contributors_thank_you,
+            contributors.setTextFormatted(getString(R.string.thank_you_witharg,
                     ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.contributors, "")));
             thirdPartyLibs.setTextFormatted(
                     ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.licenses_3rd_party, ""));
@@ -341,7 +341,7 @@ public class AboutActivity extends ThemedActivity
                         ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
                         ClipData clip = ClipData.newPlainText("DEBUG_LOG", AppLog.Log.getLogBuffer());
                         clipboard.setPrimaryClip(clip);
-                        Toast.makeText(DebugFragment.this.getActivity(), R.string.fragment_debug__toast_log_copied, Toast.LENGTH_SHORT).show();
+                        Toast.makeText(DebugFragment.this.getActivity(), R.string.debug_log_copied_to_clipboard, Toast.LENGTH_SHORT).show();
                     } else {
                         AppLog.d(this, "Not Added!");
                     }
@@ -356,13 +356,13 @@ public class AboutActivity extends ThemedActivity
                     PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
                     AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
                     packageName.setText(pInfo.packageName);
-                    appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")"));
+                    appVersion.setText(getString(R.string.app_version_with_arg, pInfo.versionName + " (" + pInfo.versionCode + ")"));
 
-                    osVersion.setText(getString(R.string.fragment_debug__android_version, Build.VERSION.RELEASE));
-                    deviceName.setText(getString(R.string.fragment_debug__device_name, Build.MANUFACTURER + " " + Build.MODEL));
+                    osVersion.setText(getString(R.string.android_version_witharg, Build.VERSION.RELEASE));
+                    deviceName.setText(getString(R.string.device_name_witharg, Build.MANUFACTURER + " " + Build.MODEL));
                     if (app.getSettings().getPod() != null) {
-                        podDomain.setText(getString(R.string.fragment_debug__pod_profile_url, app.getSettings().getPod().getPodUrl()));
-                        podName.setText(getString(R.string.fragment_debug__pod_profile_name, app.getSettings().getPod().getName()));
+                        podDomain.setText(getString(R.string.pod_domain_witharg__appspecific, app.getSettings().getPod().getPodUrl()));
+                        podName.setText(getString(R.string.pod_profile_name_witharg__appspecific, app.getSettings().getPod().getName()));
                     }
 
                 } catch (PackageManager.NameNotFoundException e) {
@@ -420,11 +420,11 @@ public class AboutActivity extends ThemedActivity
         public CharSequence getPageTitle(int position) {
             switch (position) {
                 case 0:
-                    return getString(R.string.about_activity__title_about_app);
+                    return getString(R.string.about);
                 case 1:
-                    return getString(R.string.about_activity__title_about_license);
+                    return getString(R.string.license);
                 case 2:
-                    return getString(R.string.about_activity__title_debug_info);
+                    return getString(R.string.debugging);
             }
             return null;
         }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 9589a66c..628b404c 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -1068,7 +1068,7 @@ public class MainActivity extends ThemedActivity
                 SearchOrCustomTextDialogCreator.showDiasporaTagsDialog(this, arg -> {
                     if (arg.startsWith(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX)) {
                         arg = arg.replace(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX, "").trim();
-                        if (arg.equals(getString(R.string.pref_title__manage_tags))) {
+                        if (arg.equals(getString(R.string.manage_hashtags))) {
                             openDiasporaUrl(urls.getManageTagsUrl());
                         } else {
                             openDiasporaUrl(urls.getAllFollowedTagsUrl());
@@ -1084,7 +1084,7 @@ public class MainActivity extends ThemedActivity
                 SearchOrCustomTextDialogCreator.showDiasporaAspectsDialog(this, arg -> {
                     if (arg.startsWith(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX)) {
                         arg = arg.replace(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX, "").trim();
-                        if (arg.equals(getString(R.string.pref_desc__manage_contacts))) {
+                        if (arg.equals(getString(R.string.manage_your_contact_list))) {
                             openDiasporaUrl(urls.getContactsUrl());
                         } else if (arg.equals(getString(R.string.nav_profile))) {
                             openDiasporaUrl(urls.getProfileUrl());
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
index 8d660e46..6593c3b9 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
@@ -131,7 +131,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
         if (top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
             ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings();
             if (oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) {
-                Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show();
+                Toast.makeText(this, R.string.app_needs_restart_to_disable_proxy_usage, Toast.LENGTH_LONG).show();
             }
         }
         super.onBackPressed();
@@ -226,7 +226,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                 } else if (settings.isKeyEqual(key, R.string.pref_key__change_account)) {
                     new ThemedAlertDialogBuilder(getActivity(), AppSettings.get())
                             .setTitle(getString(R.string.confirmation))
-                            .setMessage(getString(R.string.pref_warning__change_account))
+                            .setMessage(getString(R.string.logout_warning_description))
                             .setNegativeButton(android.R.string.no, null)
                             .setPositiveButton(android.R.string.yes,
                                     new DialogInterface.OnClickListener() {
@@ -412,7 +412,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                 if (appSettings.isKeyEqual(key, R.string.pref_key__http_proxy_load_tor_preset)) {
                     appSettings.setProxyHttpHost("127.0.0.1");
                     appSettings.setProxyHttpPort(8118);
-                    Toast.makeText(screen.getContext(), R.string.toast__proxy_orbot_preset_loaded, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(screen.getContext(), R.string.orbot_proxy_preset_loaded, Toast.LENGTH_SHORT).show();
                     return true;
                 }
             }
@@ -477,7 +477,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
 
             ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(getActivity(), appSettings);
             builder.setTitle(R.string.confirmation)
-                    .setMessage(R.string.dialog_content__wipe_settings)
+                    .setMessage(R.string.wipe_settings_warning__appspecific)
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java
index 1e9d2be1..c7421567 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java
@@ -34,7 +34,7 @@ public class SearchOrCustomTextDialogCreator {
                 hl.add(highlighted);
             }
 
-            for (int strid : new int[]{R.string.pref_title__manage_tags}) {
+            for (int strid : new int[]{R.string.manage_hashtags}) {
                 String special = surroundString(appSettings.rstr(strid));
                 data.add(0, special);
                 hl.add(special);
@@ -64,7 +64,7 @@ public class SearchOrCustomTextDialogCreator {
             for (DiasporaAspect aspect : AppSettings.get().getAspects()) {
                 data.add(aspect.name);
             }
-            for (int strid : new int[]{R.string.nav_profile, R.string.pref_desc__manage_contacts}) {
+            for (int strid : new int[]{R.string.nav_profile, R.string.manage_your_contact_list}) {
                 String special = surroundString(appSettings.rstr(strid));
                 data.add(0, special);
                 hl.add(special);
diff --git a/app/src/main/res/layout/about__fragment_about.xml b/app/src/main/res/layout/about__fragment_about.xml
index 61ecc491..4a997dc6 100644
--- a/app/src/main/res/layout/about__fragment_about.xml
+++ b/app/src/main/res/layout/about__fragment_about.xml
@@ -43,13 +43,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="8dp"
-                    android:text="@string/fragment_debug__app_version"/>
+                    android:text="@string/app_version_with_arg"/>
 
                 <TextView
                     android:id="@+id/fragment_about__app_codename"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_debug__app_codename"
+                    android:text="@string/code_name_witharg"
                     android:layout_marginBottom="8dp"
                     android:visibility="gone"/> <!-- Change later -->
 
@@ -57,7 +57,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__about_text"
+                    android:text="@string/dandelion_is_your_companion__appspecific"
                     android:layout_marginBottom="16dp"/>
 
             </LinearLayout>
@@ -86,14 +86,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__contribute"
+                    android:text="@string/contribute_code"
                     android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__contribute_text"/>
+                    android:text="@string/dandelion_is_developed_as_foss__appspecific"/>
 
                 <Button
                     android:id="@+id/fragment_about__contribute_button"
@@ -101,7 +101,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_about__contribute_button"/>
+                    android:text="@string/get_the_source"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
@@ -128,14 +128,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__translate"
+                    android:text="@string/translate_the_app"
                     android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__translate_text"/>
+                    android:text="@string/app_not_available_in_your_lang_translate_with_stringlate"/>
 
                 <Button
                     android:id="@+id/fragment_about__translate_button"
@@ -143,7 +143,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_about__translate_button"/>
+                    android:text="@string/let_me_translate"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
@@ -170,14 +170,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__feedback"
+                    android:text="@string/give_feedback"
                     android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__feedback_text"/>
+                    android:text="@string/dandelion_still_in_development__appspecific"/>
 
                 <Button
                     android:id="@+id/fragment_about__feedback_button"
@@ -185,7 +185,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_about__feedback_button"/>
+                    android:text="@string/report_bugs"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
@@ -212,7 +212,7 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__spread_the_word"
+                    android:text="@string/spread_the_word"
                     android:layout_marginBottom="8dp"/>
 
                 <com.github.dfa.diaspora_android.ui.HtmlTextView
@@ -220,7 +220,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_about__spread_the_word_text"/>
+                    android:text="@string/tell_your_friends_about_diaspora__appspecific"/>
 
                 <Button
                     android:id="@+id/fragment_about__spread_the_word_button"
@@ -228,7 +228,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_about__spread_the_word_button"/>
+                    android:text="@string/share_the_app"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/app/src/main/res/layout/about__fragment_debug.xml b/app/src/main/res/layout/about__fragment_debug.xml
index b65a3489..2d08f8a0 100644
--- a/app/src/main/res/layout/about__fragment_debug.xml
+++ b/app/src/main/res/layout/about__fragment_debug.xml
@@ -23,7 +23,7 @@
             style="@android:style/TextAppearance.DeviceDefault.Large"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/fragment_debug__section_app" />
+            android:text="@string/application" />
 
         <TextView
             android:id="@+id/fragment_debug__package_name"
@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/fragment_debug__section_device" />
+            android:text="@string/device" />
 
         <TextView
             android:id="@+id/fragment_debug__android_version"
@@ -61,7 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/fragment_debug__section_pod" />
+            android:text="@string/diaspora_pod__appspecific" />
 
         <TextView
             android:id="@+id/fragment_debug__account_profile_name"
@@ -80,7 +80,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/fragment_debug__section_log" />
+            android:text="@string/debug_log" />
 
         <ScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/about__fragment_license.xml b/app/src/main/res/layout/about__fragment_license.xml
index eb6a1b30..c93dad72 100644
--- a/app/src/main/res/layout/about__fragment_license.xml
+++ b/app/src/main/res/layout/about__fragment_license.xml
@@ -36,14 +36,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__maintainers"/>
+                    android:text="@string/maintainers"/>
 
                 <com.github.dfa.diaspora_android.ui.HtmlTextView
                     android:id="@+id/fragment_license__maintainers_text"
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__maintainers_text"
+                    android:text="@string/this_app_is_currently_developed_and_maintained_by_witharg"
                     android:layout_marginBottom="8dp"/>
 
             </LinearLayout>
@@ -72,7 +72,7 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__contributors"
+                    android:text="@string/contributors"
                     android:layout_marginBottom="8dp"/>
 
                 <com.github.dfa.diaspora_android.ui.HtmlTextView
@@ -123,7 +123,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_license__license_button"/>
+                    android:text="@string/gnu_gplv3_license"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
@@ -150,14 +150,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__thirdparty_libs"
+                    android:text="@string/show_third_party_licenses"
                     android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__thirdparty_libs_text"/>
+                    android:text="@string/the_following_libraries_are_used"/>
 
                 <com.github.dfa.diaspora_android.ui.HtmlTextView
                     android:id="@+id/fragment_license__thirdparty_libs_text"
@@ -197,7 +197,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__misc_leafpic"/>
+                    android:text="@string/inspiration_from_leafpic__appspecific"/>
 
                 <Button
                     android:id="@+id/fragment_license__leafpic_button"
@@ -205,7 +205,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/fragment_license__misc_leafpic_button"/>
+                    android:text="@string/tell_me_more"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/app/src/main/res/layout/podselection__dialog.xml b/app/src/main/res/layout/podselection__dialog.xml
index 78c55580..ec09eee0 100644
--- a/app/src/main/res/layout/podselection__dialog.xml
+++ b/app/src/main/res/layout/podselection__dialog.xml
@@ -113,7 +113,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/activity_horizontal_margin_half"
-            android:text="@string/pref_title__http_proxy_load_tor_preset"
+            android:text="@string/load_tor_preset"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:visibility="gone" />
 
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 9c15655d..985ee35d 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="about_activity__title_about_app">حول البرنامجgood app</string>
+    <string name="about">حول البرنامجgood app</string>
     <!-- License & help (large amount of text) -->
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 4c24dc08..e6794f8b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -33,32 +33,32 @@
     <!-- More from MainActivity -->
     <!-- Permissions -->
 
-    <string name="about_activity__title_about_app">Om</string>
-    <string name="about_activity__title_about_license">Licens</string>
-    <string name="about_activity__title_debug_info">Fejlsøgning</string>
-    <string name="fragment_debug__section_app">Applikation</string>
-    <string name="fragment_debug__section_device">Enhed</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Fejlsøgningslog</string>
-    <string name="fragment_debug__section_log_spam">Fejlsøgningslog (udvidet)</string>
-    <string name="fragment_debug__app_version">App version: %1$s</string>
-    <string name="fragment_debug__android_version">Android version: %1$s</string>
-    <string name="fragment_debug__device_name">Enhedsnavn: %1$s</string>
-    <string name="fragment_debug__app_codename">Kodenavn: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod-profilnavn: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod-domæne: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Fejlsøgningslog kopieret til udklipsbord</string>
-    <string name="fragment_about__about_text">dandelion* er dine hjælpe-applikationer til at finde rundt på det sociale netværk diaspora*. Den tilføjer funktionaliteter som værktøjslinker og understøttelse for proxy-servere som Tor til din sociale oplevelse.</string>
-    <string name="fragment_about__contribute">Bidrag med kode!</string>
-    <string name="fragment_about__contribute_text">dandelion* udvikles som fri software og følger ideerne bag diaspora*-projektet. Hvis du har lyst til at bidrage, så sæt i gang! For nuværende er vi et meget lille hold der står bag, og vi sætter stor pris på enhver form for hjælp!</string>
-    <string name="fragment_about__contribute_button">Hent kildekoden</string>
-    <string name="fragment_about__translate">Oversæt applikationen!</string>
-    <string name="fragment_about__translate_text">Findes applikationen ikke på dit sprog? Det kan du ændre! Hvorfor ikke hjælpe os med at oversætte den? Vi burer crowdin-platformen som gør dig i stand til at oversætte.</string>
-    <string name="fragment_about__translate_button">Lad mig oversætte</string>
-    <string name="fragment_about__feedback">Meld tilbage!</string>
-    <string name="fragment_about__feedback_text">dandelion* udvikles stadig, så hvis du har forslag eller anden form for tilbagemelding, så lad os det venligst vide via vores problem-tracker!</string>
-    <string name="fragment_about__feedback_button">Rapporter fejl</string>
-    <string name="fragment_about__spread_the_word">Spred ordet!</string>
+    <string name="about">Om</string>
+    <string name="license">Licens</string>
+    <string name="debugging">Fejlsøgning</string>
+    <string name="application">Applikation</string>
+    <string name="device">Enhed</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Fejlsøgningslog</string>
+    <string name="debug_log_verbose">Fejlsøgningslog (udvidet)</string>
+    <string name="app_version_with_arg">App version: %1$s</string>
+    <string name="android_version_witharg">Android version: %1$s</string>
+    <string name="device_name_witharg">Enhedsnavn: %1$s</string>
+    <string name="code_name_witharg">Kodenavn: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod-profilnavn: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod-domæne: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Fejlsøgningslog kopieret til udklipsbord</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* er dine hjælpe-applikationer til at finde rundt på det sociale netværk diaspora*. Den tilføjer funktionaliteter som værktøjslinker og understøttelse for proxy-servere som Tor til din sociale oplevelse.</string>
+    <string name="contribute_code">Bidrag med kode!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* udvikles som fri software og følger ideerne bag diaspora*-projektet. Hvis du har lyst til at bidrage, så sæt i gang! For nuværende er vi et meget lille hold der står bag, og vi sætter stor pris på enhver form for hjælp!</string>
+    <string name="get_the_source">Hent kildekoden</string>
+    <string name="translate_the_app">Oversæt applikationen!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Findes applikationen ikke på dit sprog? Det kan du ændre! Hvorfor ikke hjælpe os med at oversætte den? Vi burer crowdin-platformen som gør dig i stand til at oversætte.</string>
+    <string name="let_me_translate">Lad mig oversætte</string>
+    <string name="give_feedback">Meld tilbage!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* udvikles stadig, så hvis du har forslag eller anden form for tilbagemelding, så lad os det venligst vide via vores problem-tracker!</string>
+    <string name="report_bugs">Rapporter fejl</string>
+    <string name="spread_the_word">Spred ordet!</string>
     <!-- License & help (large amount of text) -->
 
     <!-- Key Names (Untranslatable) -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5288fa23..15eb1d15 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -80,45 +80,45 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
     <string name="pref_summary__is_statusbar_hidden">Statusleiste in Hauptansicht verstecken</string>
     <string name="pref_title__is_statusbar_hidden">Statusleiste verstecken</string>
 
-    <string name="about_activity__title_about_app">Über</string>
-    <string name="about_activity__title_about_license">Lizenz</string>
-    <string name="about_activity__title_debug_info">Debugging</string>
-    <string name="fragment_debug__section_app">Anwendung</string>
-    <string name="fragment_debug__section_device">Gerät</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Debug-Protokoll</string>
-    <string name="fragment_debug__section_log_spam">Debug-Protokoll (Verbose)</string>
-    <string name="fragment_debug__app_version">App Version: %1$s</string>
-    <string name="fragment_debug__android_version">Android Version: %1$s</string>
-    <string name="fragment_debug__device_name">Gerätename: %1$s</string>
-    <string name="fragment_debug__app_codename">Codename: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod Profil Name: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Debug-Protokoll in Zwischenablage kopiert</string>
-    <string name="fragment_about__about_text">dandelion* ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk diaspora*. Es bietet dir zusätzliche Funktionen wie nützliche Werkzeugleisten und Unterstützung für Proxyserver wie das Tor-Netzwerk.</string>
-    <string name="fragment_about__contribute">Mach mit!</string>
-    <string name="fragment_about__contribute_text">dandelion* wird frei wie in Freiheit entwickelt und folgt den Ideen des diaspora* Projektes. Wenn du mithelfen willst, nur zu! Wir sind momentan nur ein sehr kleines Team und sind froh über jede Unterstützung!</string>
-    <string name="fragment_about__contribute_button">Zum Quellcode</string>
-    <string name="fragment_about__translate">Übersetze die App!</string>
-    <string name="fragment_about__translate_text">Die Anwendung ist nicht in deiner Sprache verfügbar? Das kannst du ändern! Warum hilfst du uns nicht, indem du übersetzt? Wir benutzen die Plattform crowdin, um es jedem zu ermöglichen, die App zu übersetzen.</string>
-    <string name="fragment_about__translate_button">Ich möchte übersetzen</string>
-    <string name="fragment_about__feedback">Feedback geben!</string>
-    <string name="fragment_about__feedback_text">dandelion* befindet sich noch in Entwicklung, wenn du also Vorschläge oder etwas anderes auf dem Herzen hast besuche doch unseren Bug Tracker und lass es uns wissen!</string>
-    <string name="fragment_about__feedback_button">Fehler melden</string>
-    <string name="fragment_about__spread_the_word">Anderen davon erzählen!</string>
-    <string name="fragment_about__spread_the_word_text">Erzähl deiner Familie und deinen Freunden von diaspora* und #dandelion! Warum bloggst du nicht über deine Erfahrungen mit der App? Wir würden gerne davon erfahren!</string>
-    <string name="fragment_about__spread_the_word_button">Weitersagen</string>
-    <string name="fragment_about__spread_the_word_share_text">Hallo! Schau dir #dandelion an! %1$s</string>
+    <string name="about">Über</string>
+    <string name="license">Lizenz</string>
+    <string name="debugging">Debugging</string>
+    <string name="application">Anwendung</string>
+    <string name="device">Gerät</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Debug-Protokoll</string>
+    <string name="debug_log_verbose">Debug-Protokoll (Verbose)</string>
+    <string name="app_version_with_arg">App Version: %1$s</string>
+    <string name="android_version_witharg">Android Version: %1$s</string>
+    <string name="device_name_witharg">Gerätename: %1$s</string>
+    <string name="code_name_witharg">Codename: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profil Name: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Domain: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Debug-Protokoll in Zwischenablage kopiert</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk diaspora*. Es bietet dir zusätzliche Funktionen wie nützliche Werkzeugleisten und Unterstützung für Proxyserver wie das Tor-Netzwerk.</string>
+    <string name="contribute_code">Mach mit!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* wird frei wie in Freiheit entwickelt und folgt den Ideen des diaspora* Projektes. Wenn du mithelfen willst, nur zu! Wir sind momentan nur ein sehr kleines Team und sind froh über jede Unterstützung!</string>
+    <string name="get_the_source">Zum Quellcode</string>
+    <string name="translate_the_app">Übersetze die App!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Die Anwendung ist nicht in deiner Sprache verfügbar? Das kannst du ändern! Warum hilfst du uns nicht, indem du übersetzt? Wir benutzen die Plattform crowdin, um es jedem zu ermöglichen, die App zu übersetzen.</string>
+    <string name="let_me_translate">Ich möchte übersetzen</string>
+    <string name="give_feedback">Feedback geben!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* befindet sich noch in Entwicklung, wenn du also Vorschläge oder etwas anderes auf dem Herzen hast besuche doch unseren Bug Tracker und lass es uns wissen!</string>
+    <string name="report_bugs">Fehler melden</string>
+    <string name="spread_the_word">Anderen davon erzählen!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Erzähl deiner Familie und deinen Freunden von diaspora* und #dandelion! Warum bloggst du nicht über deine Erfahrungen mit der App? Wir würden gerne davon erfahren!</string>
+    <string name="share_the_app">Weitersagen</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hallo! Schau dir #dandelion an! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Entwickler</string>
-    <string name="fragment_license__maintainers_text">Diese Anwendung wird momentan entwickelt und betreut von &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Mitwirkende</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Vielen Dank!</string>
-    <string name="fragment_license__license_button">GNU GPLv3+ Lizenz</string>
-    <string name="fragment_license__thirdparty_libs">Drittanbieter-Bibliotheken</string>
-    <string name="fragment_license__thirdparty_libs_text">Die folgenden Bibliotheken werden genutzt:</string>
-    <string name="fragment_license__misc_leafpic">Wir haben ein wenig bei LeafPic gespickt. Schaut euch das mal an, es handelt sich dabei auch um freie Software!</string>
-    <string name="fragment_license__misc_leafpic_button">Erzähl mir mehr</string>
+    <string name="maintainers">Entwickler</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Diese Anwendung wird momentan entwickelt und betreut von &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Mitwirkende</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Vielen Dank!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Lizenz</string>
+    <string name="show_third_party_licenses">Drittanbieter-Bibliotheken</string>
+    <string name="the_following_libraries_are_used">Die folgenden Bibliotheken werden genutzt:</string>
+    <string name="inspiration_from_leafpic__appspecific">Wir haben ein wenig bei LeafPic gespickt. Schaut euch das mal an, es handelt sich dabei auch um freie Software!</string>
+    <string name="tell_me_more">Erzähl mir mehr</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -143,62 +143,62 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
     <string name="pref_desc__primary_color">Färbung der Werkzeugleisten</string>
     <string name="pref_title__accent_color">Akzentfarbe</string>
     <string name="pref_desc__accent_color">Färbung der Details</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED Modus</string>
+    <string name="amoled_mode">AMOLED Modus</string>
     <string name="pref_desc__primary_color__amoled_mode">Farben mit AMOLED-Display freundlichen Farben an vielen Orten der App überschreiben. Ein Neustart ist erforderlich um diese Einstellung zu ändern. Du kannst in deinen persönlichen diaspora* Einstellungen das dunkle Thema aktivieren, damit wird auch der Inhalt dunkler.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Erweiterte Benachrichtigungen</string>
-    <string name="pref_desc__extended_notifications">Erweitere die Benachrichtigungsglocke um ein Ausklappmenü mit verschiedenen Benachrichtigungskategorien</string>
-    <string name="pref_desc__language">Sprache der App ändern. Ein Neustart der App ist erforderlich um die Einstellung zu übernehmen</string>
-    <string name="pref_title__language">Sprache</string>
-    <string name="language_system">Systemsprache</string>
+    <string name="extended_notifications">Erweiterte Benachrichtigungen</string>
+    <string name="extendend_notifications_bell_description__appspecific">Erweitere die Benachrichtigungsglocke um ein Ausklappmenü mit verschiedenen Benachrichtigungskategorien</string>
+    <string name="language_change_restart_description">Sprache der App ändern. Ein Neustart der App ist erforderlich um die Einstellung zu übernehmen</string>
+    <string name="language">Sprache</string>
+    <string name="system_language">Systemsprache</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Konfigurieren der Textgröße der Webansicht</string>
-    <string name="pref_title__font_size">Schriftgröße</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Groß</string>
-    <string name="font_size_huge">Größer</string>
+    <string name="control_textsize_of_webview">Konfigurieren der Textgröße der Webansicht</string>
+    <string name="font_size">Schriftgröße</string>
+    <string name="normal">Normal</string>
+    <string name="large">Groß</string>
+    <string name="huge">Größer</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Lade Bilder</string>
-    <string name="pref_desc__load_images">Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern</string>
+    <string name="load_images">Lade Bilder</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Bildschirmrotation</string>
-    <string name="pref_desc__screen_rotation">Kontrolliere die automatische Bildschirmrotation</string>
-    <string name="rotation_system">Standard</string>
-    <string name="rotation_sensor">Sensor\n(System-Einstellungen ignorieren)</string>
-    <string name="rotation_portrait">Hochformat</string>
-    <string name="rotation_landscape">Querformat</string>
+    <string name="screen_rotation">Bildschirmrotation</string>
+    <string name="control_screen_rotation">Kontrolliere die automatische Bildschirmrotation</string>
+    <string name="default_">Standard</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(System-Einstellungen ignorieren)</string>
+    <string name="portrait">Hochformat</string>
+    <string name="landscape">Querformat</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Tor Voreinstellungen laden</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Proxy Einstellungen für Tor (Orbot) HTTP Proxy laden</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Aktiviere Netzwerkproxy</string>
-    <string name="pref_desc__http_proxy_enabled">Nutze einen Proxyserver, um Firewalls zu umgehen.\nDie App muss neu gestartet werden</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">App muss neu gestartet werden um den Proxy zu deaktivieren</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot Proxy Preset geladen</string>
+    <string name="load_tor_preset">Tor Voreinstellungen laden</string>
+    <string name="load_proxy_settins_for_tor">Proxy Einstellungen für Tor (Orbot) HTTP Proxy laden</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Aktiviere Netzwerkproxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Nutze einen Proxyserver, um Firewalls zu umgehen.\nDie App muss neu gestartet werden</string>
+    <string name="host">Host</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">App muss neu gestartet werden um den Proxy zu deaktivieren</string>
+    <string name="orbot_proxy_preset_loaded">Orbot Proxy Preset geladen</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Externe Links mit Chrome Custom Tabs öffnen. Chromium oder Google Chrome muss für dieses Feature installiert sein.\nWICHTIGER HINWEIS: Chrome Custom Tabs verwenden die konfigurierten Proxy-Server nicht!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Externe Links mit Chrome Custom Tabs öffnen. Chromium oder Google Chrome muss für dieses Feature installiert sein.\nWICHTIGER HINWEIS: Chrome Custom Tabs verwenden die konfigurierten Proxy-Server nicht!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Persönliche Einstellungen</string>
-    <string name="pref_desc__personal_settings">Öffne die Einstellungen deines diaspora* Accounts</string>
-    <string name="pref_desc__manage_contacts">Bearbeite deine Kontaktliste</string>
-    <string name="pref_title__manage_tags">Tags verwalten</string>
-    <string name="pref_desc__manage_tags">Bereits verfolgte Hashtags nicht mehr verfolgen</string>
-    <string name="pref_title__change_account">Konto wechseln</string>
-    <string name="pref_desc__change_account">Lösche lokale Sitzungsdaten und wechsele zu einem anderen diaspora* Pod/Benutzerkonto</string>
-    <string name="pref_warning__change_account">Das wird alle Cookies und Sitzungsdaten löschen. Willst du wirklich dein Konto wechseln?</string>
-    <string name="pref_title__clear_cache">Zwischenspeicher leeren</string>
-    <string name="pref_desc__clear_cache">Leert den Zwischenspeicher des WebViews</string>
-    <string name="pref_desc__intellihide_toolbars">Verstecke die obere und untere Werkzeugleiste automatisch, während gescrollt wird</string>
-    <string name="pref_title__intellihide_toolbars">Werkzeugleisten intelligent verstecken</string>
-    <string name="pref_title__append_shared_via_app">Verweise auf App</string>
-    <string name="pref_desc__append_shared_via_app">Füge eine Referenz zu in diese App geteilte Texte hinzu: [via #dandelion]</string>
+    <string name="personal_settings">Persönliche Einstellungen</string>
+    <string name="open_diaspora_account_settings__appspecific">Öffne die Einstellungen deines diaspora* Accounts</string>
+    <string name="manage_your_contact_list">Bearbeite deine Kontaktliste</string>
+    <string name="manage_hashtags">Tags verwalten</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Bereits verfolgte Hashtags nicht mehr verfolgen</string>
+    <string name="change_account">Konto wechseln</string>
+    <string name="loug_warning_description__appspecific">Lösche lokale Sitzungsdaten und wechsele zu einem anderen diaspora* Pod/Benutzerkonto</string>
+    <string name="logout_warning_description">Das wird alle Cookies und Sitzungsdaten löschen. Willst du wirklich dein Konto wechseln?</string>
+    <string name="clear_cache">Zwischenspeicher leeren</string>
+    <string name="clear_webview_cache">Leert den Zwischenspeicher des WebViews</string>
+    <string name="intellihide_toolbars__appspecific">Verstecke die obere und untere Werkzeugleiste automatisch, während gescrollt wird</string>
+    <string name="intellihide_toolbars">Werkzeugleisten intelligent verstecken</string>
+    <string name="append_shared_by_notice">Verweise auf App</string>
+    <string name="append_shared_by_notice__appspecific">Füge eine Referenz zu in diese App geteilte Texte hinzu: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Verschiedenes</string>
-    <string name="pref_title__wipe_settings">Zurücksetzen</string>
-    <string name="pref_desc__wipe_settings">Setze alle Einstellungen der Anwendung zurück und melde alle Konten ab</string>
-    <string name="dialog_content__wipe_settings">Dies wird alle geänderten Einstellungen der Anwendung auf die Standardwerte zurücksetzen und alle Konten abmelden. Deine heruntergeladenen Medien bleiben unberührt. Bist du sicher, dass du fortfahren willst?</string>
-    <string name="pref_desc__adblock_enable">Einfachen Werbeblocker aktivieren. Werbung könnte z.B. in eingebetteten Anzeigen enthalten sein</string>
-    <string name="pref_title__adblock_enable">Werbung blockieren</string>
+    <string name="miscellaneous">Verschiedenes</string>
+    <string name="full_reset">Zurücksetzen</string>
+    <string name="wipe_settings_and_logout">Setze alle Einstellungen der Anwendung zurück und melde alle Konten ab</string>
+    <string name="wipe_settings_warning__appspecific">Dies wird alle geänderten Einstellungen der Anwendung auf die Standardwerte zurücksetzen und alle Konten abmelden. Deine heruntergeladenen Medien bleiben unberührt. Bist du sicher, dass du fortfahren willst?</string>
+    <string name="enable_basic_adblocker_description">Einfachen Werbeblocker aktivieren. Werbung könnte z.B. in eingebetteten Anzeigen enthalten sein</string>
+    <string name="block_advertisments">Werbung blockieren</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 35864c3d..65eb2af1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -76,45 +76,45 @@
     <string name="pref_summary__show_title">Mostrar título en la vista princial</string>
     <string name="pref_title__show_title">Mostrar título</string>
 
-    <string name="about_activity__title_about_app">Acerca de</string>
-    <string name="about_activity__title_about_license">Licencia</string>
-    <string name="about_activity__title_debug_info">Depurando</string>
-    <string name="fragment_debug__section_app">Aplicación</string>
-    <string name="fragment_debug__section_device">Dispositivo</string>
-    <string name="fragment_debug__section_pod">Pod de diaspora*</string>
-    <string name="fragment_debug__section_log">Depurar registro</string>
-    <string name="fragment_debug__section_log_spam">Depurar registro (Detallado)</string>
-    <string name="fragment_debug__app_version">Versión aplicación:%1$s</string>
-    <string name="fragment_debug__android_version">Versión de Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nombre del dispositivo: %1$s</string>
-    <string name="fragment_debug__app_codename">Nombre clave: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Nombre de perfil del pod: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Dominio del pod:%1$s</string>
-    <string name="fragment_debug__toast_log_copied">Registro de depuración copiado al portapapeles</string>
-    <string name="fragment_about__about_text">dandelion* es su complemento para navegar por la red social diapora*. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social.</string>
-    <string name="fragment_about__contribute">¡Contribuir con código!</string>
-    <string name="fragment_about__contribute_text">dandelion* se desarrolla libre, en el sentido de libertad, y sigue las ideas del proyecto diaspora*. Si usted quiere contribuir, ¡adelante! Actualmente somos un equipo muy pequeño, por lo que ¡agradeceríamos mucho cualquier tipo de ayuda!</string>
-    <string name="fragment_about__contribute_button">Obtener el código fuente</string>
-    <string name="fragment_about__translate">¡Traducir la aplicación!</string>
-    <string name="fragment_about__translate_text">¿La aplicación no está disponible en su idioma? ¡Usted puede cambiar eso! ¿Por qué no nos ayuda traduciéndola? Utilizamos la plataforma crowdin para permitir a cualquiera traducir la aplicación.</string>
-    <string name="fragment_about__translate_button">Permítanme traducir</string>
-    <string name="fragment_about__feedback">Danos tu opinión!</string>
-    <string name="fragment_about__feedback_text">dandelion* todavía está en desarrollo, así que si tiene sugerencias o cualquier tipo de comentarios, ¡utilice nuestro gestor de errores para hacérnoslo saber!</string>
-    <string name="fragment_about__feedback_button">Reporte de errores</string>
-    <string name="fragment_about__spread_the_word">¡Corre la voz!</string>
-    <string name="fragment_about__spread_the_word_text">¡Hable a sus amigos y familiares acerca de diaspora* y #dandelion! ¿Por qué no difunde sus experiencias? ¡Nos encantaría escucharle!</string>
-    <string name="fragment_about__spread_the_word_button">Compartir la aplicación</string>
-    <string name="fragment_about__spread_the_word_share_text">¡Hey! ¡Mira #dandelion! %1$s</string>
+    <string name="about">Acerca de</string>
+    <string name="license">Licencia</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicación</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Pod de diaspora*</string>
+    <string name="debug_log">Depurar registro</string>
+    <string name="debug_log_verbose">Depurar registro (Detallado)</string>
+    <string name="app_version_with_arg">Versión aplicación:%1$s</string>
+    <string name="android_version_witharg">Versión de Android: %1$s</string>
+    <string name="device_name_witharg">Nombre del dispositivo: %1$s</string>
+    <string name="code_name_witharg">Nombre clave: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nombre de perfil del pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio del pod:%1$s</string>
+    <string name="debug_log_copied_to_clipboard">Registro de depuración copiado al portapapeles</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* es su complemento para navegar por la red social diapora*. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social.</string>
+    <string name="contribute_code">¡Contribuir con código!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* se desarrolla libre, en el sentido de libertad, y sigue las ideas del proyecto diaspora*. Si usted quiere contribuir, ¡adelante! Actualmente somos un equipo muy pequeño, por lo que ¡agradeceríamos mucho cualquier tipo de ayuda!</string>
+    <string name="get_the_source">Obtener el código fuente</string>
+    <string name="translate_the_app">¡Traducir la aplicación!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">¿La aplicación no está disponible en su idioma? ¡Usted puede cambiar eso! ¿Por qué no nos ayuda traduciéndola? Utilizamos la plataforma crowdin para permitir a cualquiera traducir la aplicación.</string>
+    <string name="let_me_translate">Permítanme traducir</string>
+    <string name="give_feedback">Danos tu opinión!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* todavía está en desarrollo, así que si tiene sugerencias o cualquier tipo de comentarios, ¡utilice nuestro gestor de errores para hacérnoslo saber!</string>
+    <string name="report_bugs">Reporte de errores</string>
+    <string name="spread_the_word">¡Corre la voz!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">¡Hable a sus amigos y familiares acerca de diaspora* y #dandelion! ¿Por qué no difunde sus experiencias? ¡Nos encantaría escucharle!</string>
+    <string name="share_the_app">Compartir la aplicación</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">¡Hey! ¡Mira #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Mantenimiento</string>
-    <string name="fragment_license__maintainers_text">Esta aplicación está siendo desarrollada y mantenida por &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="fragment_license__contributors">Colaboradores</string>
-    <string name="fragment_license__contributors_thank_you">¡%1$s &lt; br &gt;&lt; br &gt; Gracias!</string>
-    <string name="fragment_license__license_button">Licencia GNU GPLv3 +</string>
-    <string name="fragment_license__thirdparty_libs">Bibliotecas de terceros</string>
-    <string name="fragment_license__thirdparty_libs_text">Se utilizan las siguientes bibliotecas:</string>
-    <string name="fragment_license__misc_leafpic">Tomamos algo de inspiración y código de LeafPic. ¡Venga, tomad prestado, es software libre también!</string>
-    <string name="fragment_license__misc_leafpic_button">Saber más</string>
+    <string name="maintainers">Mantenimiento</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está siendo desarrollada y mantenida por &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Colaboradores</string>
+    <string name="thank_you_witharg">¡%1$s &lt; br &gt;&lt; br &gt; Gracias!</string>
+    <string name="gnu_gplv3_license">Licencia GNU GPLv3 +</string>
+    <string name="show_third_party_licenses">Bibliotecas de terceros</string>
+    <string name="the_following_libraries_are_used">Se utilizan las siguientes bibliotecas:</string>
+    <string name="inspiration_from_leafpic__appspecific">Tomamos algo de inspiración y código de LeafPic. ¡Venga, tomad prestado, es software libre también!</string>
+    <string name="tell_me_more">Saber más</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -139,62 +139,62 @@
     <string name="pref_desc__primary_color">Color de las barras de herramientas</string>
     <string name="pref_title__accent_color">Color de Énfasis</string>
     <string name="pref_desc__accent_color">Color de la barra de progreso</string>
-    <string name="pref_title__primary_color__amoled_mode">Modo AMOLED</string>
+    <string name="amoled_mode">Modo AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Substituir el color negro en varias partes de la app con uno compatible con pantallas AMOLED. Necesitarás reiniciar la app para alternar ésta opcion. Para navegar diaspora* con un tema oscuro, lo necesitarás habilitar en tu panel de configuraciones personales de cuenta diaspora*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notificaciones extendidas</string>
-    <string name="pref_desc__extended_notifications">Extender la campana de notificaciones con un menú desplegable que muestra categorías de notificación</string>
-    <string name="pref_desc__language">Cambiar el idioma de esta aplicación. Reinicie la aplicación para que los cambios surtan efecto</string>
-    <string name="pref_title__language">Idioma</string>
-    <string name="language_system">Idioma del sistema</string>
+    <string name="extended_notifications">Notificaciones extendidas</string>
+    <string name="extendend_notifications_bell_description__appspecific">Extender la campana de notificaciones con un menú desplegable que muestra categorías de notificación</string>
+    <string name="language_change_restart_description">Cambiar el idioma de esta aplicación. Reinicie la aplicación para que los cambios surtan efecto</string>
+    <string name="language">Idioma</string>
+    <string name="system_language">Idioma del sistema</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Control del tamaño del texto de la vista Web</string>
-    <string name="pref_title__font_size">Tamaño de letra</string>
-    <string name="font_size_normal">Tamaño normal</string>
-    <string name="font_size_large">Tamaño grande</string>
-    <string name="font_size_huge">Tamaño enorme</string>
+    <string name="control_textsize_of_webview">Control del tamaño del texto de la vista Web</string>
+    <string name="font_size">Tamaño de letra</string>
+    <string name="normal">Tamaño normal</string>
+    <string name="large">Tamaño grande</string>
+    <string name="huge">Tamaño enorme</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Cargar imágenes</string>
-    <string name="pref_desc__load_images">Desactivar la carga de de imágenes a datos móviles seguros</string>
+    <string name="load_images">Cargar imágenes</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Desactivar la carga de de imágenes a datos móviles seguros</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotación de la pantalla</string>
-    <string name="pref_desc__screen_rotation">Controlar la rotación automática de la pantalla</string>
-    <string name="rotation_system">Predeterminado</string>
-    <string name="rotation_sensor">Sensor\n(ignorar la configuración de la sistema)</string>
-    <string name="rotation_portrait">Vertical</string>
-    <string name="rotation_landscape">Apaisado</string>
+    <string name="screen_rotation">Rotación de la pantalla</string>
+    <string name="control_screen_rotation">Controlar la rotación automática de la pantalla</string>
+    <string name="default_">Predeterminado</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignorar la configuración de la sistema)</string>
+    <string name="portrait">Vertical</string>
+    <string name="landscape">Apaisado</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Cargar Tor predeterminado</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Cargar la configuración del proxy de Tor (Orbot) HTTP Proxy</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Activar proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Tráfico del proxy de dandelion* evadiendo el cortafuegos.\nPuede requerir reiniciar. Puede no funcionar en algunos teléfonos.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Puerto</string>
-    <string name="toast__proxy_disabled__restart_required">La aplicación necesita reiniciar para deshabilitar el uso de proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Cargado proxy Orbot predeterminado</string>
+    <string name="load_tor_preset">Cargar Tor predeterminado</string>
+    <string name="load_proxy_settins_for_tor">Cargar la configuración del proxy de Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Activar proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Tráfico del proxy de dandelion* evadiendo el cortafuegos.\nPuede requerir reiniciar. Puede no funcionar en algunos teléfonos.</string>
+    <string name="host">Host</string>
+    <string name="port">Puerto</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">La aplicación necesita reiniciar para deshabilitar el uso de proxy</string>
+    <string name="orbot_proxy_preset_loaded">Cargado proxy Orbot predeterminado</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Abrir vínculos externos con barras personalizadas de Chrome. Chromium o Google Chrome deben estar instalados para utilizar esta característica. \nNOTA IMPORTANTE: ¡ las barras personalizadas de Chrome no usan servidores proxy configurados!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Abrir vínculos externos con barras personalizadas de Chrome. Chromium o Google Chrome deben estar instalados para utilizar esta característica. \nNOTA IMPORTANTE: ¡ las barras personalizadas de Chrome no usan servidores proxy configurados!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Configuración personal</string>
-    <string name="pref_desc__personal_settings">Abre la configuración de tu cuenta de diaspora*</string>
-    <string name="pref_desc__manage_contacts">Administrar su lista de contactos</string>
-    <string name="pref_title__manage_tags">Manejar etiquetas</string>
-    <string name="pref_desc__manage_tags">Dejar de seguir las etiquetas seguidas</string>
-    <string name="pref_title__change_account">Cambiar cuenta</string>
-    <string name="pref_desc__change_account">Borrar datos de la sesión local y cambiar a otro pod/cuenta de diaspora*</string>
-    <string name="pref_warning__change_account">Esto borrará todas las cookies y datos de la sesión. ¿Realmente deseas cambiar tu cuenta?</string>
-    <string name="pref_title__clear_cache">Limpiar caché</string>
-    <string name="pref_desc__clear_cache">Borrar caché de vista Web</string>
-    <string name="pref_desc__intellihide_toolbars">Ocultar barras de herramientas superior e inferior automáticamente mientras se desplaza</string>
-    <string name="pref_title__intellihide_toolbars">Barra de herramientas Intellihide</string>
-    <string name="pref_title__append_shared_via_app">Añadir compartido por aviso</string>
-    <string name="pref_desc__append_shared_via_app">Agregar una referencia a esta aplicación en los textos compartidos: [vía #dandelion]</string>
+    <string name="personal_settings">Configuración personal</string>
+    <string name="open_diaspora_account_settings__appspecific">Abre la configuración de tu cuenta de diaspora*</string>
+    <string name="manage_your_contact_list">Administrar su lista de contactos</string>
+    <string name="manage_hashtags">Manejar etiquetas</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Dejar de seguir las etiquetas seguidas</string>
+    <string name="change_account">Cambiar cuenta</string>
+    <string name="loug_warning_description__appspecific">Borrar datos de la sesión local y cambiar a otro pod/cuenta de diaspora*</string>
+    <string name="logout_warning_description">Esto borrará todas las cookies y datos de la sesión. ¿Realmente deseas cambiar tu cuenta?</string>
+    <string name="clear_cache">Limpiar caché</string>
+    <string name="clear_webview_cache">Borrar caché de vista Web</string>
+    <string name="intellihide_toolbars__appspecific">Ocultar barras de herramientas superior e inferior automáticamente mientras se desplaza</string>
+    <string name="intellihide_toolbars">Barra de herramientas Intellihide</string>
+    <string name="append_shared_by_notice">Añadir compartido por aviso</string>
+    <string name="append_shared_by_notice__appspecific">Agregar una referencia a esta aplicación en los textos compartidos: [vía #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Diverso</string>
-    <string name="pref_title__wipe_settings">Reinicio completo</string>
-    <string name="pref_desc__wipe_settings">Borrar localmente toda la configuración relacionada con la aplicación y cerrar sesión en todas las cuentas</string>
-    <string name="dialog_content__wipe_settings">Esto restablecerá todas las modificaciones en la configuración a sus valores predeterminados y se desconectará de todos los pods. Las imágenes descargadas permanecerán intactas. ¿Está seguro de que desea continuar?</string>
-    <string name="pref_desc__adblock_enable">Habilitar bloqueador de publicidad básico. Publicidad podrá ser incluida p.ej. en vistas incrustadas</string>
-    <string name="pref_title__adblock_enable">Bloquear publicidad</string>
+    <string name="miscellaneous">Diverso</string>
+    <string name="full_reset">Reinicio completo</string>
+    <string name="wipe_settings_and_logout">Borrar localmente toda la configuración relacionada con la aplicación y cerrar sesión en todas las cuentas</string>
+    <string name="wipe_settings_warning__appspecific">Esto restablecerá todas las modificaciones en la configuración a sus valores predeterminados y se desconectará de todos los pods. Las imágenes descargadas permanecerán intactas. ¿Está seguro de que desea continuar?</string>
+    <string name="enable_basic_adblocker_description">Habilitar bloqueador de publicidad básico. Publicidad podrá ser incluida p.ej. en vistas incrustadas</string>
+    <string name="block_advertisments">Bloquear publicidad</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a1947d5d..a49ce1f4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -79,45 +79,45 @@
     <string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
     <string name="launcher_shortcut">Raccourci de l\'écran d\'accueil</string>
 
-    <string name="about_activity__title_about_app">À propos</string>
-    <string name="about_activity__title_about_license">Licence</string>
-    <string name="about_activity__title_debug_info">Déboguer</string>
-    <string name="fragment_debug__section_app">Application</string>
-    <string name="fragment_debug__section_device">Appareil</string>
-    <string name="fragment_debug__section_pod">Pod diaspora*</string>
-    <string name="fragment_debug__section_log">Journal de débogage</string>
-    <string name="fragment_debug__section_log_spam">Log de débogage (Verbeux)</string>
-    <string name="fragment_debug__app_version">Version app : %1$s</string>
-    <string name="fragment_debug__android_version">Version Android : %1$s</string>
-    <string name="fragment_debug__device_name">Nom de l\'appareil : %1$s</string>
-    <string name="fragment_debug__app_codename">Nom de code : %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod alias : %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Adresse du pod : %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Journal de débogage copié dans le presse-papiers</string>
-    <string name="fragment_about__about_text">dandelion* est votre application compagnon pour naviguer sur le réseau social diaspora*. Il ajoute des fonctionnalités telles que des barres d’outils utiles et la prise en charge pour les serveurs proxy comme le réseau Tor à votre expérience sociale.</string>
-    <string name="fragment_about__contribute">Contribuez au code !</string>
-    <string name="fragment_about__contribute_text">dandelion* est libre, et suit les idées du projet diaspora*. Si vous voulez contribuer, allez-y ! Actuellement, nous sommes une toute petite équipe, donc nous apprécierions tout type d\'aide !</string>
-    <string name="fragment_about__contribute_button">Obtenir la source</string>
-    <string name="fragment_about__translate">Traduire l\'application !</string>
-    <string name="fragment_about__translate_text">L’application n’est pas disponible dans votre langue ? Vous pouvez changer cela ! Pourquoi ne pas nous aider à la traduire ? Nous utilisons la plate-forme crowdin pour permettre à quiconque de traduire l’application.</string>
-    <string name="fragment_about__translate_button">Je voudrais traduire</string>
-    <string name="fragment_about__feedback">Donnez votre avis !</string>
-    <string name="fragment_about__feedback_text">dandelion* est encore en développement, donc si vous avez des suggestions ou n’importe quel genre de retour, veuillez utiliser notre traqueur de bogues pour nous le faire savoir !</string>
-    <string name="fragment_about__feedback_button">Signaler un bug</string>
-    <string name="fragment_about__spread_the_word">Faîtes passer le mot !</string>
-    <string name="fragment_about__spread_the_word_text">Parlez de diaspora* et #dandelion à vos amis et votre famille ! Pourquoi ne pas bloguer à propos de votre expérience ? Nous aimerions la lire !</string>
-    <string name="fragment_about__spread_the_word_button">Partager cette application</string>
-    <string name="fragment_about__spread_the_word_share_text">Hé ! Découvrez #dandelion ! %1$s</string>
+    <string name="about">À propos</string>
+    <string name="license">Licence</string>
+    <string name="debugging">Déboguer</string>
+    <string name="application">Application</string>
+    <string name="device">Appareil</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Journal de débogage</string>
+    <string name="debug_log_verbose">Log de débogage (Verbeux)</string>
+    <string name="app_version_with_arg">Version app : %1$s</string>
+    <string name="android_version_witharg">Version Android : %1$s</string>
+    <string name="device_name_witharg">Nom de l\'appareil : %1$s</string>
+    <string name="code_name_witharg">Nom de code : %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod alias : %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Adresse du pod : %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Journal de débogage copié dans le presse-papiers</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* est votre application compagnon pour naviguer sur le réseau social diaspora*. Il ajoute des fonctionnalités telles que des barres d’outils utiles et la prise en charge pour les serveurs proxy comme le réseau Tor à votre expérience sociale.</string>
+    <string name="contribute_code">Contribuez au code !</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* est libre, et suit les idées du projet diaspora*. Si vous voulez contribuer, allez-y ! Actuellement, nous sommes une toute petite équipe, donc nous apprécierions tout type d\'aide !</string>
+    <string name="get_the_source">Obtenir la source</string>
+    <string name="translate_the_app">Traduire l\'application !</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">L’application n’est pas disponible dans votre langue ? Vous pouvez changer cela ! Pourquoi ne pas nous aider à la traduire ? Nous utilisons la plate-forme crowdin pour permettre à quiconque de traduire l’application.</string>
+    <string name="let_me_translate">Je voudrais traduire</string>
+    <string name="give_feedback">Donnez votre avis !</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* est encore en développement, donc si vous avez des suggestions ou n’importe quel genre de retour, veuillez utiliser notre traqueur de bogues pour nous le faire savoir !</string>
+    <string name="report_bugs">Signaler un bug</string>
+    <string name="spread_the_word">Faîtes passer le mot !</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Parlez de diaspora* et #dandelion à vos amis et votre famille ! Pourquoi ne pas bloguer à propos de votre expérience ? Nous aimerions la lire !</string>
+    <string name="share_the_app">Partager cette application</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hé ! Découvrez #dandelion ! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Mainteneurs</string>
-    <string name="fragment_license__maintainers_text">Cette application est actuellement développée et maintenue par &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Contributeurs</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Merci !</string>
-    <string name="fragment_license__license_button">Licence GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Bibliothèques tierces</string>
-    <string name="fragment_license__thirdparty_libs_text">Les bibliothèques suivantes sont utilisées :</string>
-    <string name="fragment_license__misc_leafpic">Nous avons pris des inspirations et du code de LeafPic. Allez voir, c\'est aussi un logiciel libre !</string>
-    <string name="fragment_license__misc_leafpic_button">En savoir plus</string>
+    <string name="maintainers">Mainteneurs</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Cette application est actuellement développée et maintenue par &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contributeurs</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Merci !</string>
+    <string name="gnu_gplv3_license">Licence GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Bibliothèques tierces</string>
+    <string name="the_following_libraries_are_used">Les bibliothèques suivantes sont utilisées :</string>
+    <string name="inspiration_from_leafpic__appspecific">Nous avons pris des inspirations et du code de LeafPic. Allez voir, c\'est aussi un logiciel libre !</string>
+    <string name="tell_me_more">En savoir plus</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -142,62 +142,62 @@
     <string name="pref_desc__primary_color">Couleur des barres d\'outils</string>
     <string name="pref_title__accent_color">Couleur secondaire</string>
     <string name="pref_desc__accent_color">Couleur de la barre de progression</string>
-    <string name="pref_title__primary_color__amoled_mode">Mode AMOLED</string>
+    <string name="amoled_mode">Mode AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Remplacez les couleurs avec du noir compatible avec les affichages AMOLED, sur plusieurs parties de l\'application. Pour naviguer dans diaspora* avec un affichage sombre, vous pouvez aussi utiliser le thème Dark, que vous trouverez dans vos paramètres personnels de votre compte diaspora*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notifications étendues</string>
-    <string name="pref_desc__extended_notifications">Étendre la cloche de notifications avec un menu déroulant qui affiche les catégories de notification</string>
-    <string name="pref_desc__language">Change la langue de l\'application. Redémarrez l\'application pour que les changements prennent effet</string>
-    <string name="pref_title__language">Langue</string>
-    <string name="language_system">Langue du système</string>
+    <string name="extended_notifications">Notifications étendues</string>
+    <string name="extendend_notifications_bell_description__appspecific">Étendre la cloche de notifications avec un menu déroulant qui affiche les catégories de notification</string>
+    <string name="language_change_restart_description">Change la langue de l\'application. Redémarrez l\'application pour que les changements prennent effet</string>
+    <string name="language">Langue</string>
+    <string name="system_language">Langue du système</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Contrôle de la taille du texte pour l\'affichage web</string>
-    <string name="pref_title__font_size">Taille de la police</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Large</string>
-    <string name="font_size_huge">Très grand</string>
+    <string name="control_textsize_of_webview">Contrôle de la taille du texte pour l\'affichage web</string>
+    <string name="font_size">Taille de la police</string>
+    <string name="normal">Normal</string>
+    <string name="large">Large</string>
+    <string name="huge">Très grand</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Charger les images</string>
-    <string name="pref_desc__load_images">Désactiver le chargements des images pour préserver la data mobile</string>
+    <string name="load_images">Charger les images</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Désactiver le chargements des images pour préserver la data mobile</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotation de l\'écran</string>
-    <string name="pref_desc__screen_rotation">Rotation automatique de l\'écran</string>
-    <string name="rotation_system">Par défaut</string>
-    <string name="rotation_sensor">Capteur\n(ignore les paramètres du système)</string>
-    <string name="rotation_portrait">Portrait</string>
-    <string name="rotation_landscape">Paysage</string>
+    <string name="screen_rotation">Rotation de l\'écran</string>
+    <string name="control_screen_rotation">Rotation automatique de l\'écran</string>
+    <string name="default_">Par défaut</string>
+    <string name="sensor_ignore_system_settings">Capteur\n(ignore les paramètres du système)</string>
+    <string name="portrait">Portrait</string>
+    <string name="landscape">Paysage</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Charger la pré-configuration Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Charger les paramètres proxy pour Tor (Orbot) HTTP Proxy</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Activer Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy pour dandelion* pour contourner les pare-feux.\nPeut nécessiter un redémarrage</string>
-    <string name="pref_title__http_proxy_host">Hôte</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">L\'application a besoin d\'être redémarrée pour désactiver l\'usage du proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Préréglages proxy Orbot chargés</string>
+    <string name="load_tor_preset">Charger la pré-configuration Tor</string>
+    <string name="load_proxy_settins_for_tor">Charger les paramètres proxy pour Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Activer Proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy pour dandelion* pour contourner les pare-feux.\nPeut nécessiter un redémarrage</string>
+    <string name="host">Hôte</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">L\'application a besoin d\'être redémarrée pour désactiver l\'usage du proxy</string>
+    <string name="orbot_proxy_preset_loaded">Préréglages proxy Orbot chargés</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Ouvrez les liens externes avec Chrome Custom Tabs. Chromium ou Google Chrome doit être installé pour cette fonctionnalité. \nNOTE IMPORTANTE : Chrome Custom Tabs n\'utilisent pas les serveurs proxy configurés !</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Ouvrez les liens externes avec Chrome Custom Tabs. Chromium ou Google Chrome doit être installé pour cette fonctionnalité. \nNOTE IMPORTANTE : Chrome Custom Tabs n\'utilisent pas les serveurs proxy configurés !</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Paramètres personnels</string>
-    <string name="pref_desc__personal_settings">Ouvrir vos paramètres de compte diaspora*</string>
-    <string name="pref_desc__manage_contacts">Gérez vos contacts</string>
-    <string name="pref_title__manage_tags">Gérer les Hashtags</string>
-    <string name="pref_desc__manage_tags">Ne plus suivre les tags suivis</string>
-    <string name="pref_title__change_account">Changer de compte</string>
-    <string name="pref_desc__change_account">Effacer les données de session locale et passer à un autre pod/compte diaspora*</string>
-    <string name="pref_warning__change_account">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod?</string>
-    <string name="pref_title__clear_cache">Vider le cache</string>
-    <string name="pref_desc__clear_cache">Vider le cache</string>
-    <string name="pref_desc__intellihide_toolbars">Masquer les barres d’outils en haut et en bas automatiquement lors du défilement</string>
-    <string name="pref_title__intellihide_toolbars">Masquer la barre d\'outils</string>
-    <string name="pref_title__append_shared_via_app">Ajouter partagé par avis-</string>
-    <string name="pref_desc__append_shared_via_app">Ajouter une référence à cette application aux partages: [via #dandelion]</string>
+    <string name="personal_settings">Paramètres personnels</string>
+    <string name="open_diaspora_account_settings__appspecific">Ouvrir vos paramètres de compte diaspora*</string>
+    <string name="manage_your_contact_list">Gérez vos contacts</string>
+    <string name="manage_hashtags">Gérer les Hashtags</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Ne plus suivre les tags suivis</string>
+    <string name="change_account">Changer de compte</string>
+    <string name="loug_warning_description__appspecific">Effacer les données de session locale et passer à un autre pod/compte diaspora*</string>
+    <string name="logout_warning_description">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod?</string>
+    <string name="clear_cache">Vider le cache</string>
+    <string name="clear_webview_cache">Vider le cache</string>
+    <string name="intellihide_toolbars__appspecific">Masquer les barres d’outils en haut et en bas automatiquement lors du défilement</string>
+    <string name="intellihide_toolbars">Masquer la barre d\'outils</string>
+    <string name="append_shared_by_notice">Ajouter partagé par avis-</string>
+    <string name="append_shared_by_notice__appspecific">Ajouter une référence à cette application aux partages: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Divers</string>
-    <string name="pref_title__wipe_settings">Réinitialisation complète</string>
-    <string name="pref_desc__wipe_settings">Effacer localement tous les réglages relatifs à l\'application et déconnexion de tous les comptes</string>
-    <string name="dialog_content__wipe_settings">Ceci va réinitialiser tous les changements à leurs valeurs par défaut et vous déconnecter de tous les pods. Vos images téléchargées resteront intactes. Êtes-vous sûr de vouloir continuer ?</string>
-    <string name="pref_desc__adblock_enable">Activer un bloqueur de pub. Des pubs peuvent être incluses, dans des vues embarquées par exemple</string>
-    <string name="pref_title__adblock_enable">Bloquer les publicités</string>
+    <string name="miscellaneous">Divers</string>
+    <string name="full_reset">Réinitialisation complète</string>
+    <string name="wipe_settings_and_logout">Effacer localement tous les réglages relatifs à l\'application et déconnexion de tous les comptes</string>
+    <string name="wipe_settings_warning__appspecific">Ceci va réinitialiser tous les changements à leurs valeurs par défaut et vous déconnecter de tous les pods. Vos images téléchargées resteront intactes. Êtes-vous sûr de vouloir continuer ?</string>
+    <string name="enable_basic_adblocker_description">Activer un bloqueur de pub. Des pubs peuvent être incluses, dans des vues embarquées par exemple</string>
+    <string name="block_advertisments">Bloquer les publicités</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 42852426..6dd6cbf4 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -83,45 +83,45 @@
     <string name="pref_title__show_title">Mostrar título</string>
 	<string name="launcher_shortcut">Atallo do lanzador</string>
 
-    <string name="about_activity__title_about_app">Sobre</string>
-    <string name="about_activity__title_about_license">Licenza</string>
-    <string name="about_activity__title_debug_info">Depurando</string>
-    <string name="fragment_debug__section_app">Aplicación</string>
-    <string name="fragment_debug__section_device">Dispositivo</string>
-    <string name="fragment_debug__section_pod">Nodo diaspora*</string>
-    <string name="fragment_debug__section_log">Rexistro de depuración</string>
-    <string name="fragment_debug__section_log_spam">Rexistro de depuración (polo miúdo)</string>
-    <string name="fragment_debug__app_version">Versión do App: %1$s</string>
-    <string name="fragment_debug__android_version">Versión Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nome do dispositivo: %1$s</string>
-    <string name="fragment_debug__app_codename">Alcume: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Nome do perfil do nodo: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Dominio do nodo: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Ficheiro de depuración copiado ao portapapeis</string>
-    <string name="fragment_about__about_text">dandelion* é a súa aplicación para a rede social diaspora*. Engade características como barras de ferramentas e soporte para servidores proxy como a rede Tor para a súa experiencia social.</string>
-    <string name="fragment_about__contribute">Contribúa ao código!</string>
-    <string name="fragment_about__contribute_text">dandelion* é desenvolto libre, libre de Liberdade, e segue o espíritu que marca o proxecto diaspora*. Se quere contribuír, adiante! Por agora somos un equipo pequeno, así que agradecemos calquer tipo de axuda!</string>
-    <string name="fragment_about__contribute_button">Obteña as fontes</string>
-    <string name="fragment_about__translate">Traduza o app!</string>
-    <string name="fragment_about__translate_text">Non está a aplicación no seu idioma? Pode cambiar eso! Por qué non nos axuda traducíndoa? Utilizamos a plataforma github para que calquera poida traducir a app.</string>
-    <string name="fragment_about__translate_button">Deixame traducir</string>
-    <string name="fragment_about__feedback">Qué lle parece!</string>
-    <string name="fragment_about__feedback_text">dandelion* aínda está en desenvolvemento, asi que si ten suxerencias de calquer tipo o valoración, por favor utilice o noso xestor de erros para facérnolo saber!</string>
-    <string name="fragment_about__feedback_button">Reporte erros</string>
-    <string name="fragment_about__spread_the_word">Difunda!</string>
-    <string name="fragment_about__spread_the_word_text">Dígalle aos seus amigos e familiares que utiliza diaspora* e #dandelion! Por qué no escribir sobre a experiencia? Encantaríanos saber de vostede!</string>
-    <string name="fragment_about__spread_the_word_button">Comparta a aplicación</string>
-    <string name="fragment_about__spread_the_word_share_text">Ei!! Olla a #dandelion! %1$s</string>
+    <string name="about">Sobre</string>
+    <string name="license">Licenza</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicación</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Nodo diaspora*</string>
+    <string name="debug_log">Rexistro de depuración</string>
+    <string name="debug_log_verbose">Rexistro de depuración (polo miúdo)</string>
+    <string name="app_version_with_arg">Versión do App: %1$s</string>
+    <string name="android_version_witharg">Versión Android: %1$s</string>
+    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
+    <string name="code_name_witharg">Alcume: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nome do perfil do nodo: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio do nodo: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Ficheiro de depuración copiado ao portapapeis</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* é a súa aplicación para a rede social diaspora*. Engade características como barras de ferramentas e soporte para servidores proxy como a rede Tor para a súa experiencia social.</string>
+    <string name="contribute_code">Contribúa ao código!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* é desenvolto libre, libre de Liberdade, e segue o espíritu que marca o proxecto diaspora*. Se quere contribuír, adiante! Por agora somos un equipo pequeno, así que agradecemos calquer tipo de axuda!</string>
+    <string name="get_the_source">Obteña as fontes</string>
+    <string name="translate_the_app">Traduza o app!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Non está a aplicación no seu idioma? Pode cambiar eso! Por qué non nos axuda traducíndoa? Utilizamos a plataforma github para que calquera poida traducir a app.</string>
+    <string name="let_me_translate">Deixame traducir</string>
+    <string name="give_feedback">Qué lle parece!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* aínda está en desenvolvemento, asi que si ten suxerencias de calquer tipo o valoración, por favor utilice o noso xestor de erros para facérnolo saber!</string>
+    <string name="report_bugs">Reporte erros</string>
+    <string name="spread_the_word">Difunda!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Dígalle aos seus amigos e familiares que utiliza diaspora* e #dandelion! Por qué no escribir sobre a experiencia? Encantaríanos saber de vostede!</string>
+    <string name="share_the_app">Comparta a aplicación</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ei!! Olla a #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Mantedores</string>
-    <string name="fragment_license__maintainers_text">Esta aplicación está a ser desenvolta e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Contribúen</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Grazas!</string>
-    <string name="fragment_license__license_button">Licenza GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Código de terceiras partes</string>
-    <string name="fragment_license__thirdparty_libs_text">Utilízase o seguinte código:</string>
-    <string name="fragment_license__misc_leafpic">Inspirámonos e collemos código de LeafPic. Bótalle un ollo, tamén é software libre!</string>
-    <string name="fragment_license__misc_leafpic_button">Cóntame máis</string>
+    <string name="maintainers">Mantedores</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está a ser desenvolta e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contribúen</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazas!</string>
+    <string name="gnu_gplv3_license">Licenza GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Código de terceiras partes</string>
+    <string name="the_following_libraries_are_used">Utilízase o seguinte código:</string>
+    <string name="inspiration_from_leafpic__appspecific">Inspirámonos e collemos código de LeafPic. Bótalle un ollo, tamén é software libre!</string>
+    <string name="tell_me_more">Cóntame máis</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -146,62 +146,62 @@
     <string name="pref_desc__primary_color">Cor das barras de ferramentas</string>
     <string name="pref_title__accent_color">Cor de énfase</string>
     <string name="pref_desc__accent_color">Cor da barra de progreso</string>
-    <string name="pref_title__primary_color__amoled_mode">Modo AMOLED</string>
+    <string name="amoled_mode">Modo AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Sobreescribir as cores co negro dos dispositivos AMOLED en varios lugares da aplicación. Precisa reiniciar para habilitar esta preferencia. Para navegar diaspora* en modo oscuro tamén precisa activar o Decorado Oscuro, que pode atopar nos axustes personais na súa conta de diaspora*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notificacións extendidas</string>
-    <string name="pref_desc__extended_notifications">Extender a icona da campá de notificación con un menú desplegable que mostre a categoría das notificacións</string>
-    <string name="pref_desc__language">Cambiar o idioma de esta aplicación. Reinicie para que se aplique o troco</string>
-    <string name="pref_title__language">Idioma</string>
-    <string name="language_system">Idioma do sistema</string>
+    <string name="extended_notifications">Notificacións extendidas</string>
+    <string name="extendend_notifications_bell_description__appspecific">Extender a icona da campá de notificación con un menú desplegable que mostre a categoría das notificacións</string>
+    <string name="language_change_restart_description">Cambiar o idioma de esta aplicación. Reinicie para que se aplique o troco</string>
+    <string name="language">Idioma</string>
+    <string name="system_language">Idioma do sistema</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Estableza o tamaño do texto na Vista Web</string>
-    <string name="pref_title__font_size">Tamaño do texto</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Grande</string>
-    <string name="font_size_huge">Enorme</string>
+    <string name="control_textsize_of_webview">Estableza o tamaño do texto na Vista Web</string>
+    <string name="font_size">Tamaño do texto</string>
+    <string name="normal">Normal</string>
+    <string name="large">Grande</string>
+    <string name="huge">Enorme</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Cargar imaxes</string>
-    <string name="pref_desc__load_images">Xestionar a carga de imaxes por ex. para aforrar datos do móbil</string>
+    <string name="load_images">Cargar imaxes</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Xestionar a carga de imaxes por ex. para aforrar datos do móbil</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotación da pantalla</string>
-    <string name="pref_desc__screen_rotation">Controlar a rotación automática da pantalla</string>
-    <string name="rotation_system">Por omisión</string>
-    <string name="rotation_sensor">Sensor\n(ignorar axustes do dispositivo)</string>
-    <string name="rotation_portrait">Retrato</string>
-    <string name="rotation_landscape">Paisaxe</string>
+    <string name="screen_rotation">Rotación da pantalla</string>
+    <string name="control_screen_rotation">Controlar a rotación automática da pantalla</string>
+    <string name="default_">Por omisión</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignorar axustes do dispositivo)</string>
+    <string name="portrait">Retrato</string>
+    <string name="landscape">Paisaxe</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Cargar perfil Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Cargar axustes proxy para Tor (Orbot) HTTP Proxy</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Habilitar Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy para o tráfico de dandelion* para saltar cortalumes.\nPodería precisar reinicio. Esto podería non funcionar en algúns móbiles.</string>
-    <string name="pref_title__http_proxy_host">Servidor</string>
-    <string name="pref_title__http_proxy_port">Porto</string>
-    <string name="toast__proxy_disabled__restart_required">Precisa reiniciar o app para deshabilitar o uso do proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Cargadas as preferencias do proxy Orbot</string>
+    <string name="load_tor_preset">Cargar perfil Tor</string>
+    <string name="load_proxy_settins_for_tor">Cargar axustes proxy para Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Habilitar Proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy para o tráfico de dandelion* para saltar cortalumes.\nPodería precisar reinicio. Esto podería non funcionar en algúns móbiles.</string>
+    <string name="host">Servidor</string>
+    <string name="port">Porto</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Precisa reiniciar o app para deshabilitar o uso do proxy</string>
+    <string name="orbot_proxy_preset_loaded">Cargadas as preferencias do proxy Orbot</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Abrir ligazóns externas con Chrome Custom Tabs. Chromium ou Google Chrome ten que estar instalado para utilizar esta característica.\nIMPORTANTE: Chrome Custom Tabs non utiliza os servidores proxy configurados!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Abrir ligazóns externas con Chrome Custom Tabs. Chromium ou Google Chrome ten que estar instalado para utilizar esta característica.\nIMPORTANTE: Chrome Custom Tabs non utiliza os servidores proxy configurados!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Axustes personais</string>
-    <string name="pref_desc__personal_settings">Abrir os axustes da conta diaspora*</string>
-    <string name="pref_desc__manage_contacts">Xestione a súa lista de contactos</string>
-    <string name="pref_title__manage_tags">Xestionar etiquetas</string>
-    <string name="pref_desc__manage_tags">Deixar de seguir etiquetas que segue</string>
-    <string name="pref_title__change_account">Mudar de conta</string>
-    <string name="pref_desc__change_account">Eliminar os datos locais da sesión e cambiar a outro nodo/conta de diaspora*</string>
-    <string name="pref_warning__change_account">Esto eliminará todas as cookies e datos de sesión. Seguro que quere mudar de conta?</string>
-    <string name="pref_title__clear_cache">Limpar cache</string>
-    <string name="pref_desc__clear_cache">Limpar a cache da VistaWeb</string>
-    <string name="pref_desc__intellihide_toolbars">Agochar automáticamente as barras superior e inferior mentras desplaza</string>
-    <string name="pref_title__intellihide_toolbars">Barras de ferramentas intelixentes</string>
-    <string name="pref_title__append_shared_via_app">Engadir aviso-compartido-por</string>
-    <string name="pref_desc__append_shared_via_app">Engadir unha referencia a que foi compartido desde esta aplicación: [via #dandelion]</string>
+    <string name="personal_settings">Axustes personais</string>
+    <string name="open_diaspora_account_settings__appspecific">Abrir os axustes da conta diaspora*</string>
+    <string name="manage_your_contact_list">Xestione a súa lista de contactos</string>
+    <string name="manage_hashtags">Xestionar etiquetas</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Deixar de seguir etiquetas que segue</string>
+    <string name="change_account">Mudar de conta</string>
+    <string name="loug_warning_description__appspecific">Eliminar os datos locais da sesión e cambiar a outro nodo/conta de diaspora*</string>
+    <string name="logout_warning_description">Esto eliminará todas as cookies e datos de sesión. Seguro que quere mudar de conta?</string>
+    <string name="clear_cache">Limpar cache</string>
+    <string name="clear_webview_cache">Limpar a cache da VistaWeb</string>
+    <string name="intellihide_toolbars__appspecific">Agochar automáticamente as barras superior e inferior mentras desplaza</string>
+    <string name="intellihide_toolbars">Barras de ferramentas intelixentes</string>
+    <string name="append_shared_by_notice">Engadir aviso-compartido-por</string>
+    <string name="append_shared_by_notice__appspecific">Engadir unha referencia a que foi compartido desde esta aplicación: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Varios</string>
-    <string name="pref_title__wipe_settings">Restablecer completamente</string>
-    <string name="pref_desc__wipe_settings">Eliminar todas os axustes locais do app e desconectar todas as contas</string>
-    <string name="dialog_content__wipe_settings">Esto restablecerá todos os axustes da aplicación ao valor por omisión e desconectarao de todos os nodos. As súas imaxes descargadas permanecerán. Seguro que quere proceder?</string>
-    <string name="pref_desc__adblock_enable">Habilitar un AdBlocker básico. Poderían verse anuncios por exemplo en vistas incrustadas</string>
-    <string name="pref_title__adblock_enable">Bloquear publicidade</string>
+    <string name="miscellaneous">Varios</string>
+    <string name="full_reset">Restablecer completamente</string>
+    <string name="wipe_settings_and_logout">Eliminar todas os axustes locais do app e desconectar todas as contas</string>
+    <string name="wipe_settings_warning__appspecific">Esto restablecerá todos os axustes da aplicación ao valor por omisión e desconectarao de todos os nodos. As súas imaxes descargadas permanecerán. Seguro que quere proceder?</string>
+    <string name="enable_basic_adblocker_description">Habilitar un AdBlocker básico. Poderían verse anuncios por exemplo en vistas incrustadas</string>
+    <string name="block_advertisments">Bloquear publicidade</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 44562aef..4b974535 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -72,46 +72,46 @@
     <string name="missing_value">Hiányzó érték</string>
     <string name="jump_to_last_visited_timestamp_in_stream">Ugorjunk a legutóbb meglátogatott oldalra a hírfolyamon belül?</string>
 
-    <string name="about_activity__title_about_app">Névjegy</string>
-    <string name="about_activity__title_about_license">Licensz</string>
-    <string name="about_activity__title_debug_info">Hibakeresés</string>
-    <string name="fragment_debug__section_app">Alkalmazás</string>
-    <string name="fragment_debug__section_device">Eszköz</string>
-    <string name="fragment_debug__section_pod">diaspora*-pod</string>
-    <string name="fragment_debug__section_log">Hibakeresési napló</string>
-    <string name="fragment_debug__section_log_spam">Hibakeresési napló (részletes)</string>
-    <string name="fragment_debug__app_version">Alkalmazásverzió: %1$s</string>
-    <string name="fragment_debug__android_version">Android verzió: %1$s</string>
-    <string name="fragment_debug__device_name">Eszköznév: %1$s</string>
-    <string name="fragment_debug__app_codename">Kódnév: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Podprofilnév: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod domain: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Hibakeresési napló átmásolva a vágólapra</string>
-    <string name="fragment_about__about_text">A dandelion* a te segédalkalmazásod a diaspora* közösségi hálózat böngészésére. Olyan funkciókat ad hozzá a közösségi élményedhez, mint hasznos eszköztárak és proxyszerver-támogatás (pl. Tor).</string>
-    <string name="fragment_about__contribute">Járulj hozzá a fejlesztéshez!</string>
-    <string name="fragment_about__contribute_text">A dandelion* szabad szoftver és a diaspora* projekt elképzeléseit követi. Ha hozzá akarsz járulni, csak rajta! Jelenleg egy nagyon kis csapat vagyunk, így nagyra értékelünk bármilyen segítséget!
+    <string name="about">Névjegy</string>
+    <string name="license">Licensz</string>
+    <string name="debugging">Hibakeresés</string>
+    <string name="application">Alkalmazás</string>
+    <string name="device">Eszköz</string>
+    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
+    <string name="debug_log">Hibakeresési napló</string>
+    <string name="debug_log_verbose">Hibakeresési napló (részletes)</string>
+    <string name="app_version_with_arg">Alkalmazásverzió: %1$s</string>
+    <string name="android_version_witharg">Android verzió: %1$s</string>
+    <string name="device_name_witharg">Eszköznév: %1$s</string>
+    <string name="code_name_witharg">Kódnév: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Podprofilnév: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod domain: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Hibakeresési napló átmásolva a vágólapra</string>
+    <string name="dandelion_is_your_companion__appspecific">A dandelion* a te segédalkalmazásod a diaspora* közösségi hálózat böngészésére. Olyan funkciókat ad hozzá a közösségi élményedhez, mint hasznos eszköztárak és proxyszerver-támogatás (pl. Tor).</string>
+    <string name="contribute_code">Járulj hozzá a fejlesztéshez!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">A dandelion* szabad szoftver és a diaspora* projekt elképzeléseit követi. Ha hozzá akarsz járulni, csak rajta! Jelenleg egy nagyon kis csapat vagyunk, így nagyra értékelünk bármilyen segítséget!
 </string>
-    <string name="fragment_about__contribute_button">A program forrása</string>
-    <string name="fragment_about__translate">Fordítsd le az alkalmazást!</string>
-    <string name="fragment_about__translate_text">Nem érhető el az alkalmazás a nyelveden? Ezen változtathatsz! Mit szólnál ahhoz, ha segítenél nekünk a lefordításában? A crowdin platformot használjuk, hogy bárki le tudja fordítani az alkalmazást.</string>
-    <string name="fragment_about__translate_button">Hadd fordítsak</string>
-    <string name="fragment_about__feedback">Adj visszajelzést!</string>
-    <string name="fragment_about__feedback_text">A dandelion* még mindig fejlesztés alatt áll, szóval ha vannak javaslataid vagy bármilyen visszajelzésed, kérlek, használd a hibanyomkövetőt!</string>
-    <string name="fragment_about__feedback_button">Hibajelentés</string>
-    <string name="fragment_about__spread_the_word">Ajánld másoknak!</string>
-    <string name="fragment_about__spread_the_word_text">Beszélj a barátaiddal és családtagjaiddal a diaspora*-ról és a #dandelionról! Mi lenne, ha blogolnál a tapasztalataidról? Szeretnénk hallani tőled valamit!</string>
-    <string name="fragment_about__spread_the_word_button">Az alkalmazás megosztása</string>
-    <string name="fragment_about__spread_the_word_share_text">Szia! Próbáld ki a #dandeliont! %1$s</string>
+    <string name="get_the_source">A program forrása</string>
+    <string name="translate_the_app">Fordítsd le az alkalmazást!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Nem érhető el az alkalmazás a nyelveden? Ezen változtathatsz! Mit szólnál ahhoz, ha segítenél nekünk a lefordításában? A crowdin platformot használjuk, hogy bárki le tudja fordítani az alkalmazást.</string>
+    <string name="let_me_translate">Hadd fordítsak</string>
+    <string name="give_feedback">Adj visszajelzést!</string>
+    <string name="dandelion_still_in_development__appspecific">A dandelion* még mindig fejlesztés alatt áll, szóval ha vannak javaslataid vagy bármilyen visszajelzésed, kérlek, használd a hibanyomkövetőt!</string>
+    <string name="report_bugs">Hibajelentés</string>
+    <string name="spread_the_word">Ajánld másoknak!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Beszélj a barátaiddal és családtagjaiddal a diaspora*-ról és a #dandelionról! Mi lenne, ha blogolnál a tapasztalataidról? Szeretnénk hallani tőled valamit!</string>
+    <string name="share_the_app">Az alkalmazás megosztása</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Szia! Próbáld ki a #dandeliont! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Karbantartók</string>
-    <string name="fragment_license__maintainers_text">Ezt az alkalmazást jelenleg &lt;br&gt;&lt;br&gt;%1$s fejleszti és tartja karban.</string>
-    <string name="fragment_license__contributors">Hozzájárulók</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Köszönjük!</string>
-    <string name="fragment_license__license_button">GNU GPLv3+ Licenc</string>
-    <string name="fragment_license__thirdparty_libs">3. személytől származó könyvtárak</string>
-    <string name="fragment_license__thirdparty_libs_text">A következő könyvtárak vannak használatban:</string>
-    <string name="fragment_license__misc_leafpic">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
-    <string name="fragment_license__misc_leafpic_button">Tudj meg többet</string>
+    <string name="maintainers">Karbantartók</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Ezt az alkalmazást jelenleg &lt;br&gt;&lt;br&gt;%1$s fejleszti és tartja karban.</string>
+    <string name="contributors">Hozzájárulók</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Köszönjük!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Licenc</string>
+    <string name="show_third_party_licenses">3. személytől származó könyvtárak</string>
+    <string name="the_following_libraries_are_used">A következő könyvtárak vannak használatban:</string>
+    <string name="inspiration_from_leafpic__appspecific">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
+    <string name="tell_me_more">Tudj meg többet</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -136,62 +136,62 @@
     <string name="pref_desc__primary_color">Az eszköztárak színe</string>
     <string name="pref_title__accent_color">Másodlagos szín</string>
     <string name="pref_desc__accent_color">A folyamatsáv színe</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED mód</string>
+    <string name="amoled_mode">AMOLED mód</string>
     <string name="pref_desc__primary_color__amoled_mode">A színek felülbírálása feketével az alkalmazás sok részén, mely hasznos lehet AMOLED kijelzők esetében. Újra kell indítanod az alkalmazást ehhez a változtatáshoz. Hogy sötétben böngészd a diaspora*-ot, engedélyezned kell a Sötét téma beállítást, amely megtalálható a személyes diaspora* fiókbeállításaidnál.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Kiterjesztett értesítések</string>
-    <string name="pref_desc__extended_notifications">Az értesítések gombra kattintva megjelenik egy gyorsmenü, amely értesítéskategóriákat mutat</string>
-    <string name="pref_desc__language">Az alkalmazás nyelvének megváltoztatása. Indítsd újra az alkalmazást, hogy a módosítások érvénybe lépjenek!</string>
-    <string name="pref_title__language">Nyelv</string>
-    <string name="language_system">Rendszernyelv</string>
+    <string name="extended_notifications">Kiterjesztett értesítések</string>
+    <string name="extendend_notifications_bell_description__appspecific">Az értesítések gombra kattintva megjelenik egy gyorsmenü, amely értesítéskategóriákat mutat</string>
+    <string name="language_change_restart_description">Az alkalmazás nyelvének megváltoztatása. Indítsd újra az alkalmazást, hogy a módosítások érvénybe lépjenek!</string>
+    <string name="language">Nyelv</string>
+    <string name="system_language">Rendszernyelv</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">A webnézet szövegméretének módosítása</string>
-    <string name="pref_title__font_size">Betűméret</string>
-    <string name="font_size_normal">Normál</string>
-    <string name="font_size_large">Nagy</string>
-    <string name="font_size_huge">Óriási</string>
+    <string name="control_textsize_of_webview">A webnézet szövegméretének módosítása</string>
+    <string name="font_size">Betűméret</string>
+    <string name="normal">Normál</string>
+    <string name="large">Nagy</string>
+    <string name="huge">Óriási</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Képek betöltése</string>
-    <string name="pref_desc__load_images">Képek betöltésének be-/kikapcsolása pl. a kevesebb adatfelhasználás céljából</string>
+    <string name="load_images">Képek betöltése</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Képek betöltésének be-/kikapcsolása pl. a kevesebb adatfelhasználás céljából</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Kijelzőforgatás</string>
-    <string name="pref_desc__screen_rotation">Kijelzőforgatás automatikus irányítása</string>
-    <string name="rotation_system">Alapértelmezett</string>
-    <string name="rotation_sensor">Szenzor\n(rendszerbeállítások figyelmen kívül hagyása)</string>
-    <string name="rotation_portrait">Álló</string>
-    <string name="rotation_landscape">Fekvő</string>
+    <string name="screen_rotation">Kijelzőforgatás</string>
+    <string name="control_screen_rotation">Kijelzőforgatás automatikus irányítása</string>
+    <string name="default_">Alapértelmezett</string>
+    <string name="sensor_ignore_system_settings">Szenzor\n(rendszerbeállítások figyelmen kívül hagyása)</string>
+    <string name="portrait">Álló</string>
+    <string name="landscape">Fekvő</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Tor profil betöltése</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Proxybeállítások betöltése a Tor (Orbot) HTTP Proxynak</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Proxy engedélyezése</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy használata a dandelion* adatforgalmának a tűzfalak kikerüléséért.\nÚjraindítás szükséges lehet. Nem biztos, hogy minden telefonon működik.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">Az alkalmazást újra kell indítani a proxyhasználat kikapcsolásához</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot proxyprofil betöltve</string>
+    <string name="load_tor_preset">Tor profil betöltése</string>
+    <string name="load_proxy_settins_for_tor">Proxybeállítások betöltése a Tor (Orbot) HTTP Proxynak</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Proxy engedélyezése</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy használata a dandelion* adatforgalmának a tűzfalak kikerüléséért.\nÚjraindítás szükséges lehet. Nem biztos, hogy minden telefonon működik.</string>
+    <string name="host">Host</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Az alkalmazást újra kell indítani a proxyhasználat kikapcsolásához</string>
+    <string name="orbot_proxy_preset_loaded">Orbot proxyprofil betöltve</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Külső linkek megnyitása a Chrome egyéni lapjaival. Ennek a funkciónak a használatához telepítve kell lennie a Chromiumnak vagy a Google Chrome-nak.\nFONTOS MEGJEGYZÉS: Chrome egyéni lapjai nem használják a beállított proxyszervereket!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Külső linkek megnyitása a Chrome egyéni lapjaival. Ennek a funkciónak a használatához telepítve kell lennie a Chromiumnak vagy a Google Chrome-nak.\nFONTOS MEGJEGYZÉS: Chrome egyéni lapjai nem használják a beállított proxyszervereket!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Személyes beállítások</string>
-    <string name="pref_desc__personal_settings">A diaspora*-fiókod beállításainak megnyitása</string>
-    <string name="pref_desc__manage_contacts">A partnereid listájának kezelése</string>
-    <string name="pref_title__manage_tags">Címkék kezelése</string>
-    <string name="pref_desc__manage_tags">Címkék követésének megszüntetése</string>
-    <string name="pref_title__change_account">Fiókváltás</string>
-    <string name="pref_desc__change_account">Helyi munkamenet adatának törlése és váltás másik diaspora*-podra vagy -fiókra</string>
-    <string name="pref_warning__change_account">Ez törölni fogja az összes sütit és a munkamenet adatait. Tényleg fiókot akarsz váltani?</string>
-    <string name="pref_title__clear_cache">Gyorsítótár kiürítése</string>
-    <string name="pref_desc__clear_cache">Beépített böngésző gyorsítótárjának kiürítése</string>
-    <string name="pref_desc__intellihide_toolbars">A felső és alsó eszköztárak automatikus elrejtése görgetés közben</string>
-    <string name="pref_title__intellihide_toolbars">Intelligensen eltűnő eszköztárak</string>
-    <string name="pref_title__append_shared_via_app">Használt program megemlítése megosztáskor</string>
-    <string name="pref_desc__append_shared_via_app">Hivatkozás erre az alkalmazásra a megosztásokban: [megosztva ezzel: #dandelion]</string>
+    <string name="personal_settings">Személyes beállítások</string>
+    <string name="open_diaspora_account_settings__appspecific">A diaspora*-fiókod beállításainak megnyitása</string>
+    <string name="manage_your_contact_list">A partnereid listájának kezelése</string>
+    <string name="manage_hashtags">Címkék kezelése</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Címkék követésének megszüntetése</string>
+    <string name="change_account">Fiókváltás</string>
+    <string name="loug_warning_description__appspecific">Helyi munkamenet adatának törlése és váltás másik diaspora*-podra vagy -fiókra</string>
+    <string name="logout_warning_description">Ez törölni fogja az összes sütit és a munkamenet adatait. Tényleg fiókot akarsz váltani?</string>
+    <string name="clear_cache">Gyorsítótár kiürítése</string>
+    <string name="clear_webview_cache">Beépített böngésző gyorsítótárjának kiürítése</string>
+    <string name="intellihide_toolbars__appspecific">A felső és alsó eszköztárak automatikus elrejtése görgetés közben</string>
+    <string name="intellihide_toolbars">Intelligensen eltűnő eszköztárak</string>
+    <string name="append_shared_by_notice">Használt program megemlítése megosztáskor</string>
+    <string name="append_shared_by_notice__appspecific">Hivatkozás erre az alkalmazásra a megosztásokban: [megosztva ezzel: #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Egyéb</string>
-    <string name="pref_title__wipe_settings">Teljes visszaállítás eredeti értékekre</string>
-    <string name="pref_desc__wipe_settings">Az alkalmazás összes helyi beállításának törlése és kijelentkezés az összes fiókból</string>
-    <string name="dialog_content__wipe_settings">Ez az összes módosított beállítás értékét visszaállítja alapra és kijelentkeztet téged az összes podról. A letöltött képeid érintetlenül maradnak. Biztos, hogy folytatod?</string>
-    <string name="pref_desc__adblock_enable">Alap hirdetésblokkoló (AdBlocker) engedélyezése. Reklámok jelenhetnek meg pl. a beépített megjelenítéseknél</string>
-    <string name="pref_title__adblock_enable">Hirdetések blokkolása</string>
+    <string name="miscellaneous">Egyéb</string>
+    <string name="full_reset">Teljes visszaállítás eredeti értékekre</string>
+    <string name="wipe_settings_and_logout">Az alkalmazás összes helyi beállításának törlése és kijelentkezés az összes fiókból</string>
+    <string name="wipe_settings_warning__appspecific">Ez az összes módosított beállítás értékét visszaállítja alapra és kijelentkeztet téged az összes podról. A letöltött képeid érintetlenül maradnak. Biztos, hogy folytatod?</string>
+    <string name="enable_basic_adblocker_description">Alap hirdetésblokkoló (AdBlocker) engedélyezése. Reklámok jelenhetnek meg pl. a beépített megjelenítéseknél</string>
+    <string name="block_advertisments">Hirdetések blokkolása</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8078589f..b7ec612a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -82,45 +82,45 @@
     <string name="pref_summary__show_title">Mostra titolo nella schermata principale</string>
     <string name="pref_title__show_title">Mostra titolo</string>
 
-    <string name="about_activity__title_about_app">Informazioni</string>
-    <string name="about_activity__title_about_license">Licenza</string>
-    <string name="about_activity__title_debug_info">Debug</string>
-    <string name="fragment_debug__section_app">Applicazione</string>
-    <string name="fragment_debug__section_device">Dispositivo</string>
-    <string name="fragment_debug__section_pod">Pod diaspora*</string>
-    <string name="fragment_debug__section_log">Log di debug</string>
-    <string name="fragment_debug__section_log_spam">Log di debug (dettagliato)</string>
-    <string name="fragment_debug__app_version">Versione app: %1$s</string>
-    <string name="fragment_debug__android_version">Versione Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
-    <string name="fragment_debug__app_codename">Codename: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod alias: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Dominio pod: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
-    <string name="fragment_about__about_text">dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social.</string>
-    <string name="fragment_about__contribute">Contribuisci al codice!</string>
-    <string name="fragment_about__contribute_text">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
-    <string name="fragment_about__contribute_button">Ottieni il codice sorgente</string>
-    <string name="fragment_about__translate">Traduci l\'app!</string>
-    <string name="fragment_about__translate_text">L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app.</string>
-    <string name="fragment_about__translate_button">Fammi tradurre</string>
-    <string name="fragment_about__feedback">Lascia un feedback!</string>
-    <string name="fragment_about__feedback_text">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua!</string>
-    <string name="fragment_about__feedback_button">Segnala un bug</string>
-    <string name="fragment_about__spread_the_word">Passaparola!</string>
-    <string name="fragment_about__spread_the_word_text">Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate!</string>
-    <string name="fragment_about__spread_the_word_button">Condividi l\'app</string>
-    <string name="fragment_about__spread_the_word_share_text">Ehi! Scopri #dandelion! %1$s</string>
+    <string name="about">Informazioni</string>
+    <string name="license">Licenza</string>
+    <string name="debugging">Debug</string>
+    <string name="application">Applicazione</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Log di debug</string>
+    <string name="debug_log_verbose">Log di debug (dettagliato)</string>
+    <string name="app_version_with_arg">Versione app: %1$s</string>
+    <string name="android_version_witharg">Versione Android: %1$s</string>
+    <string name="device_name_witharg">Nome dispositivo: %1$s</string>
+    <string name="code_name_witharg">Codename: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod alias: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Log di debug copiato negli appunti</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social.</string>
+    <string name="contribute_code">Contribuisci al codice!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
+    <string name="get_the_source">Ottieni il codice sorgente</string>
+    <string name="translate_the_app">Traduci l\'app!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app.</string>
+    <string name="let_me_translate">Fammi tradurre</string>
+    <string name="give_feedback">Lascia un feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua!</string>
+    <string name="report_bugs">Segnala un bug</string>
+    <string name="spread_the_word">Passaparola!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate!</string>
+    <string name="share_the_app">Condividi l\'app</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ehi! Scopri #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Manutentori</string>
-    <string name="fragment_license__maintainers_text">Quest\'app è attualmente sviluppata e mantenuta da &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Contributori</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Grazie!</string>
-    <string name="fragment_license__license_button">Licenza GNU GPL versione 3 o superiore</string>
-    <string name="fragment_license__thirdparty_libs">Librerie di terze parti</string>
-    <string name="fragment_license__thirdparty_libs_text">Sono utilizzate le seguenti librerie:</string>
-    <string name="fragment_license__misc_leafpic">Abbiamo preso ispirazione e parte del codice da LeafPic. Dagli un\'occhiata, anch\'esso è software libero!</string>
-    <string name="fragment_license__misc_leafpic_button">Dimmi di più</string>
+    <string name="maintainers">Manutentori</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Quest\'app è attualmente sviluppata e mantenuta da &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contributori</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazie!</string>
+    <string name="gnu_gplv3_license">Licenza GNU GPL versione 3 o superiore</string>
+    <string name="show_third_party_licenses">Librerie di terze parti</string>
+    <string name="the_following_libraries_are_used">Sono utilizzate le seguenti librerie:</string>
+    <string name="inspiration_from_leafpic__appspecific">Abbiamo preso ispirazione e parte del codice da LeafPic. Dagli un\'occhiata, anch\'esso è software libero!</string>
+    <string name="tell_me_more">Dimmi di più</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -145,62 +145,62 @@
     <string name="pref_desc__primary_color">Colore della barra</string>
     <string name="pref_title__accent_color">Colore secondario</string>
     <string name="pref_desc__accent_color">Colore della barra dei progressi</string>
-    <string name="pref_title__primary_color__amoled_mode">Modalità AMOLED</string>
+    <string name="amoled_mode">Modalità AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Sostituzione dei colori con display AMOLED scuro in molte parti dell\'app. È necessario riavviare per attivare o disattivare questa impostazione. Per utilizzare diaspora* in scuro è inoltre necessario attivare il tema scuro, che può essere trovato nelle impostazioni dell\'account personale di diaspora*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notifiche estese</string>
-    <string name="pref_desc__extended_notifications">Estendi il bottone delle notifiche con un menù che mostra le categorie di notifiche</string>
-    <string name="pref_desc__language">Cambia la lingua di questa app. Riavvia l\'app per rendere effettive le modifiche</string>
-    <string name="pref_title__language">Lingua</string>
-    <string name="language_system">Lingua di sistema</string>
+    <string name="extended_notifications">Notifiche estese</string>
+    <string name="extendend_notifications_bell_description__appspecific">Estendi il bottone delle notifiche con un menù che mostra le categorie di notifiche</string>
+    <string name="language_change_restart_description">Cambia la lingua di questa app. Riavvia l\'app per rendere effettive le modifiche</string>
+    <string name="language">Lingua</string>
+    <string name="system_language">Lingua di sistema</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Controllo dimensione testo del WebView</string>
-    <string name="pref_title__font_size">Dimensione font</string>
-    <string name="font_size_normal">Normale</string>
-    <string name="font_size_large">Grande</string>
-    <string name="font_size_huge">Molto grande</string>
+    <string name="control_textsize_of_webview">Controllo dimensione testo del WebView</string>
+    <string name="font_size">Dimensione font</string>
+    <string name="normal">Normale</string>
+    <string name="large">Grande</string>
+    <string name="huge">Molto grande</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Carica immagini</string>
-    <string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
+    <string name="load_images">Carica immagini</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotazione dello schermo</string>
-    <string name="pref_desc__screen_rotation">Controlla la rotazione automatica dello schermo</string>
-    <string name="rotation_system">Predefinito</string>
-    <string name="rotation_sensor">Sensore\n(ignora le impostazioni di sistema)</string>
-    <string name="rotation_portrait">Verticale</string>
-    <string name="rotation_landscape">Orizzontale</string>
+    <string name="screen_rotation">Rotazione dello schermo</string>
+    <string name="control_screen_rotation">Controlla la rotazione automatica dello schermo</string>
+    <string name="default_">Predefinito</string>
+    <string name="sensor_ignore_system_settings">Sensore\n(ignora le impostazioni di sistema)</string>
+    <string name="portrait">Verticale</string>
+    <string name="landscape">Orizzontale</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Carica i valori predefiniti di Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Carica le impostazioni del proxy per il proxy HTTP di Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Attiva proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Usa il proxy con i dati di dandelion* per eludere i firewall.\nPotrebbe essere necessario il riavvio</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Porta</string>
-    <string name="toast__proxy_disabled__restart_required">E\' necessario riavviare l\'app per disattivare l\'utilizzo del proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot proxy preset caricato</string>
+    <string name="load_tor_preset">Carica i valori predefiniti di Tor</string>
+    <string name="load_proxy_settins_for_tor">Carica le impostazioni del proxy per il proxy HTTP di Tor (Orbot)</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Attiva proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Usa il proxy con i dati di dandelion* per eludere i firewall.\nPotrebbe essere necessario il riavvio</string>
+    <string name="host">Host</string>
+    <string name="port">Porta</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">E\' necessario riavviare l\'app per disattivare l\'utilizzo del proxy</string>
+    <string name="orbot_proxy_preset_loaded">Orbot proxy preset caricato</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Impostazioni personali</string>
-    <string name="pref_desc__personal_settings">Apri le impostazioni del tuo account diaspora*</string>
-    <string name="pref_desc__manage_contacts">Gestisci il tuo elenco di contatti</string>
-    <string name="pref_title__manage_tags">Gestisci hashtag</string>
-    <string name="pref_desc__manage_tags">Non seguire più gli hashtag seguiti</string>
-    <string name="pref_title__change_account">Cambia account</string>
-    <string name="pref_desc__change_account">Elimina dati della sessione locale e passa ad un altro pod/account diaspora*</string>
-    <string name="pref_warning__change_account">Questo eliminerà tutti i cookie e i dati della sessione. Vuoi veramente cambiare il tuo account?</string>
-    <string name="pref_title__clear_cache">Pulisci cache</string>
-    <string name="pref_desc__clear_cache">Pulisci cache di WebView</string>
-    <string name="pref_desc__intellihide_toolbars">Nascondi barre superiori e inferiori automaticamente quando scrolli</string>
-    <string name="pref_title__intellihide_toolbars">Barre che si nascondono intelligentemente</string>
-    <string name="pref_title__append_shared_via_app">Aggiungi avviso dell\'app</string>
-    <string name="pref_desc__append_shared_via_app">Aggiungere un riferimento a questa applicazione ai testi condivisi: [via #dandelion]</string>
+    <string name="personal_settings">Impostazioni personali</string>
+    <string name="open_diaspora_account_settings__appspecific">Apri le impostazioni del tuo account diaspora*</string>
+    <string name="manage_your_contact_list">Gestisci il tuo elenco di contatti</string>
+    <string name="manage_hashtags">Gestisci hashtag</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Non seguire più gli hashtag seguiti</string>
+    <string name="change_account">Cambia account</string>
+    <string name="loug_warning_description__appspecific">Elimina dati della sessione locale e passa ad un altro pod/account diaspora*</string>
+    <string name="logout_warning_description">Questo eliminerà tutti i cookie e i dati della sessione. Vuoi veramente cambiare il tuo account?</string>
+    <string name="clear_cache">Pulisci cache</string>
+    <string name="clear_webview_cache">Pulisci cache di WebView</string>
+    <string name="intellihide_toolbars__appspecific">Nascondi barre superiori e inferiori automaticamente quando scrolli</string>
+    <string name="intellihide_toolbars">Barre che si nascondono intelligentemente</string>
+    <string name="append_shared_by_notice">Aggiungi avviso dell\'app</string>
+    <string name="append_shared_by_notice__appspecific">Aggiungere un riferimento a questa applicazione ai testi condivisi: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Vario</string>
-    <string name="pref_title__wipe_settings">Reset completo</string>
-    <string name="pref_desc__wipe_settings">Elimina localmente tutte le impostazioni relative all\'app e disconnette da tutti gli account</string>
-    <string name="dialog_content__wipe_settings">Questo cancellerà tutte le impostazioni dell\'app che sono state cambiate ai loro valori predefiniti e ti disconnetterà da tutti i pod. Le immagini scaricate non verranno toccate. Sei sicuro di voler procedere?</string>
-    <string name="pref_desc__adblock_enable">Abilitare AdBlocker base. Gli annunci possono essere inclusi ad es. nelle visualizzazioni incorporate</string>
-    <string name="pref_title__adblock_enable">Blocca le pubblicità</string>
+    <string name="miscellaneous">Vario</string>
+    <string name="full_reset">Reset completo</string>
+    <string name="wipe_settings_and_logout">Elimina localmente tutte le impostazioni relative all\'app e disconnette da tutti gli account</string>
+    <string name="wipe_settings_warning__appspecific">Questo cancellerà tutte le impostazioni dell\'app che sono state cambiate ai loro valori predefiniti e ti disconnetterà da tutti i pod. Le immagini scaricate non verranno toccate. Sei sicuro di voler procedere?</string>
+    <string name="enable_basic_adblocker_description">Abilitare AdBlocker base. Gli annunci possono essere inclusi ad es. nelle visualizzazioni incorporate</string>
+    <string name="block_advertisments">Blocca le pubblicità</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7d9719a9..c7fb916d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -76,45 +76,45 @@
     <string name="pref_summary__show_title">メインビューにタイトルを表示します</string>
     <string name="pref_title__show_title">タイトルを表示</string>
 
-    <string name="about_activity__title_about_app">アプリについて</string>
-    <string name="about_activity__title_about_license">ライセンス</string>
-    <string name="about_activity__title_debug_info">デバッグ</string>
-    <string name="fragment_debug__section_app">アプリケーション</string>
-    <string name="fragment_debug__section_device">デバイス</string>
-    <string name="fragment_debug__section_pod">ダイアスポラ* ポッド</string>
-    <string name="fragment_debug__section_log">デバッグログ</string>
-    <string name="fragment_debug__section_log_spam">デバッグ ログ (詳細)</string>
-    <string name="fragment_debug__app_version">アプリバージョン: %1$s</string>
-    <string name="fragment_debug__android_version">Android バージョン: %1$s</string>
-    <string name="fragment_debug__device_name">デバイス名: %1$s</string>
-    <string name="fragment_debug__app_codename">コード名: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">ポッドプロファイル名: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">ポッドドメイン: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">デバッグログをクリップボードにコピーしました</string>
-    <string name="fragment_about__about_text">dandelion* は、ソーシャル ネットワーク diaspora* をブラウジングするためのコンパニオン アプリです。便利なツールバーや Tor のようなプロキシ サーバーのサポートなどの機能を追加して、ソーシャル体験することができます。</string>
-    <string name="fragment_about__contribute">コードを貢献!</string>
-    <string name="fragment_about__contribute_text">dandelion* は自由にフリーで開発され、diaspora* プロジェクトのアイデアをフォローしています。貢献したい場合は、どうぞ! 現在私たちは、非常に小規模なチームなので、あらゆる種類の支援に感謝申し上げます!</string>
-    <string name="fragment_about__contribute_button">ソースを取得</string>
-    <string name="fragment_about__translate">アプリを翻訳!</string>
-    <string name="fragment_about__translate_text">アプリがお使いの言語で利用できませんか? それを変更することができます! 翻訳して私たちを支援しませんか? Crowdin プラットフォームを使用して、誰でもアプリケーションを翻訳できるようにしています。</string>
-    <string name="fragment_about__translate_button">翻訳させてください</string>
-    <string name="fragment_about__feedback">フィードバックする!</string>
-    <string name="fragment_about__feedback_text">dandelion* はまだ開発中なので、提案や何かフィードバックがあれば、私たちのバグ追跡システムにご連絡ください!</string>
-    <string name="fragment_about__feedback_button">バグを報告</string>
-    <string name="fragment_about__spread_the_word">みんなに広めよう!</string>
-    <string name="fragment_about__spread_the_word_text">diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください!</string>
-    <string name="fragment_about__spread_the_word_button">アプリを共有</string>
-    <string name="fragment_about__spread_the_word_share_text">やあ! #dandelion をチェックしてください! %1$s</string>
+    <string name="about">アプリについて</string>
+    <string name="license">ライセンス</string>
+    <string name="debugging">デバッグ</string>
+    <string name="application">アプリケーション</string>
+    <string name="device">デバイス</string>
+    <string name="diaspora_pod__appspecific">ダイアスポラ* ポッド</string>
+    <string name="debug_log">デバッグログ</string>
+    <string name="debug_log_verbose">デバッグ ログ (詳細)</string>
+    <string name="app_version_with_arg">アプリバージョン: %1$s</string>
+    <string name="android_version_witharg">Android バージョン: %1$s</string>
+    <string name="device_name_witharg">デバイス名: %1$s</string>
+    <string name="code_name_witharg">コード名: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">ポッドプロファイル名: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">ポッドドメイン: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">デバッグログをクリップボードにコピーしました</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* は、ソーシャル ネットワーク diaspora* をブラウジングするためのコンパニオン アプリです。便利なツールバーや Tor のようなプロキシ サーバーのサポートなどの機能を追加して、ソーシャル体験することができます。</string>
+    <string name="contribute_code">コードを貢献!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* は自由にフリーで開発され、diaspora* プロジェクトのアイデアをフォローしています。貢献したい場合は、どうぞ! 現在私たちは、非常に小規模なチームなので、あらゆる種類の支援に感謝申し上げます!</string>
+    <string name="get_the_source">ソースを取得</string>
+    <string name="translate_the_app">アプリを翻訳!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">アプリがお使いの言語で利用できませんか? それを変更することができます! 翻訳して私たちを支援しませんか? Crowdin プラットフォームを使用して、誰でもアプリケーションを翻訳できるようにしています。</string>
+    <string name="let_me_translate">翻訳させてください</string>
+    <string name="give_feedback">フィードバックする!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* はまだ開発中なので、提案や何かフィードバックがあれば、私たちのバグ追跡システムにご連絡ください!</string>
+    <string name="report_bugs">バグを報告</string>
+    <string name="spread_the_word">みんなに広めよう!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください!</string>
+    <string name="share_the_app">アプリを共有</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">やあ! #dandelion をチェックしてください! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">メンテナンススタッフ</string>
-    <string name="fragment_license__maintainers_text">現在、このアプリは以下の人によって開発およびメンテナンスされています &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">貢献者</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;ありがとうございます!</string>
-    <string name="fragment_license__license_button">GNU GPLv3+ ライセンス</string>
-    <string name="fragment_license__thirdparty_libs">サードパーティ ライブラリー</string>
-    <string name="fragment_license__thirdparty_libs_text">以下のライブラリーが使用されます:</string>
-    <string name="fragment_license__misc_leafpic">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
-    <string name="fragment_license__misc_leafpic_button">さらに詳しく</string>
+    <string name="maintainers">メンテナンススタッフ</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">現在、このアプリは以下の人によって開発およびメンテナンスされています &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">貢献者</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;ありがとうございます!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ ライセンス</string>
+    <string name="show_third_party_licenses">サードパーティ ライブラリー</string>
+    <string name="the_following_libraries_are_used">以下のライブラリーが使用されます:</string>
+    <string name="inspiration_from_leafpic__appspecific">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
+    <string name="tell_me_more">さらに詳しく</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -139,62 +139,62 @@
     <string name="pref_desc__primary_color">ツールバーの色</string>
     <string name="pref_title__accent_color">アクセント色</string>
     <string name="pref_desc__accent_color">プログレスバーの色</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED モード</string>
+    <string name="amoled_mode">AMOLED モード</string>
     <string name="pref_desc__primary_color__amoled_mode">アプリの多くの部分を AMOLED フレンドリーな黒色の表示で上書きします。この設定を切り替えるには再起動する必要があります。ダイアスポラ* を暗く参照するには、ダイアスポラ* の個人アカウント設定にある、ダークテーマをアクティブにする必要があります。</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">拡張通知</string>
-    <string name="pref_desc__extended_notifications">通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します</string>
-    <string name="pref_desc__language">このアプリの言語を変更します。アプリを再起動すると変更を反映します</string>
-    <string name="pref_title__language">言語</string>
-    <string name="language_system">システム言語</string>
+    <string name="extended_notifications">拡張通知</string>
+    <string name="extendend_notifications_bell_description__appspecific">通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します</string>
+    <string name="language_change_restart_description">このアプリの言語を変更します。アプリを再起動すると変更を反映します</string>
+    <string name="language">言語</string>
+    <string name="system_language">システム言語</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">WebView のテキストサイズを調整</string>
-    <string name="pref_title__font_size">フォントサイズ</string>
-    <string name="font_size_normal">標準</string>
-    <string name="font_size_large">大</string>
-    <string name="font_size_huge">巨大</string>
+    <string name="control_textsize_of_webview">WebView のテキストサイズを調整</string>
+    <string name="font_size">フォントサイズ</string>
+    <string name="normal">標準</string>
+    <string name="large">大</string>
+    <string name="huge">巨大</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">画像の読み込み</string>
-    <string name="pref_desc__load_images">安全なモバイルデータのため、画像の読み込みを無効にします</string>
+    <string name="load_images">画像の読み込み</string>
+    <string name="toggle_image_loading_to_save_mobile_data">安全なモバイルデータのため、画像の読み込みを無効にします</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">画面の回転</string>
-    <string name="pref_desc__screen_rotation">画面の自動回転をコントロール</string>
-    <string name="rotation_system">デフォルト</string>
-    <string name="rotation_sensor">センサー\n(システムの設定を無視)</string>
-    <string name="rotation_portrait">ポートレート (縦向き)</string>
-    <string name="rotation_landscape">ランドスケープ (横向き)</string>
+    <string name="screen_rotation">画面の回転</string>
+    <string name="control_screen_rotation">画面の自動回転をコントロール</string>
+    <string name="default_">デフォルト</string>
+    <string name="sensor_ignore_system_settings">センサー\n(システムの設定を無視)</string>
+    <string name="portrait">ポートレート (縦向き)</string>
+    <string name="landscape">ランドスケープ (横向き)</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Tor プリセットを読み込む</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます</string>
-    <string name="pref_title__sub_proxy">プロキシ</string>
-    <string name="pref_title__proxy_enabled">プロキシを有効にする</string>
-    <string name="pref_desc__http_proxy_enabled">dandelion* の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります</string>
-    <string name="pref_title__http_proxy_host">ホスト</string>
-    <string name="pref_title__http_proxy_port">ポート</string>
-    <string name="toast__proxy_disabled__restart_required">プロキシの使用を無効にするには、アプリを再起動する必要があります</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot プロキシのプリセットを読み込みました</string>
+    <string name="load_tor_preset">Tor プリセットを読み込む</string>
+    <string name="load_proxy_settins_for_tor">Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます</string>
+    <string name="proxy">プロキシ</string>
+    <string name="enable_proxy">プロキシを有効にする</string>
+    <string name="proxy_dandelion_traffic__appspecific">dandelion* の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります</string>
+    <string name="host">ホスト</string>
+    <string name="port">ポート</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">プロキシの使用を無効にするには、アプリを再起動する必要があります</string>
+    <string name="orbot_proxy_preset_loaded">Orbot プロキシのプリセットを読み込みました</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Chrome のカスタム タブで外部リンクを開きます。この機能は Chromium または Google Chrome をインストールする必要があります。\n重要な注意: Chrome のカスタム タブは構成されているプロキシ サーバーを使用しません!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Chrome のカスタム タブで外部リンクを開きます。この機能は Chromium または Google Chrome をインストールする必要があります。\n重要な注意: Chrome のカスタム タブは構成されているプロキシ サーバーを使用しません!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">個人用設定</string>
-    <string name="pref_desc__personal_settings">diaspora* アカウント設定を開きます</string>
-    <string name="pref_desc__manage_contacts">連絡先リストを管理します</string>
-    <string name="pref_title__manage_tags">ハッシュタグを管理</string>
-    <string name="pref_desc__manage_tags">すでにフォローしているハッシュタグのフォローをやめます</string>
-    <string name="pref_title__change_account">アカウントを変更</string>
-    <string name="pref_desc__change_account">ローカルのセッション データを消去し、別の diaspora* ポッド/アカウントに切り替えます</string>
-    <string name="pref_warning__change_account">すべてのクッキーとセッション データが消去されます。アカウントを変更してもよろしいですか?</string>
-    <string name="pref_title__clear_cache">キャッシュをクリア</string>
-    <string name="pref_desc__clear_cache">WebView のキャッシュをクリアします</string>
-    <string name="pref_desc__intellihide_toolbars">スクロールの間、自動的に上部と下部のツールバーを非表示にします</string>
-    <string name="pref_title__intellihide_toolbars">Intellihide ツールバー</string>
-    <string name="pref_title__append_shared_via_app">シェア方法の通知を追加</string>
-    <string name="pref_desc__append_shared_via_app">共有テキストにこのアプリへの参照を追加します: [via #dandelion]</string>
+    <string name="personal_settings">個人用設定</string>
+    <string name="open_diaspora_account_settings__appspecific">diaspora* アカウント設定を開きます</string>
+    <string name="manage_your_contact_list">連絡先リストを管理します</string>
+    <string name="manage_hashtags">ハッシュタグを管理</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">すでにフォローしているハッシュタグのフォローをやめます</string>
+    <string name="change_account">アカウントを変更</string>
+    <string name="loug_warning_description__appspecific">ローカルのセッション データを消去し、別の diaspora* ポッド/アカウントに切り替えます</string>
+    <string name="logout_warning_description">すべてのクッキーとセッション データが消去されます。アカウントを変更してもよろしいですか?</string>
+    <string name="clear_cache">キャッシュをクリア</string>
+    <string name="clear_webview_cache">WebView のキャッシュをクリアします</string>
+    <string name="intellihide_toolbars__appspecific">スクロールの間、自動的に上部と下部のツールバーを非表示にします</string>
+    <string name="intellihide_toolbars">Intellihide ツールバー</string>
+    <string name="append_shared_by_notice">シェア方法の通知を追加</string>
+    <string name="append_shared_by_notice__appspecific">共有テキストにこのアプリへの参照を追加します: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">その他</string>
-    <string name="pref_title__wipe_settings">完全なリセット</string>
-    <string name="pref_desc__wipe_settings">すべてのアカウントから、アプリとログアウトに関連するすべての設定をローカルで消去します</string>
-    <string name="dialog_content__wipe_settings">これはアプリの変更された設定をすべてデフォルトにリセットして、すべてのポッドからログアウトします。ダウンロードした画像はそのまま残ります。続行してもよろしいですか?</string>
-    <string name="pref_desc__adblock_enable">基本 AdBlocker を有効にします。広告は、埋め込みビューなどに含まれることがあります</string>
-    <string name="pref_title__adblock_enable">広告をブロック</string>
+    <string name="miscellaneous">その他</string>
+    <string name="full_reset">完全なリセット</string>
+    <string name="wipe_settings_and_logout">すべてのアカウントから、アプリとログアウトに関連するすべての設定をローカルで消去します</string>
+    <string name="wipe_settings_warning__appspecific">これはアプリの変更された設定をすべてデフォルトにリセットして、すべてのポッドからログアウトします。ダウンロードした画像はそのまま残ります。続行してもよろしいですか?</string>
+    <string name="enable_basic_adblocker_description">基本 AdBlocker を有効にします。広告は、埋め込みビューなどに含まれることがあります</string>
+    <string name="block_advertisments">広告をブロック</string>
 </resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 4cfd6acb..dc4fa061 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -77,45 +77,45 @@
     <string name="pref_summary__is_statusbar_hidden">Ffer afeggag n waddad di tmeẓri tagejdant</string>
     <string name="pref_title__is_statusbar_hidden">Ffer afeggag n waddad</string>
 
-    <string name="about_activity__title_about_app">Γef</string>
-    <string name="about_activity__title_about_license">Turagt</string>
-    <string name="about_activity__title_debug_info">Tamseɣtayt</string>
-    <string name="fragment_debug__section_app">Asnas</string>
-    <string name="fragment_debug__section_device">Ibenk</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Aɣmis n temseɣtayt</string>
-    <string name="fragment_debug__section_log_spam">Aɣmis n temseɣtayt (Verbose)</string>
-    <string name="fragment_debug__app_version">Lqem n usnas: %1$s</string>
-    <string name="fragment_debug__android_version">Lqem Android: %1$s</string>
-    <string name="fragment_debug__device_name">Isem n yibenk: %1$s</string>
-    <string name="fragment_debug__app_codename">Isem n tengalt: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Isem n umaɣnu n upud: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Tansa n upud: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Aɣmis n temseqtayt yettwaneɣlen ɣef afus</string>
-    <string name="fragment_about__about_text">dandelion* d asnas-ik amdakel i tunigin deg uẓeṭṭa n tmetti diaspora*. Ad yernu timahilin am ifecka iwulmen akked usefrek n iqeddacen ipṛuksiyen am uẓeṭṭa Tor ar tarimit-ik n tmetti.</string>
-    <string name="fragment_about__contribute">Ttekki di tengalt!</string>
-    <string name="fragment_about__contribute_text">dandelion* d ilelli, udiɣ yeṭṭafaṛ tiktiwin n useɣzan diaspora*. Ma tebɣiḍ ad tettekkiḍ, Iya-d! Akka tura, nekni d tarbaɛt meẓẓiyen, ihi ad nebɣu yal anaw n tallelt!</string>
-    <string name="fragment_about__contribute_button">Awi aɣbalu</string>
-    <string name="fragment_about__translate">Suqel asnas!</string>
-    <string name="fragment_about__translate_text">Asnas ulac-it s tutlayt-ik? Tzemreḍ ad tbeddleḍ ayagi! Acuɣer ur tettmudduḍ ara afus di tsuqilt-is? nseqdac asmel Crowdin akken ad nermed i yal yiwen ad isuqel asnas.</string>
-    <string name="fragment_about__translate_button">Eǧǧ-iyi ad suqleɣ</string>
-    <string name="fragment_about__feedback">Mudd-d tikti!</string>
-    <string name="fragment_about__feedback_text">dandelion* yezga di tneflit, ihi ma ɣur-k isumar neɣ yal tikti, seqdec aneḍfaṛ nneɣ n ibugen akken ad tazneḍ!</string>
-    <string name="fragment_about__feedback_button">Azen ibugen</string>
-    <string name="fragment_about__spread_the_word">Siqeḍ awal!</string>
-    <string name="fragment_about__spread_the_word_text">Meslay i yimdukal-ik akked twacult-ik ɣef diaspora* d #dandelion! Acuɣer ur tettmaeslayeḍ ara deg iblugen ɣef aya? Nebɣa ad nsel kra sɣur-k!</string>
-    <string name="fragment_about__spread_the_word_button">Bḍu asnas</string>
-    <string name="fragment_about__spread_the_word_share_text">Hey! Senqed #dandelion! %1$s</string>
+    <string name="about">Γef</string>
+    <string name="license">Turagt</string>
+    <string name="debugging">Tamseɣtayt</string>
+    <string name="application">Asnas</string>
+    <string name="device">Ibenk</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Aɣmis n temseɣtayt</string>
+    <string name="debug_log_verbose">Aɣmis n temseɣtayt (Verbose)</string>
+    <string name="app_version_with_arg">Lqem n usnas: %1$s</string>
+    <string name="android_version_witharg">Lqem Android: %1$s</string>
+    <string name="device_name_witharg">Isem n yibenk: %1$s</string>
+    <string name="code_name_witharg">Isem n tengalt: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Isem n umaɣnu n upud: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Tansa n upud: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Aɣmis n temseqtayt yettwaneɣlen ɣef afus</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* d asnas-ik amdakel i tunigin deg uẓeṭṭa n tmetti diaspora*. Ad yernu timahilin am ifecka iwulmen akked usefrek n iqeddacen ipṛuksiyen am uẓeṭṭa Tor ar tarimit-ik n tmetti.</string>
+    <string name="contribute_code">Ttekki di tengalt!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* d ilelli, udiɣ yeṭṭafaṛ tiktiwin n useɣzan diaspora*. Ma tebɣiḍ ad tettekkiḍ, Iya-d! Akka tura, nekni d tarbaɛt meẓẓiyen, ihi ad nebɣu yal anaw n tallelt!</string>
+    <string name="get_the_source">Awi aɣbalu</string>
+    <string name="translate_the_app">Suqel asnas!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Asnas ulac-it s tutlayt-ik? Tzemreḍ ad tbeddleḍ ayagi! Acuɣer ur tettmudduḍ ara afus di tsuqilt-is? nseqdac asmel Crowdin akken ad nermed i yal yiwen ad isuqel asnas.</string>
+    <string name="let_me_translate">Eǧǧ-iyi ad suqleɣ</string>
+    <string name="give_feedback">Mudd-d tikti!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* yezga di tneflit, ihi ma ɣur-k isumar neɣ yal tikti, seqdec aneḍfaṛ nneɣ n ibugen akken ad tazneḍ!</string>
+    <string name="report_bugs">Azen ibugen</string>
+    <string name="spread_the_word">Siqeḍ awal!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Meslay i yimdukal-ik akked twacult-ik ɣef diaspora* d #dandelion! Acuɣer ur tettmaeslayeḍ ara deg iblugen ɣef aya? Nebɣa ad nsel kra sɣur-k!</string>
+    <string name="share_the_app">Bḍu asnas</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Senqed #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Wid yettseggimen</string>
-    <string name="fragment_license__maintainers_text">Asnas-agi yezga di tneflit akked useggem sɣru &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Iwiziwen</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Tanemmirt!</string>
-    <string name="fragment_license__license_button">Turagt GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Tinedlisin tis kraḍ</string>
-    <string name="fragment_license__thirdparty_libs_text">Tinedlisin-agi ttwaseqdacent:</string>
-    <string name="fragment_license__misc_leafpic">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
-    <string name="fragment_license__misc_leafpic_button">Ini-yid ugar</string>
+    <string name="maintainers">Wid yettseggimen</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Asnas-agi yezga di tneflit akked useggem sɣru &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Iwiziwen</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Tanemmirt!</string>
+    <string name="gnu_gplv3_license">Turagt GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Tinedlisin tis kraḍ</string>
+    <string name="the_following_libraries_are_used">Tinedlisin-agi ttwaseqdacent:</string>
+    <string name="inspiration_from_leafpic__appspecific">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
+    <string name="tell_me_more">Ini-yid ugar</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -140,62 +140,62 @@
     <string name="pref_desc__primary_color">Ini n ufeggag n ifecka</string>
     <string name="pref_title__accent_color">Ini asnawan</string>
     <string name="pref_desc__accent_color">Ini n ufeggag n usfari</string>
-    <string name="pref_title__primary_color__amoled_mode">Askar AMOLED</string>
+    <string name="amoled_mode">Askar AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Semselsi initen s uberkan yemṣadan d uskan AMOLED, ɣef ddeqs n yiḥricen n usnas. Akken ad tinigeḍ di diaspora* s sukan ubrik, tzemreḍ daɣen ad tesqedceḍ asentel Aberkan, win ara tafeḍ deg iɣewwaṛen-ik udmawanen n umiḍan-ik diaspora*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Ilɣa n usiɣzef</string>
-    <string name="pref_desc__extended_notifications">Siɣzef nnaqus n ilɣa s umuɣ n udrurem ara d-iseknen taggayin n ulɣu</string>
-    <string name="pref_desc__language">Snifel tutlayt n usnas-agi. Ales tanekra n usnas akken ad tbeddel tutlayt</string>
-    <string name="pref_title__language">Tutlayt</string>
-    <string name="language_system">Tutlayt n unagraw</string>
+    <string name="extended_notifications">Ilɣa n usiɣzef</string>
+    <string name="extendend_notifications_bell_description__appspecific">Siɣzef nnaqus n ilɣa s umuɣ n udrurem ara d-iseknen taggayin n ulɣu</string>
+    <string name="language_change_restart_description">Snifel tutlayt n usnas-agi. Ales tanekra n usnas akken ad tbeddel tutlayt</string>
+    <string name="language">Tutlayt</string>
+    <string name="system_language">Tutlayt n unagraw</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Ad iqareɛ teɣzi n uḍris i uskan Web</string>
-    <string name="pref_title__font_size">Teɣzi n tsefsit</string>
-    <string name="font_size_normal">Amagnu</string>
-    <string name="font_size_large">Hraw</string>
-    <string name="font_size_huge">Meqqer</string>
+    <string name="control_textsize_of_webview">Ad iqareɛ teɣzi n uḍris i uskan Web</string>
+    <string name="font_size">Teɣzi n tsefsit</string>
+    <string name="normal">Amagnu</string>
+    <string name="large">Hraw</string>
+    <string name="huge">Meqqer</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Sali-d tugniwin</string>
-    <string name="pref_desc__load_images">Sens abeddel n tugniwin akken ad tḥerzeḍ isefka n uziraz</string>
+    <string name="load_images">Sali-d tugniwin</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Sens abeddel n tugniwin akken ad tḥerzeḍ isefka n uziraz</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Tuzya n ugdil</string>
-    <string name="pref_desc__screen_rotation">Tuzya tawurmant n ugdil</string>
-    <string name="rotation_system">Amezwer</string>
-    <string name="rotation_sensor">Amaṭṭaf\n(ad yezgel iɣewwaṛen n unagraw)</string>
-    <string name="rotation_portrait">S teɣzi</string>
-    <string name="rotation_landscape">S tehri</string>
+    <string name="screen_rotation">Tuzya n ugdil</string>
+    <string name="control_screen_rotation">Tuzya tawurmant n ugdil</string>
+    <string name="default_">Amezwer</string>
+    <string name="sensor_ignore_system_settings">Amaṭṭaf\n(ad yezgel iɣewwaṛen n unagraw)</string>
+    <string name="portrait">S teɣzi</string>
+    <string name="landscape">S tehri</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Sali-d tawila tuzwirt Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Sali-d iɣewwaṛen n upṛuksi i upṛuksi HTTP Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Apṛuksu</string>
-    <string name="pref_title__proxy_enabled">Rmed apṛuksi</string>
-    <string name="pref_desc__http_proxy_enabled">Apṛuksi i dandelion* akken ur tseqdaceḍ ara aɣrab n tmes.\nIzmer ilaq-ak tulsa n tnekra.</string>
-    <string name="pref_title__http_proxy_host">Asenneftaɣ</string>
-    <string name="pref_title__http_proxy_port">Tawwurt</string>
-    <string name="toast__proxy_disabled__restart_required">Asnas yesra ad yales tanekra akken ad isens aseqdec n upṛuksi</string>
-    <string name="toast__proxy_orbot_preset_loaded">Aseggem uzwir n upṛuksi Orbot i d-yulin</string>
+    <string name="load_tor_preset">Sali-d tawila tuzwirt Tor</string>
+    <string name="load_proxy_settins_for_tor">Sali-d iɣewwaṛen n upṛuksi i upṛuksi HTTP Tor (Orbot)</string>
+    <string name="proxy">Apṛuksu</string>
+    <string name="enable_proxy">Rmed apṛuksi</string>
+    <string name="proxy_dandelion_traffic__appspecific">Apṛuksi i dandelion* akken ur tseqdaceḍ ara aɣrab n tmes.\nIzmer ilaq-ak tulsa n tnekra.</string>
+    <string name="host">Asenneftaɣ</string>
+    <string name="port">Tawwurt</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Asnas yesra ad yales tanekra akken ad isens aseqdec n upṛuksi</string>
+    <string name="orbot_proxy_preset_loaded">Aseggem uzwir n upṛuksi Orbot i d-yulin</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Ldi iseɣwan izɣrayen s Chrome Custom Tabs. Chromium neɣ Google Chrome yessefk ad yebded i useqdec n tmahilt-agi. \nTAMAWT TAXATERT: Chrome Custom Tabs ur iseqdac ara iqeddacen ipṛuksiyen ibedden!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Ldi iseɣwan izɣrayen s Chrome Custom Tabs. Chromium neɣ Google Chrome yessefk ad yebded i useqdec n tmahilt-agi. \nTAMAWT TAXATERT: Chrome Custom Tabs ur iseqdac ara iqeddacen ipṛuksiyen ibedden!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Iɣewwaṛen udmawanen</string>
-    <string name="pref_desc__personal_settings">Ldi iɣewwaṛen-ik n umiḍan diaspora*</string>
-    <string name="pref_desc__manage_contacts">Sefrek tabdart-ik n unermes</string>
-    <string name="pref_title__manage_tags">Sefrek Hashtag</string>
-    <string name="pref_desc__manage_tags">Ur ṭṭafaṛ ara hashtag-agi</string>
-    <string name="pref_title__change_account">Beddel amiḍan</string>
-    <string name="pref_desc__change_account">Sfeḍ isefka n tɣimit idiganen sakin ddu ar upud/amiḍan nniḍen diaspora*</string>
-    <string name="pref_warning__change_account">Tamhelt-agi ad tsewḥel inagan n tuqqna akked isefka n tɣimit. Tebɣiḍ ad tbeddleḍ amiḍan?</string>
-    <string name="pref_title__clear_cache">Sfeḍ tuffirt</string>
-    <string name="pref_desc__clear_cache">Sfeḍ tuffirt n WebView</string>
-    <string name="pref_desc__intellihide_toolbars">Ad yeffer ifeggagen n ifecka n ufella d wadda s wudem awurman deg udrurem</string>
-    <string name="pref_title__intellihide_toolbars">Ffer afeggag n ifecka</string>
-    <string name="pref_title__append_shared_via_app">Rnu yebḍa s tikti</string>
-    <string name="pref_desc__append_shared_via_app">Rnu tamsisɣelt ar usnas-agi i beṭṭu: [s #dandelion]</string>
+    <string name="personal_settings">Iɣewwaṛen udmawanen</string>
+    <string name="open_diaspora_account_settings__appspecific">Ldi iɣewwaṛen-ik n umiḍan diaspora*</string>
+    <string name="manage_your_contact_list">Sefrek tabdart-ik n unermes</string>
+    <string name="manage_hashtags">Sefrek Hashtag</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Ur ṭṭafaṛ ara hashtag-agi</string>
+    <string name="change_account">Beddel amiḍan</string>
+    <string name="loug_warning_description__appspecific">Sfeḍ isefka n tɣimit idiganen sakin ddu ar upud/amiḍan nniḍen diaspora*</string>
+    <string name="logout_warning_description">Tamhelt-agi ad tsewḥel inagan n tuqqna akked isefka n tɣimit. Tebɣiḍ ad tbeddleḍ amiḍan?</string>
+    <string name="clear_cache">Sfeḍ tuffirt</string>
+    <string name="clear_webview_cache">Sfeḍ tuffirt n WebView</string>
+    <string name="intellihide_toolbars__appspecific">Ad yeffer ifeggagen n ifecka n ufella d wadda s wudem awurman deg udrurem</string>
+    <string name="intellihide_toolbars">Ffer afeggag n ifecka</string>
+    <string name="append_shared_by_notice">Rnu yebḍa s tikti</string>
+    <string name="append_shared_by_notice__appspecific">Rnu tamsisɣelt ar usnas-agi i beṭṭu: [s #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Ayen nniḍen</string>
-    <string name="pref_title__wipe_settings">Tulsa n uwennez ummid</string>
-    <string name="pref_desc__wipe_settings">Ad yesfeḍ s wudem adigan akk iɣewwaṛen icudden ar usnas sakin ad yekkes si tuqqna akk imiḍanen</string>
-    <string name="dialog_content__wipe_settings">Ayagi ad yales awennez n ibeddilen meṛṛa ar wazalen-nsen n tazwara sakin ad isuffeɣ si tuqqna akk ipuden. Tugniwin-ik yudren ad qqiment akken llant. Tebɣiḍ ad tkemmleḍ?</string>
-    <string name="pref_desc__adblock_enable">Rmd amsewḥal n udellel. Adelle yezmer ad ddunt, m.d. deg tmeẓriyin tusliɣin</string>
-    <string name="pref_title__adblock_enable">Sewḥel adellel</string>
+    <string name="miscellaneous">Ayen nniḍen</string>
+    <string name="full_reset">Tulsa n uwennez ummid</string>
+    <string name="wipe_settings_and_logout">Ad yesfeḍ s wudem adigan akk iɣewwaṛen icudden ar usnas sakin ad yekkes si tuqqna akk imiḍanen</string>
+    <string name="wipe_settings_warning__appspecific">Ayagi ad yales awennez n ibeddilen meṛṛa ar wazalen-nsen n tazwara sakin ad isuffeɣ si tuqqna akk ipuden. Tugniwin-ik yudren ad qqiment akken llant. Tebɣiḍ ad tkemmleḍ?</string>
+    <string name="enable_basic_adblocker_description">Rmd amsewḥal n udellel. Adelle yezmer ad ddunt, m.d. deg tmeẓriyin tusliɣin</string>
+    <string name="block_advertisments">Sewḥel adellel</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 706bf460..01287926 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -72,22 +72,22 @@
     <string name="missing_value">കാണാതായ മൂല്യം</string>
     <string name="jump_to_last_visited_timestamp_in_stream">സ്ട്രീമിലെ അവസാനമായി സന്ദർശിച്ച പേജിലേക്ക് പോകുക?</string>
 
-    <string name="about_activity__title_about_app">കുറിച്ച്</string>
-    <string name="about_activity__title_about_license">ലൈസൻസ്</string>
-    <string name="about_activity__title_debug_info">തെറ്റു കണ്ടുപിടിക്കുക</string>
-    <string name="fragment_debug__section_app">ആപ്പ്ളിക്കേഷൻ</string>
-    <string name="fragment_debug__section_device">ഉപകരണം</string>
-    <string name="fragment_debug__section_pod">diaspora* പോഡ്</string>
-    <string name="fragment_debug__section_log">തിരുത്തിയ തെറ്റുകളുടെ പട്ടിക</string>
-    <string name="fragment_debug__section_log_spam">തിരുത്തിയ തെറ്റുകൾ (വേർബോസ്)</string>
-    <string name="fragment_debug__app_version">ആപ്പ് വേർഷൻ: %1$s</string>
-    <string name="fragment_debug__android_version">ആൻഡ്രോയ്ഡ് വേർഷൻ: %1$s</string>
-    <string name="fragment_debug__device_name">ഉപകരണത്തിന്റെ പേര്:%1$s</string>
-    <string name="fragment_debug__app_codename">കോഡ്നെയിം: %1$s</string>
+    <string name="about">കുറിച്ച്</string>
+    <string name="license">ലൈസൻസ്</string>
+    <string name="debugging">തെറ്റു കണ്ടുപിടിക്കുക</string>
+    <string name="application">ആപ്പ്ളിക്കേഷൻ</string>
+    <string name="device">ഉപകരണം</string>
+    <string name="diaspora_pod__appspecific">diaspora* പോഡ്</string>
+    <string name="debug_log">തിരുത്തിയ തെറ്റുകളുടെ പട്ടിക</string>
+    <string name="debug_log_verbose">തിരുത്തിയ തെറ്റുകൾ (വേർബോസ്)</string>
+    <string name="app_version_with_arg">ആപ്പ് വേർഷൻ: %1$s</string>
+    <string name="android_version_witharg">ആൻഡ്രോയ്ഡ് വേർഷൻ: %1$s</string>
+    <string name="device_name_witharg">ഉപകരണത്തിന്റെ പേര്:%1$s</string>
+    <string name="code_name_witharg">കോഡ്നെയിം: %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__thirdparty_libs_text">താഴെ പറഞ്ഞിരിക്കുന്ന ലൈബ്രറികൾ ഉപയോഗിച്ചിരിക്കുന്നു:</string>
-    <string name="fragment_license__misc_leafpic">ഞങ്ങൾ ചില കോഡുകൾ കടമെടുത്തതും പ്രചോദനമായതും ലീഫ്പിക് ഇൽ നിന്നാണ്. ഒന്നു പരിശോധിക്കൂ.. അതും സ്വതന്ത്ര സോഫ്റ്റ്‌വേർ ആണ്!</string>
-    <string name="fragment_license__misc_leafpic_button">വിശദീകരിക്കുക</string>
+    <string name="the_following_libraries_are_used">താഴെ പറഞ്ഞിരിക്കുന്ന ലൈബ്രറികൾ ഉപയോഗിച്ചിരിക്കുന്നു:</string>
+    <string name="inspiration_from_leafpic__appspecific">ഞങ്ങൾ ചില കോഡുകൾ കടമെടുത്തതും പ്രചോദനമായതും ലീഫ്പിക് ഇൽ നിന്നാണ്. ഒന്നു പരിശോധിക്കൂ.. അതും സ്വതന്ത്ര സോഫ്റ്റ്‌വേർ ആണ്!</string>
+    <string name="tell_me_more">വിശദീകരിക്കുക</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -112,52 +112,52 @@
     <string name="pref_desc__primary_color">ടൂൾബാറുകളുടെ നിറം</string>
     <string name="pref_title__accent_color">എടുത്തുകാണിക്കുന്ന നിറം</string>
     <string name="pref_desc__accent_color">പ്രോഗ്രസ് ബാറിന്റെ നിറം</string>
-    <string name="pref_title__primary_color__amoled_mode">അമോൾഡ് മോഡ്</string>
+    <string name="amoled_mode">അമോൾഡ് മോഡ്</string>
     <string name="pref_desc__primary_color__amoled_mode">അമോലെഡ് ഡിസ്പ്ലേ സൗഹൃദമായ കറുപ്പ് നിറം ആപ്പിന്റെ പല ഭാഗങ്ങളിലും മറ്റു നിറങ്ങളെ മറികടക്കും. ഈ ക്രമീകരണം മാറ്റുവാൻ ആപ്പ് വീണ്ടും തുറക്കേണ്ടി വരും. നിങ്ങളുടെ സ്വകാര്യ ഡയസ്പോറ* അകൗണ്ട് ക്രമീകരണങ്ങളിലെ ഇരുണ്ട തീം പ്രയോഗിച്ചാൽ ഡയസ്പോറ* നിങ്ങൾക്ക് ഇരുണ്ട പശ്ചാത്തലത്തിൽ ഉപയോഗിക്കാം.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">വ്യാപിപ്പിച്ച വിജ്ഞാപനങ്ങൾ</string>
-    <string name="pref_desc__extended_notifications">വിജ്ഞാപന വിഭാഗങ്ങൾ കാണിക്കുന്ന താഴേക്ക് വലിക്കാവുന്ന മെനുവിൽ വിജ്ഞാപന മണി വലുതാക്കുക</string>
-    <string name="pref_desc__language">ആപ്പിന്റെ ഭാഷ മാറ്റുക. മാറ്റം ഫലപ്രദമാകുവാൻ ആപ്പ് വീണ്ടും തുറക്കുക</string>
-    <string name="pref_title__language">ഭാഷ</string>
-    <string name="language_system">സിസ്റ്റത്തിലെ ഭാഷ</string>
+    <string name="extended_notifications">വ്യാപിപ്പിച്ച വിജ്ഞാപനങ്ങൾ</string>
+    <string name="extendend_notifications_bell_description__appspecific">വിജ്ഞാപന വിഭാഗങ്ങൾ കാണിക്കുന്ന താഴേക്ക് വലിക്കാവുന്ന മെനുവിൽ വിജ്ഞാപന മണി വലുതാക്കുക</string>
+    <string name="language_change_restart_description">ആപ്പിന്റെ ഭാഷ മാറ്റുക. മാറ്റം ഫലപ്രദമാകുവാൻ ആപ്പ് വീണ്ടും തുറക്കുക</string>
+    <string name="language">ഭാഷ</string>
+    <string name="system_language">സിസ്റ്റത്തിലെ ഭാഷ</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">വെബ്‌വ്യൂ അക്ഷരങ്ങളുടെ വലിപ്പം നിയന്ത്രിക്കുക</string>
-    <string name="pref_title__font_size">അക്ഷരങ്ങളുടെ വലിപ്പം</string>
-    <string name="font_size_normal">സാധാരണ</string>
-    <string name="font_size_large">വലിയ</string>
-    <string name="font_size_huge">ഭീമാകാരമായ</string>
+    <string name="control_textsize_of_webview">വെബ്‌വ്യൂ അക്ഷരങ്ങളുടെ വലിപ്പം നിയന്ത്രിക്കുക</string>
+    <string name="font_size">അക്ഷരങ്ങളുടെ വലിപ്പം</string>
+    <string name="normal">സാധാരണ</string>
+    <string name="large">വലിയ</string>
+    <string name="huge">ഭീമാകാരമായ</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">ചിത്രങ്ങൾ ലോഡ് ചെയ്യുക</string>
-    <string name="pref_desc__load_images">ചിത്രം ലോഡ് ചെയ്യുന്നത് മാറ്റുക. ഉദാ:- മൊബൈൽ ഡാറ്റാ ലഭിക്കുന്നതിനായി</string>
+    <string name="load_images">ചിത്രങ്ങൾ ലോഡ് ചെയ്യുക</string>
+    <string name="toggle_image_loading_to_save_mobile_data">ചിത്രം ലോഡ് ചെയ്യുന്നത് മാറ്റുക. ഉദാ:- മൊബൈൽ ഡാറ്റാ ലഭിക്കുന്നതിനായി</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">സ്‌ക്രീൻ കറക്കുക</string>
-    <string name="pref_desc__screen_rotation">തനിയെ സ്‌ക്രീൻ ചുറ്റുന്നത് നിയന്ത്രിക്കുക</string>
-    <string name="rotation_system">സ്വതേ ഉള്ള മൂല്യം</string>
-    <string name="rotation_sensor">സെൻസർ\n (സിസ്റ്റം ക്രമീകരണങ്ങളെ അവഗണിക്കുക)</string>
-    <string name="rotation_portrait">പോർട്രൈറ്റ്</string>
-    <string name="rotation_landscape">ലാൻസ്‌കേപ്</string>
+    <string name="screen_rotation">സ്‌ക്രീൻ കറക്കുക</string>
+    <string name="control_screen_rotation">തനിയെ സ്‌ക്രീൻ ചുറ്റുന്നത് നിയന്ത്രിക്കുക</string>
+    <string name="default_">സ്വതേ ഉള്ള മൂല്യം</string>
+    <string name="sensor_ignore_system_settings">സെൻസർ\n (സിസ്റ്റം ക്രമീകരണങ്ങളെ അവഗണിക്കുക)</string>
+    <string name="portrait">പോർട്രൈറ്റ്</string>
+    <string name="landscape">ലാൻസ്‌കേപ്</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">ടോറിൽ മുൻകൂറായി രേഖപ്പെടുത്തിയ മൂല്യങ്ങൾ ലോഡ് ചെയ്യുക</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">ടോർ (ഓർബോട്ട്) HTTP പ്രോക്സി ക്രമീകരണങ്ങൾ ലോഡ് ചെയ്യുക</string>
-    <string name="pref_title__sub_proxy">പ്രോക്സി</string>
-    <string name="pref_title__proxy_enabled">പ്രോക്സി പ്രയോഗിക്കുക</string>
-    <string name="pref_title__http_proxy_host">ഹോസ്റ്റ്</string>
-    <string name="pref_title__http_proxy_port">പോർട്ട്</string>
-    <string name="toast__proxy_disabled__restart_required">പ്രോക്സി ഉപയോഗം പ്രവർത്തനരഹിതമാക്കുവാൻ ആപ്പ് വീണ്ടും തുറക്കുക</string>
-    <string name="toast__proxy_orbot_preset_loaded">മുൻകൂറായി ഉണ്ടായിരുന്ന ഓർബോട്ട് പ്രോക്സി ലോഡ് ചെയ്തു</string>
+    <string name="load_tor_preset">ടോറിൽ മുൻകൂറായി രേഖപ്പെടുത്തിയ മൂല്യങ്ങൾ ലോഡ് ചെയ്യുക</string>
+    <string name="load_proxy_settins_for_tor">ടോർ (ഓർബോട്ട്) HTTP പ്രോക്സി ക്രമീകരണങ്ങൾ ലോഡ് ചെയ്യുക</string>
+    <string name="proxy">പ്രോക്സി</string>
+    <string name="enable_proxy">പ്രോക്സി പ്രയോഗിക്കുക</string>
+    <string name="host">ഹോസ്റ്റ്</string>
+    <string name="port">പോർട്ട്</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">പ്രോക്സി ഉപയോഗം പ്രവർത്തനരഹിതമാക്കുവാൻ ആപ്പ് വീണ്ടും തുറക്കുക</string>
+    <string name="orbot_proxy_preset_loaded">മുൻകൂറായി ഉണ്ടായിരുന്ന ഓർബോട്ട് പ്രോക്സി ലോഡ് ചെയ്തു</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">പുറമെയുള്ള ലിങ്കുകൾ ക്രോം കസ്റ്റം ടാബിൽ തുറക്കുക. ക്രോമിയം അല്ലെങ്കിൽ ഗൂഗിൾ ക്രോം ഈ സൗകര്യം ലഭിക്കുന്നതിനായി ഇൻസ്റ്റാൾ ചെയ്തിരിക്കണം.
+    <string name="open_external_links_with_chrome_custom_tabs_description">പുറമെയുള്ള ലിങ്കുകൾ ക്രോം കസ്റ്റം ടാബിൽ തുറക്കുക. ക്രോമിയം അല്ലെങ്കിൽ ഗൂഗിൾ ക്രോം ഈ സൗകര്യം ലഭിക്കുന്നതിനായി ഇൻസ്റ്റാൾ ചെയ്തിരിക്കണം.
 \n പ്രധാന അറിയിപ്പ്: ക്രമീകരിച്ച പ്രോക്സി സെർവറുകൾ ക്രോം കസ്റ്റം ടാബുകൾ ഉപയോഗിക്കാറില്ല!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">സ്വകാര്യ ക്രമീകരണങ്ങൾ</string>
-    <string name="pref_desc__personal_settings">നിങ്ങളുടെ ഡയസ്പോറ* അക്കൗണ്ട് ക്രമീകരണങ്ങൾ തുറക്കുക</string>
-    <string name="pref_desc__manage_contacts">നിങ്ങളുടെ സമ്പർക്കങ്ങളുടെ പട്ടിക കൈകാര്യം ചെയ്യുക</string>
-    <string name="pref_title__manage_tags">ഹാഷ്ടാഗുകൾ കൈകാര്യം ചെയ്യുക</string>
-    <string name="pref_desc__manage_tags">പിന്തുടർന്ന് വന്ന ഹാഷ്ടാഗുകൾ പിന്തുടരാതിരിക്കുക</string>
-    <string name="pref_title__change_account">അക്കൗണ്ട് മാറ്റുക</string>
-    <string name="pref_desc__change_account">പ്രാദേശികമായ സെഷൻ ഡാറ്റ മായ്ച്ച ശേഷം മറ്റൊരു ഡയസ്പോറ* പോഡ്/അക്കൗണ്ട് ലേക്ക് മാറുക</string>
-    <string name="pref_desc__intellihide_toolbars">മുകളിലെയും ചുവട്ടിലെയും ടൂൾബാറുകൾ സ്ക്രോൾ ചെയ്യുമ്പോൾ താനേ അപ്രത്യക്ഷമാക്കുക</string>
+    <string name="personal_settings">സ്വകാര്യ ക്രമീകരണങ്ങൾ</string>
+    <string name="open_diaspora_account_settings__appspecific">നിങ്ങളുടെ ഡയസ്പോറ* അക്കൗണ്ട് ക്രമീകരണങ്ങൾ തുറക്കുക</string>
+    <string name="manage_your_contact_list">നിങ്ങളുടെ സമ്പർക്കങ്ങളുടെ പട്ടിക കൈകാര്യം ചെയ്യുക</string>
+    <string name="manage_hashtags">ഹാഷ്ടാഗുകൾ കൈകാര്യം ചെയ്യുക</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">പിന്തുടർന്ന് വന്ന ഹാഷ്ടാഗുകൾ പിന്തുടരാതിരിക്കുക</string>
+    <string name="change_account">അക്കൗണ്ട് മാറ്റുക</string>
+    <string name="loug_warning_description__appspecific">പ്രാദേശികമായ സെഷൻ ഡാറ്റ മായ്ച്ച ശേഷം മറ്റൊരു ഡയസ്പോറ* പോഡ്/അക്കൗണ്ട് ലേക്ക് മാറുക</string>
+    <string name="intellihide_toolbars__appspecific">മുകളിലെയും ചുവട്ടിലെയും ടൂൾബാറുകൾ സ്ക്രോൾ ചെയ്യുമ്പോൾ താനേ അപ്രത്യക്ഷമാക്കുക</string>
     <!-- More -->
-    <string name="pref_desc__adblock_enable">ലളിതമായ ആഡ്ബ്ലോക്കർ സജ്ജമാക്കുക. പരസ്യങ്ങൾ ചിലപ്പോൾ ഉൾപ്പെടാം. ഉദാ: എംബെഡ്ഡ് ചെയ്‌ത കാഴ്ചയിൽ</string>
-    <string name="pref_title__adblock_enable">പരസ്യങ്ങൾ തടയുക</string>
+    <string name="enable_basic_adblocker_description">ലളിതമായ ആഡ്ബ്ലോക്കർ സജ്ജമാക്കുക. പരസ്യങ്ങൾ ചിലപ്പോൾ ഉൾപ്പെടാം. ഉദാ: എംബെഡ്ഡ് ചെയ്‌ത കാഴ്ചയിൽ</string>
+    <string name="block_advertisments">പരസ്യങ്ങൾ തടയുക</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dabb1c6e..1956c21f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -72,45 +72,45 @@
     <string name="missing_value">Ontbrekende waarde</string>
     <string name="jump_to_last_visited_timestamp_in_stream">Ga naar laatste bezochte pagina in de stream?</string>
 
-    <string name="about_activity__title_about_app">Over</string>
-    <string name="about_activity__title_about_license">Licentie</string>
-    <string name="about_activity__title_debug_info">Foutopsporing</string>
-    <string name="fragment_debug__section_app">Applicatie</string>
-    <string name="fragment_debug__section_device">Apparaat</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Foutoplossing</string>
-    <string name="fragment_debug__section_log_spam">Foutoplossing (Verbose)</string>
-    <string name="fragment_debug__app_version">App Versie: %1$s</string>
-    <string name="fragment_debug__android_version">Android Versie: %1$s</string>
-    <string name="fragment_debug__device_name">Apparaatnaam: %1$s</string>
-    <string name="fragment_debug__app_codename">Codenaam: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod Profielnaam: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod Domein: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Debuglog gekopieerd naar klembord</string>
-    <string name="fragment_about__about_text">dandelion* is jouw bedrijfsapp om te surfen op het sociale netwerk diaspora*. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Netwerk aan uw sociale ervaringen.</string>
-    <string name="fragment_about__contribute">Code bijdragen!</string>
-    <string name="fragment_about__contribute_text">dandelion* is vrij zoals in vrijheid ontwikkeld en volgt de ideeën van het diaspora* project. Als u iets wilt bijdragen, gaat uw gang! Op dit moment zijn we een erg klein team, dus we waarderen elke vorm van hulp!</string>
-    <string name="fragment_about__contribute_button">Krijg de bron</string>
-    <string name="fragment_about__translate">Vertaal deze App!</string>
-    <string name="fragment_about__translate_text">De app niet beschikbaar in jouw taal? Jij kan dat veranderen! Waarom zou u niet helpen met vertalen? We gebruiken het crowdin platform zodat iedereen kan helpen met vertalen.</string>
-    <string name="fragment_about__translate_button">Laat me vertalen</string>
-    <string name="fragment_about__feedback">Geef Feedback!</string>
-    <string name="fragment_about__feedback_text">dandelion* is nog in ontwikkeling, dus heeft u suggesties of enige vorm van feedback, gebruik dan onze bug tracker om ons te laten weten!</string>
-    <string name="fragment_about__feedback_button">Bugs melden</string>
-    <string name="fragment_about__spread_the_word">Vertel het verder!</string>
-    <string name="fragment_about__spread_the_word_text">Vertel uw vrienden en familie over diaspora* en #dandelion! Waarom blogt u niet over uw ervaringen? We willen graag uw ervaringen horen!</string>
-    <string name="fragment_about__spread_the_word_button">Deel deze app</string>
-    <string name="fragment_about__spread_the_word_share_text">Hey! Bekijk #dandelion! %1$s</string>
+    <string name="about">Over</string>
+    <string name="license">Licentie</string>
+    <string name="debugging">Foutopsporing</string>
+    <string name="application">Applicatie</string>
+    <string name="device">Apparaat</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Foutoplossing</string>
+    <string name="debug_log_verbose">Foutoplossing (Verbose)</string>
+    <string name="app_version_with_arg">App Versie: %1$s</string>
+    <string name="android_version_witharg">Android Versie: %1$s</string>
+    <string name="device_name_witharg">Apparaatnaam: %1$s</string>
+    <string name="code_name_witharg">Codenaam: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profielnaam: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Domein: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Debuglog gekopieerd naar klembord</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* is jouw bedrijfsapp om te surfen op het sociale netwerk diaspora*. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Netwerk aan uw sociale ervaringen.</string>
+    <string name="contribute_code">Code bijdragen!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* is vrij zoals in vrijheid ontwikkeld en volgt de ideeën van het diaspora* project. Als u iets wilt bijdragen, gaat uw gang! Op dit moment zijn we een erg klein team, dus we waarderen elke vorm van hulp!</string>
+    <string name="get_the_source">Krijg de bron</string>
+    <string name="translate_the_app">Vertaal deze App!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">De app niet beschikbaar in jouw taal? Jij kan dat veranderen! Waarom zou u niet helpen met vertalen? We gebruiken het crowdin platform zodat iedereen kan helpen met vertalen.</string>
+    <string name="let_me_translate">Laat me vertalen</string>
+    <string name="give_feedback">Geef Feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* is nog in ontwikkeling, dus heeft u suggesties of enige vorm van feedback, gebruik dan onze bug tracker om ons te laten weten!</string>
+    <string name="report_bugs">Bugs melden</string>
+    <string name="spread_the_word">Vertel het verder!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Vertel uw vrienden en familie over diaspora* en #dandelion! Waarom blogt u niet over uw ervaringen? We willen graag uw ervaringen horen!</string>
+    <string name="share_the_app">Deel deze app</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Bekijk #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Onderhouders</string>
-    <string name="fragment_license__maintainers_text">Deze app wordt momenteel ontwikkeld en onderhouden door &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="fragment_license__contributors">Bijdragers</string>
-    <string name="fragment_license__contributors_thank_you">%1$s &lt; br &gt;&lt; br &gt; dank u!</string>
-    <string name="fragment_license__license_button">GNU GPLv3 + licentie</string>
-    <string name="fragment_license__thirdparty_libs">3rd Party Bibliotheken</string>
-    <string name="fragment_license__thirdparty_libs_text">De volgende bibliotheken worden gebruikt:</string>
-    <string name="fragment_license__misc_leafpic">We zijn geïnspireerd door LeafPic en lenen er code van. Ga kijken, deze vrije software is het proberen waard!</string>
-    <string name="fragment_license__misc_leafpic_button">Vertel me meer</string>
+    <string name="maintainers">Onderhouders</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Deze app wordt momenteel ontwikkeld en onderhouden door &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Bijdragers</string>
+    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; dank u!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3 + licentie</string>
+    <string name="show_third_party_licenses">3rd Party Bibliotheken</string>
+    <string name="the_following_libraries_are_used">De volgende bibliotheken worden gebruikt:</string>
+    <string name="inspiration_from_leafpic__appspecific">We zijn geïnspireerd door LeafPic en lenen er code van. Ga kijken, deze vrije software is het proberen waard!</string>
+    <string name="tell_me_more">Vertel me meer</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -135,62 +135,62 @@
     <string name="pref_desc__primary_color">Kleur van de werkbalken</string>
     <string name="pref_title__accent_color">Accentkleur</string>
     <string name="pref_desc__accent_color">Kleur van de progresbalk</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED modus</string>
+    <string name="amoled_mode">AMOLED modus</string>
     <string name="pref_desc__primary_color__amoled_mode">Overschrijd kleuren met AMOLED display vriendelijk zwart op veel plekken in de app. Je moet de app restarten om deze verandering te zien. Om diaspora* in het donker te zien moet je de Dark thema activeren, dat gevonden kan worden in je eigen diaspora* account instellingen.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Uitgebreide meldingen</string>
-    <string name="pref_desc__extended_notifications">Breidt de notificatie bel uit met een dropdown menu dat de notificatie categorieën laat zien</string>
-    <string name="pref_desc__language">Taal wijzigen van deze app. Opnieuw opstarten om wijzigingen te activeren</string>
-    <string name="pref_title__language">Taal</string>
-    <string name="language_system">Systeemtaal</string>
+    <string name="extended_notifications">Uitgebreide meldingen</string>
+    <string name="extendend_notifications_bell_description__appspecific">Breidt de notificatie bel uit met een dropdown menu dat de notificatie categorieën laat zien</string>
+    <string name="language_change_restart_description">Taal wijzigen van deze app. Opnieuw opstarten om wijzigingen te activeren</string>
+    <string name="language">Taal</string>
+    <string name="system_language">Systeemtaal</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Configureer tekstgrootte van de webview</string>
-    <string name="pref_title__font_size">Lettergrootte</string>
-    <string name="font_size_normal">Normaal</string>
-    <string name="font_size_large">Groot</string>
-    <string name="font_size_huge">Enorm</string>
+    <string name="control_textsize_of_webview">Configureer tekstgrootte van de webview</string>
+    <string name="font_size">Lettergrootte</string>
+    <string name="normal">Normaal</string>
+    <string name="large">Groot</string>
+    <string name="huge">Enorm</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Afbeeldingen laden</string>
-    <string name="pref_desc__load_images">Afbeeldingen uitschakelen om mobiele data te besparen</string>
+    <string name="load_images">Afbeeldingen laden</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Afbeeldingen uitschakelen om mobiele data te besparen</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Schermrotatie</string>
-    <string name="pref_desc__screen_rotation">Configureer automatische schermrotatie</string>
-    <string name="rotation_system">Standaard</string>
-    <string name="rotation_sensor">Sensor\n(negeer systeem instellingen)</string>
-    <string name="rotation_portrait">Portret</string>
-    <string name="rotation_landscape">Landschap</string>
+    <string name="screen_rotation">Schermrotatie</string>
+    <string name="control_screen_rotation">Configureer automatische schermrotatie</string>
+    <string name="default_">Standaard</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(negeer systeem instellingen)</string>
+    <string name="portrait">Portret</string>
+    <string name="landscape">Landschap</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Tor Voorinstelling laden</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Proxy inschakelen</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy dandelion*-verkeer om firewalls te omzeilen. \nVereist mogelijk app herstart. Dit kan op sommige telefoons niet werken.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Poort</string>
-    <string name="toast__proxy_disabled__restart_required">App moet opnieuw opstarten om het gebruik van de proxy uit te schakelen</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot proxy voorinstelling geladen</string>
+    <string name="load_tor_preset">Tor Voorinstelling laden</string>
+    <string name="load_proxy_settins_for_tor">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Proxy inschakelen</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy dandelion*-verkeer om firewalls te omzeilen. \nVereist mogelijk app herstart. Dit kan op sommige telefoons niet werken.</string>
+    <string name="host">Host</string>
+    <string name="port">Poort</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">App moet opnieuw opstarten om het gebruik van de proxy uit te schakelen</string>
+    <string name="orbot_proxy_preset_loaded">Orbot proxy voorinstelling geladen</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Open externe links met Chrome aangepaste tabbladen. Chromium of Google Chrome moet worden geïnstalleerd om deze functie te gebruiken. \nBELANGRIJK Opmerking: Chrome aangepaste tabbladen gebruiken niet geconfigureerde proxyservers!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Open externe links met Chrome aangepaste tabbladen. Chromium of Google Chrome moet worden geïnstalleerd om deze functie te gebruiken. \nBELANGRIJK Opmerking: Chrome aangepaste tabbladen gebruiken niet geconfigureerde proxyservers!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Persoonlijke instellingen</string>
-    <string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora*</string>
-    <string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
-    <string name="pref_title__manage_tags">Beheren van Hashtags</string>
-    <string name="pref_desc__manage_tags">Ontvolg al gevolgde hashtags</string>
-    <string name="pref_title__change_account">Account wijzigen</string>
-    <string name="pref_desc__change_account">Lokale sessiegegevens wissen en schakel over naar een andere diaspora* pod/account</string>
-    <string name="pref_warning__change_account">Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen?</string>
-    <string name="pref_title__clear_cache">Cache wissen</string>
-    <string name="pref_desc__clear_cache">WebView-cache leegmaken</string>
-    <string name="pref_desc__intellihide_toolbars">Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen</string>
-    <string name="pref_title__intellihide_toolbars">Werkbalken slim wegwerken</string>
-    <string name="pref_title__append_shared_via_app">Gedeeld-via-aankondiging toevoegen</string>
-    <string name="pref_desc__append_shared_via_app">Een verwijzing naar deze app toevoegen aan gedeelde teksten: [via #dandelion]</string>
+    <string name="personal_settings">Persoonlijke instellingen</string>
+    <string name="open_diaspora_account_settings__appspecific">Open uw accountinstellingen van diaspora*</string>
+    <string name="manage_your_contact_list">Uw lijst met contactpersonen beheren</string>
+    <string name="manage_hashtags">Beheren van Hashtags</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Ontvolg al gevolgde hashtags</string>
+    <string name="change_account">Account wijzigen</string>
+    <string name="loug_warning_description__appspecific">Lokale sessiegegevens wissen en schakel over naar een andere diaspora* pod/account</string>
+    <string name="logout_warning_description">Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen?</string>
+    <string name="clear_cache">Cache wissen</string>
+    <string name="clear_webview_cache">WebView-cache leegmaken</string>
+    <string name="intellihide_toolbars__appspecific">Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen</string>
+    <string name="intellihide_toolbars">Werkbalken slim wegwerken</string>
+    <string name="append_shared_by_notice">Gedeeld-via-aankondiging toevoegen</string>
+    <string name="append_shared_by_notice__appspecific">Een verwijzing naar deze app toevoegen aan gedeelde teksten: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Overige</string>
-    <string name="pref_title__wipe_settings">Volledige Reset</string>
-    <string name="pref_desc__wipe_settings">Veeg alle lokale instellingen uit gerelateerd aan deze app en log op alle accounts uit</string>
-    <string name="dialog_content__wipe_settings">Dit zal alle instellingen terugzetten en je uitloggen bij elke pod. Je gedownloade afbeeldingen blijven onaangeraakt. Weet je zeker dat je door wilt gaan?</string>
-    <string name="pref_desc__adblock_enable">Simpele AdBlocker inschakelen. Advertenties kunnen bijvoorbeeld bij ingesloten weergaven erbij zitten</string>
-    <string name="pref_title__adblock_enable">Blokkeer advertenties</string>
+    <string name="miscellaneous">Overige</string>
+    <string name="full_reset">Volledige Reset</string>
+    <string name="wipe_settings_and_logout">Veeg alle lokale instellingen uit gerelateerd aan deze app en log op alle accounts uit</string>
+    <string name="wipe_settings_warning__appspecific">Dit zal alle instellingen terugzetten en je uitloggen bij elke pod. Je gedownloade afbeeldingen blijven onaangeraakt. Weet je zeker dat je door wilt gaan?</string>
+    <string name="enable_basic_adblocker_description">Simpele AdBlocker inschakelen. Advertenties kunnen bijvoorbeeld bij ingesloten weergaven erbij zitten</string>
+    <string name="block_advertisments">Blokkeer advertenties</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 4899fc2a..d4e906e8 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -23,7 +23,7 @@
     <string name="pref_desc__primary_color">Verktøylinjefarge</string>
     <string name="pref_title__accent_color">Aksentfarge</string>
     <string name="pref_desc__accent_color">Fremgangslinjefarge</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED-modus</string>
+    <string name="amoled_mode">AMOLED-modus</string>
     <!-- Notifications dropdown -->
     <!-- Font size -->
     <!-- Load images -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 540e67f9..91e07834 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -74,45 +74,45 @@
     <string name="pref_summary__is_statusbar_hidden">Ukryj pasek stanu w głównym widoku</string>
     <string name="pref_title__is_statusbar_hidden">Ukryj pasek stanu</string>
 
-    <string name="about_activity__title_about_app">O aplikacji</string>
-    <string name="about_activity__title_about_license">Licencja</string>
-    <string name="about_activity__title_debug_info">Debugowanie</string>
-    <string name="fragment_debug__section_app">Aplikacja</string>
-    <string name="fragment_debug__section_device">Urządzenie</string>
-    <string name="fragment_debug__section_pod">Pod diaspora*</string>
-    <string name="fragment_debug__section_log">Log debugowania</string>
-    <string name="fragment_debug__section_log_spam">Log debugowania (rozszerzony)</string>
-    <string name="fragment_debug__app_version">Wersja aplikacji: %1$s</string>
-    <string name="fragment_debug__android_version">Wersja systemu Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nazwa urządzenia: %1$s</string>
-    <string name="fragment_debug__app_codename">Nazwa kodowa: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Alias Poda: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Domena Poda: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Log debugowania został skopiowany do schowka</string>
-    <string name="fragment_about__about_text">dandelion* to Twój cyfrowy towarzysz umożliwiający korzystanie z sieci społecznościowej diaspora*. Aplikacja posiada użyteczne paski narzędzi oraz obsługę serwerów proxy takich jak Tor, aby korzystanie z diaspory* było jeszcze przyjemniejsze.</string>
-    <string name="fragment_about__contribute">Wesprzyj nas kodem!</string>
-    <string name="fragment_about__contribute_text">dandelion* to wolne, w sensie wolności, oprogramowanie, zgodne z ideami projektu diaspora*. Jeśli chcesz nam pomóc w rozwoju, zapraszamy! Jesteśmy bardzo małym zespołem i ogromnie doceniamy każdą formę pomocy!</string>
-    <string name="fragment_about__contribute_button">Pobierz kod źródłowy</string>
-    <string name="fragment_about__translate">Przetłumacz aplikację!</string>
-    <string name="fragment_about__translate_text">Aplikacja nie jest dostępna w Twoim języku? Możesz to zmienić, pomagając nam w tłumaczeniu! Dzięki platformie crowdin każdy może pomóc w tłumaczeniu aplikacji.</string>
-    <string name="fragment_about__translate_button">Chcę pomóc w tłumaczeniu</string>
-    <string name="fragment_about__feedback">Wyślij feedback!</string>
-    <string name="fragment_about__feedback_text">dandelion* jest ciągle w fazie rozwoju, więc jeśli masz jakiekolwiek sugestie lub chciałbyś podzielić się swoją opinią zrób to za pomocą naszego systemu zgłaszania błędów!</string>
-    <string name="fragment_about__feedback_button">Zgłoś błąd</string>
-    <string name="fragment_about__spread_the_word">Powiedz innym o aplikacji!</string>
-    <string name="fragment_about__spread_the_word_text">Powiedz swoim znajomym i rodzinie o diaspora* oraz #dandelion! Dlaczego miałbyś nie opisać swoich doświadczeń na blogu? Byłoby nam miło usłyszeć, co masz do powiedzenia!</string>
-    <string name="fragment_about__spread_the_word_button">Udostępnij aplikację</string>
-    <string name="fragment_about__spread_the_word_share_text">Cześć! Wypróbuj #dandelion! %1$s</string>
+    <string name="about">O aplikacji</string>
+    <string name="license">Licencja</string>
+    <string name="debugging">Debugowanie</string>
+    <string name="application">Aplikacja</string>
+    <string name="device">Urządzenie</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Log debugowania</string>
+    <string name="debug_log_verbose">Log debugowania (rozszerzony)</string>
+    <string name="app_version_with_arg">Wersja aplikacji: %1$s</string>
+    <string name="android_version_witharg">Wersja systemu Android: %1$s</string>
+    <string name="device_name_witharg">Nazwa urządzenia: %1$s</string>
+    <string name="code_name_witharg">Nazwa kodowa: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Alias Poda: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domena Poda: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Log debugowania został skopiowany do schowka</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* to Twój cyfrowy towarzysz umożliwiający korzystanie z sieci społecznościowej diaspora*. Aplikacja posiada użyteczne paski narzędzi oraz obsługę serwerów proxy takich jak Tor, aby korzystanie z diaspory* było jeszcze przyjemniejsze.</string>
+    <string name="contribute_code">Wesprzyj nas kodem!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* to wolne, w sensie wolności, oprogramowanie, zgodne z ideami projektu diaspora*. Jeśli chcesz nam pomóc w rozwoju, zapraszamy! Jesteśmy bardzo małym zespołem i ogromnie doceniamy każdą formę pomocy!</string>
+    <string name="get_the_source">Pobierz kod źródłowy</string>
+    <string name="translate_the_app">Przetłumacz aplikację!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Aplikacja nie jest dostępna w Twoim języku? Możesz to zmienić, pomagając nam w tłumaczeniu! Dzięki platformie crowdin każdy może pomóc w tłumaczeniu aplikacji.</string>
+    <string name="let_me_translate">Chcę pomóc w tłumaczeniu</string>
+    <string name="give_feedback">Wyślij feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* jest ciągle w fazie rozwoju, więc jeśli masz jakiekolwiek sugestie lub chciałbyś podzielić się swoją opinią zrób to za pomocą naszego systemu zgłaszania błędów!</string>
+    <string name="report_bugs">Zgłoś błąd</string>
+    <string name="spread_the_word">Powiedz innym o aplikacji!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Powiedz swoim znajomym i rodzinie o diaspora* oraz #dandelion! Dlaczego miałbyś nie opisać swoich doświadczeń na blogu? Byłoby nam miło usłyszeć, co masz do powiedzenia!</string>
+    <string name="share_the_app">Udostępnij aplikację</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Cześć! Wypróbuj #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Twórcy aplikacji</string>
-    <string name="fragment_license__maintainers_text">Rozwojem i utrzymaniem aplikacji aktualnie zajmują się &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Wnieśli wkład</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Wielkie dzięki!</string>
-    <string name="fragment_license__license_button">Licencja GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Biblioteki zewnętrzne</string>
-    <string name="fragment_license__thirdparty_libs_text">Zostały użyte następujące biblioteki zewnętrzne:</string>
-    <string name="fragment_license__misc_leafpic">Zaczerpnęliśmy kilka pomysłów oraz trochę kodu z aplikacji LeafPic. Wypróbuj ją, to także wolne oprogramowanie!</string>
-    <string name="fragment_license__misc_leafpic_button">Chcę wiedzieć więcej</string>
+    <string name="maintainers">Twórcy aplikacji</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Rozwojem i utrzymaniem aplikacji aktualnie zajmują się &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Wnieśli wkład</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Wielkie dzięki!</string>
+    <string name="gnu_gplv3_license">Licencja GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Biblioteki zewnętrzne</string>
+    <string name="the_following_libraries_are_used">Zostały użyte następujące biblioteki zewnętrzne:</string>
+    <string name="inspiration_from_leafpic__appspecific">Zaczerpnęliśmy kilka pomysłów oraz trochę kodu z aplikacji LeafPic. Wypróbuj ją, to także wolne oprogramowanie!</string>
+    <string name="tell_me_more">Chcę wiedzieć więcej</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -137,62 +137,62 @@
     <string name="pref_desc__primary_color">Kolor pasków narzędzi</string>
     <string name="pref_title__accent_color">Kolor dodatkowy</string>
     <string name="pref_desc__accent_color">Kolor paska postępu</string>
-    <string name="pref_title__primary_color__amoled_mode">Tryb AMOLED</string>
+    <string name="amoled_mode">Tryb AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Nadpisz kolory w wielu częściach aplikacji, używając czarnego przyjaznego dla ekranów AMOLED. Aby zobaczyć zmiany, musisz zrestartować aplikację. Żeby przeglądać diasporę* w ciemności, musisz także aktywować Ciemny (Dark) motyw. Opcję tę znajdziesz w ustawieniach Twojego konta diaspory*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Rozszerzone powiadomienia</string>
-    <string name="pref_desc__extended_notifications">Dodaj do ikony powiadomień menu wyboru kategorii powiadomień</string>
-    <string name="pref_desc__language">Zmień język aplikacji. Uruchom ponownie aplikację, aby zobaczyć zmiany</string>
-    <string name="pref_title__language">Język</string>
-    <string name="language_system">Język systemowy</string>
+    <string name="extended_notifications">Rozszerzone powiadomienia</string>
+    <string name="extendend_notifications_bell_description__appspecific">Dodaj do ikony powiadomień menu wyboru kategorii powiadomień</string>
+    <string name="language_change_restart_description">Zmień język aplikacji. Uruchom ponownie aplikację, aby zobaczyć zmiany</string>
+    <string name="language">Język</string>
+    <string name="system_language">Język systemowy</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Wybierz rozmiar tekstu WebView</string>
-    <string name="pref_title__font_size">Rozmiar czcionki</string>
-    <string name="font_size_normal">Normalny</string>
-    <string name="font_size_large">Duży</string>
-    <string name="font_size_huge">Bardzo duży</string>
+    <string name="control_textsize_of_webview">Wybierz rozmiar tekstu WebView</string>
+    <string name="font_size">Rozmiar czcionki</string>
+    <string name="normal">Normalny</string>
+    <string name="large">Duży</string>
+    <string name="huge">Bardzo duży</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Wczytuj obrazy</string>
-    <string name="pref_desc__load_images">Odznacz, aby wyłączyć wczytywanie obrazów, np. w celu oszczędzania transferu</string>
+    <string name="load_images">Wczytuj obrazy</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Odznacz, aby wyłączyć wczytywanie obrazów, np. w celu oszczędzania transferu</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Orientacja ekranu</string>
-    <string name="pref_desc__screen_rotation">Wybierz pożądaną orientację ekranu</string>
-    <string name="rotation_system">Domyślna</string>
-    <string name="rotation_sensor">Czujnik\n(ignoruj ustawienia systemowe)</string>
-    <string name="rotation_portrait">Pionowa</string>
-    <string name="rotation_landscape">Pozioma</string>
+    <string name="screen_rotation">Orientacja ekranu</string>
+    <string name="control_screen_rotation">Wybierz pożądaną orientację ekranu</string>
+    <string name="default_">Domyślna</string>
+    <string name="sensor_ignore_system_settings">Czujnik\n(ignoruj ustawienia systemowe)</string>
+    <string name="portrait">Pionowa</string>
+    <string name="landscape">Pozioma</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Wczytaj domyślną konfigurację Tora</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Wczytaj ustawienia proxy HTTP Tora (Orbot)</string>
-    <string name="pref_title__sub_proxy">Serwer proxy</string>
-    <string name="pref_title__proxy_enabled">Używaj proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Przesyłaj ruch dandelion* przez proxy, aby ominąć zapory sieciowe.\nMoże wymagać restartu. Może nie działać na niektórych urządzeniach.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">Aplikacja musi zostać zrestartowana, aby wyłączyć proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Domyślna konfiguracja Orbota została wczytana</string>
+    <string name="load_tor_preset">Wczytaj domyślną konfigurację Tora</string>
+    <string name="load_proxy_settins_for_tor">Wczytaj ustawienia proxy HTTP Tora (Orbot)</string>
+    <string name="proxy">Serwer proxy</string>
+    <string name="enable_proxy">Używaj proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Przesyłaj ruch dandelion* przez proxy, aby ominąć zapory sieciowe.\nMoże wymagać restartu. Może nie działać na niektórych urządzeniach.</string>
+    <string name="host">Host</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Aplikacja musi zostać zrestartowana, aby wyłączyć proxy</string>
+    <string name="orbot_proxy_preset_loaded">Domyślna konfiguracja Orbota została wczytana</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Otwieraj odnośniki zewnętrzne za pomocą Chrome Custom Tabs. Musisz posiadać zainstalowane Chrome lub Chromium. \nWAŻNA UWAGA: Chrome Custom Tabs nie używa serwerów proxy ustawionych w tej aplikacji!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Otwieraj odnośniki zewnętrzne za pomocą Chrome Custom Tabs. Musisz posiadać zainstalowane Chrome lub Chromium. \nWAŻNA UWAGA: Chrome Custom Tabs nie używa serwerów proxy ustawionych w tej aplikacji!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Ustawienia osobiste</string>
-    <string name="pref_desc__personal_settings">Otwórz ustawienia konta diaspora*</string>
-    <string name="pref_desc__manage_contacts">Zarządzaj swoją listą kontaktów</string>
-    <string name="pref_title__manage_tags">Zarządzanie tagami</string>
-    <string name="pref_desc__manage_tags">Przestań śledzić wybrane tagi</string>
-    <string name="pref_title__change_account">Zmień konto</string>
-    <string name="pref_desc__change_account">Skasuj dane lokalnej sesji i przełącz się na inne konto diaspory*</string>
-    <string name="pref_warning__change_account">Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz przełączyć na inne konto?</string>
-    <string name="pref_title__clear_cache">Wyczyść pamięć podręczną</string>
-    <string name="pref_desc__clear_cache">Wyczyść pamięć podręczną WebView</string>
-    <string name="pref_desc__intellihide_toolbars">Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania</string>
-    <string name="pref_title__intellihide_toolbars">Autoukrywanie pasków narzędzi</string>
-    <string name="pref_title__append_shared_via_app">Informacja o użytej aplikacji</string>
-    <string name="pref_desc__append_shared_via_app">Umieszczaj odnośnik do tej aplikacji na dole udostępnianych wiadomości: [via #dandelion]</string>
+    <string name="personal_settings">Ustawienia osobiste</string>
+    <string name="open_diaspora_account_settings__appspecific">Otwórz ustawienia konta diaspora*</string>
+    <string name="manage_your_contact_list">Zarządzaj swoją listą kontaktów</string>
+    <string name="manage_hashtags">Zarządzanie tagami</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Przestań śledzić wybrane tagi</string>
+    <string name="change_account">Zmień konto</string>
+    <string name="loug_warning_description__appspecific">Skasuj dane lokalnej sesji i przełącz się na inne konto diaspory*</string>
+    <string name="logout_warning_description">Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz przełączyć na inne konto?</string>
+    <string name="clear_cache">Wyczyść pamięć podręczną</string>
+    <string name="clear_webview_cache">Wyczyść pamięć podręczną WebView</string>
+    <string name="intellihide_toolbars__appspecific">Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania</string>
+    <string name="intellihide_toolbars">Autoukrywanie pasków narzędzi</string>
+    <string name="append_shared_by_notice">Informacja o użytej aplikacji</string>
+    <string name="append_shared_by_notice__appspecific">Umieszczaj odnośnik do tej aplikacji na dole udostępnianych wiadomości: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Różne</string>
-    <string name="pref_title__wipe_settings">Całkowity restart</string>
-    <string name="pref_desc__wipe_settings">Wyczyść wszystkie lokalne ustawienia aplikacji i wyloguj ze wszystkich kont</string>
-    <string name="dialog_content__wipe_settings">Ta operacja przywróci wszystkie zmodyfikowane przez Ciebie ustawienia aplikacji do ich domyślnych wartości i wyloguje Cię ze wszystkich Podów. Na pewno chcesz to zrobić?</string>
-    <string name="pref_desc__adblock_enable">Włącz prosty AdBlocker. Reklamy mogą znajdować się m.in. w osadzonych widokach</string>
-    <string name="pref_title__adblock_enable">Blokuj reklamy</string>
+    <string name="miscellaneous">Różne</string>
+    <string name="full_reset">Całkowity restart</string>
+    <string name="wipe_settings_and_logout">Wyczyść wszystkie lokalne ustawienia aplikacji i wyloguj ze wszystkich kont</string>
+    <string name="wipe_settings_warning__appspecific">Ta operacja przywróci wszystkie zmodyfikowane przez Ciebie ustawienia aplikacji do ich domyślnych wartości i wyloguje Cię ze wszystkich Podów. Na pewno chcesz to zrobić?</string>
+    <string name="enable_basic_adblocker_description">Włącz prosty AdBlocker. Reklamy mogą znajdować się m.in. w osadzonych widokach</string>
+    <string name="block_advertisments">Blokuj reklamy</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9269851b..bcf8807c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -74,18 +74,18 @@
     <string name="pref_summary__is_statusbar_hidden">Ocultar a barra de estado na janela principal</string>
     <string name="pref_title__is_statusbar_hidden">Ocultar barra de status</string>
 
-    <string name="about_activity__title_about_app">Sobre</string>
-    <string name="about_activity__title_about_license">Licença</string>
-    <string name="about_activity__title_debug_info">Depurando</string>
-    <string name="fragment_debug__section_app">Aplicação</string>
-    <string name="fragment_debug__section_device">Dispositivo</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Histórico de Depuração</string>
-    <string name="fragment_debug__section_log_spam">Histórico de depuração (detalhado)</string>
-    <string name="fragment_debug__app_version">Versão do App: %1$s</string>
-    <string name="fragment_debug__android_version">Versão do Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nome do dispositivo: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Domínio do Pod: %1$s</string>
+    <string name="about">Sobre</string>
+    <string name="license">Licença</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicação</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Histórico de Depuração</string>
+    <string name="debug_log_verbose">Histórico de depuração (detalhado)</string>
+    <string name="app_version_with_arg">Versão do App: %1$s</string>
+    <string name="android_version_witharg">Versão do Android: %1$s</string>
+    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domínio do Pod: %1$s</string>
     <!-- License & help (large amount of text) -->
 
     <!-- Key Names (Untranslatable) -->
@@ -111,56 +111,56 @@
     <string name="pref_desc__primary_color">Cor das barras de ferramentas</string>
     <string name="pref_title__accent_color">Cor de destaque</string>
     <string name="pref_desc__accent_color">Cor da barra de progresso</string>
-    <string name="pref_title__primary_color__amoled_mode">Modo AMOLED</string>
+    <string name="amoled_mode">Modo AMOLED</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notificações estendidas</string>
-    <string name="pref_desc__language">Alterar o idioma deste aplicativo. Reinicie o aplicativo para as mudanças terem efeito</string>
-    <string name="pref_title__language">Idioma</string>
-    <string name="language_system">Idioma do sistema</string>
+    <string name="extended_notifications">Notificações estendidas</string>
+    <string name="language_change_restart_description">Alterar o idioma deste aplicativo. Reinicie o aplicativo para as mudanças terem efeito</string>
+    <string name="language">Idioma</string>
+    <string name="system_language">Idioma do sistema</string>
     <!-- Font size -->
-    <string name="pref_title__font_size">Tamanho da fonte</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Grande</string>
-    <string name="font_size_huge">Enorme</string>
+    <string name="font_size">Tamanho da fonte</string>
+    <string name="normal">Normal</string>
+    <string name="large">Grande</string>
+    <string name="huge">Enorme</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Carregar imagens</string>
-    <string name="pref_desc__load_images">Desabilitar o carregamento de imagens para economizar seus créditos</string>
+    <string name="load_images">Carregar imagens</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Desabilitar o carregamento de imagens para economizar seus créditos</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotação de tela</string>
-    <string name="pref_desc__screen_rotation">Controle da rotação automática de tela</string>
-    <string name="rotation_system">Padrão</string>
-    <string name="rotation_sensor">Sensor\n(ignorar configurações de sistema)</string>
-    <string name="rotation_portrait">Retrato</string>
-    <string name="rotation_landscape">Paisagem</string>
+    <string name="screen_rotation">Rotação de tela</string>
+    <string name="control_screen_rotation">Controle da rotação automática de tela</string>
+    <string name="default_">Padrão</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignorar configurações de sistema)</string>
+    <string name="portrait">Retrato</string>
+    <string name="landscape">Paisagem</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Carregar configuração do Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Carregar configurações de proxy HTTP do Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Habilitar Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Usar proxy no dandelion* para contornar firewalls. \nRequer reinicialização. Pode não funcionar em alguns telefones.</string>
-    <string name="pref_title__http_proxy_host">Servidor</string>
-    <string name="pref_title__http_proxy_port">Porta</string>
-    <string name="toast__proxy_disabled__restart_required">É necessário reiniciar para desabilitar o proxy</string>
-    <string name="toast__proxy_orbot_preset_loaded">Predefinição de proxy orbot carregado</string>
+    <string name="load_tor_preset">Carregar configuração do Tor</string>
+    <string name="load_proxy_settins_for_tor">Carregar configurações de proxy HTTP do Tor (Orbot)</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Habilitar Proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Usar proxy no dandelion* para contornar firewalls. \nRequer reinicialização. Pode não funcionar em alguns telefones.</string>
+    <string name="host">Servidor</string>
+    <string name="port">Porta</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">É necessário reiniciar para desabilitar o proxy</string>
+    <string name="orbot_proxy_preset_loaded">Predefinição de proxy orbot carregado</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Abrir links externos com guias de predefinidas do Chrome. O Chromium ou o Google Chrome precisa ser instalado para utilizar esse recurso. \nNOTA IMPORTANTE: Guias Chrome predefinidas não usam servidores proxy!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Abrir links externos com guias de predefinidas do Chrome. O Chromium ou o Google Chrome precisa ser instalado para utilizar esse recurso. \nNOTA IMPORTANTE: Guias Chrome predefinidas não usam servidores proxy!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Configurações pessoais</string>
-    <string name="pref_desc__personal_settings">Abra suas configurações de usuário diaspora*</string>
-    <string name="pref_desc__manage_contacts">Gerenciar seus contatos</string>
-    <string name="pref_title__manage_tags">Gerenciar Hashtags</string>
-    <string name="pref_desc__manage_tags">Parar de seguir hashtags</string>
-    <string name="pref_title__change_account">Alterar conta</string>
-    <string name="pref_desc__change_account">Apagar dados de sessão local e mudar para outro usuário de outro Pod diaspora*</string>
-    <string name="pref_warning__change_account">Isto apagará todos os dados de sessão e cookies. Você quer realmente mudar sua conta?</string>
-    <string name="pref_title__clear_cache">Limpar cache</string>
-    <string name="pref_desc__intellihide_toolbars">Ocultar as barras de ferramentas superior e inferior automaticamente durante a rolagem</string>
-    <string name="pref_desc__append_shared_via_app">Acrescentar referência a este aplicativo aos textos compartilhados: [via #dandelion]</string>
+    <string name="personal_settings">Configurações pessoais</string>
+    <string name="open_diaspora_account_settings__appspecific">Abra suas configurações de usuário diaspora*</string>
+    <string name="manage_your_contact_list">Gerenciar seus contatos</string>
+    <string name="manage_hashtags">Gerenciar Hashtags</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Parar de seguir hashtags</string>
+    <string name="change_account">Alterar conta</string>
+    <string name="loug_warning_description__appspecific">Apagar dados de sessão local e mudar para outro usuário de outro Pod diaspora*</string>
+    <string name="logout_warning_description">Isto apagará todos os dados de sessão e cookies. Você quer realmente mudar sua conta?</string>
+    <string name="clear_cache">Limpar cache</string>
+    <string name="intellihide_toolbars__appspecific">Ocultar as barras de ferramentas superior e inferior automaticamente durante a rolagem</string>
+    <string name="append_shared_by_notice__appspecific">Acrescentar referência a este aplicativo aos textos compartilhados: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Diversos</string>
-    <string name="pref_title__wipe_settings">Zerar tudo</string>
-    <string name="pref_desc__wipe_settings">Limpar localmente todas as configurações relacionadas ao aplicativo e sair de todas as contas</string>
-    <string name="dialog_content__wipe_settings">Isto irá retornar todas as configurações alteradas do aplicativo para seus valores padrão e encerrar as sessões de todos os pods. Suas imagens baixadas permanecerão intactas. Tem certeza que deseja prosseguir?</string>
-    <string name="pref_desc__adblock_enable">Habilite AdBlocker básico. Anúncios incorporados, p.ex., podem ser vistos</string>
-    <string name="pref_title__adblock_enable">Bloquear anúncios</string>
+    <string name="miscellaneous">Diversos</string>
+    <string name="full_reset">Zerar tudo</string>
+    <string name="wipe_settings_and_logout">Limpar localmente todas as configurações relacionadas ao aplicativo e sair de todas as contas</string>
+    <string name="wipe_settings_warning__appspecific">Isto irá retornar todas as configurações alteradas do aplicativo para seus valores padrão e encerrar as sessões de todos os pods. Suas imagens baixadas permanecerão intactas. Tem certeza que deseja prosseguir?</string>
+    <string name="enable_basic_adblocker_description">Habilite AdBlocker básico. Anúncios incorporados, p.ex., podem ser vistos</string>
+    <string name="block_advertisments">Bloquear anúncios</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 68452e78..eea0cce5 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -58,21 +58,21 @@
     <!-- More from MainActivity -->
     <!-- Permissions -->
 
-    <string name="about_activity__title_about_app">Despre</string>
-    <string name="about_activity__title_about_license">Licenţă</string>
-    <string name="about_activity__title_debug_info">Depanare</string>
-    <string name="fragment_debug__section_app">Aplicaţie</string>
-    <string name="fragment_debug__section_device">Dispozitiv</string>
-    <string name="fragment_debug__section_pod">Pod diaspora*</string>
-    <string name="fragment_debug__section_log">Jurnal Depanare</string>
-    <string name="fragment_debug__section_log_spam">Jurnal Depanare (Detaliat)</string>
-    <string name="fragment_debug__app_version">Versiune aplicație: %1$s</string>
-    <string name="fragment_debug__android_version">Versiune Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nume Dispozitiv: %1$s</string>
-    <string name="fragment_debug__app_codename">Nume de cod: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Nume Profil Pod: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Domeniu Pod: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Jurnal Depanare copiat în clipboard</string>
-    <string name="fragment_about__about_text">dandelion* este companionul tau pentru navigarea reţelei sociale diaspora *. Adaugă caracteristici cum ar fi utilele bare de instrumente şi suport pentru proxy servere ca Tor Network pentru experienţa ta socială.</string>
+    <string name="about">Despre</string>
+    <string name="license">Licenţă</string>
+    <string name="debugging">Depanare</string>
+    <string name="application">Aplicaţie</string>
+    <string name="device">Dispozitiv</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Jurnal Depanare</string>
+    <string name="debug_log_verbose">Jurnal Depanare (Detaliat)</string>
+    <string name="app_version_with_arg">Versiune aplicație: %1$s</string>
+    <string name="android_version_witharg">Versiune Android: %1$s</string>
+    <string name="device_name_witharg">Nume Dispozitiv: %1$s</string>
+    <string name="code_name_witharg">Nume de cod: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nume Profil Pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domeniu Pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Jurnal Depanare copiat în clipboard</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* este companionul tau pentru navigarea reţelei sociale diaspora *. Adaugă caracteristici cum ar fi utilele bare de instrumente şi suport pentru proxy servere ca Tor Network pentru experienţa ta socială.</string>
     <!-- License & help (large amount of text) -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index df1c0f51..67757dd7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -76,45 +76,45 @@
     <string name="pref_summary__show_title">Показывать заголовок на главном экране</string>
     <string name="pref_title__show_title">Показывать заголовок</string>
 
-    <string name="about_activity__title_about_app">О приложении</string>
-    <string name="about_activity__title_about_license">Лицензия</string>
-    <string name="about_activity__title_debug_info">Отладка</string>
-    <string name="fragment_debug__section_app">Приложение</string>
-    <string name="fragment_debug__section_device">Устройство</string>
-    <string name="fragment_debug__section_pod">Под diaspora*</string>
-    <string name="fragment_debug__section_log">Журнал отладки</string>
-    <string name="fragment_debug__section_log_spam">Журнал отладки (подробный)</string>
-    <string name="fragment_debug__app_version">Версия приложения: %1$s</string>
-    <string name="fragment_debug__android_version">Версия Android: %1$s</string>
-    <string name="fragment_debug__device_name">Имя устройства: %1$s</string>
-    <string name="fragment_debug__app_codename">Кодовое имя: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Имя профиля пода: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Домен пода: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Журнал отладки скопирован в буфер обмена</string>
-    <string name="fragment_about__about_text">dandelion* - это приложение-компаньон для социальной сети Диаспора*. Приложение добавляет такие функции как полезные панели инструментов и поддержку прокси-серверов (таких как Tor).</string>
-    <string name="fragment_about__contribute">Сделайте свой вклад!</string>
-    <string name="fragment_about__contribute_text">dandelion* разрабатывается как свободное ПО и следует идеям проекта Диаспора*. Если вы хотите помочь - вперёд! В настоящее время мы является очень небольшой командой, поэтому мы высоко ценим любые виды помощи!</string>
-    <string name="fragment_about__contribute_button">Получить исходный код</string>
-    <string name="fragment_about__translate">Переведите приложение!</string>
-    <string name="fragment_about__translate_text">Приложение недоступно на вашем языке? Вы можете это изменить! Почему бы вам не помочь нам перевести его? Мы используем платформу crowdin, чтобы позволить любому сделать это.</string>
-    <string name="fragment_about__translate_button">Перейти к переводу</string>
-    <string name="fragment_about__feedback">Оставьте отзыв!</string>
-    <string name="fragment_about__feedback_text">dandelion* всё ещё находится в разработке, так что, если у вас есть предложения или пожелания, пожалуйста, воспользуйтесь нашим трекером ошибок, чтобы сообщить нам об этом!</string>
-    <string name="fragment_about__feedback_button">Сообщить об ошибках</string>
-    <string name="fragment_about__spread_the_word">Расскажите друзьям!</string>
-    <string name="fragment_about__spread_the_word_text">Расскажите вашим друзьям и семье о Диаспоре* и #dandelion! Почему бы вам не разместить запись о вашем опыте в блоге? Мы будем рады услышать об этом!</string>
-    <string name="fragment_about__spread_the_word_button">Рассказать о приложении</string>
-    <string name="fragment_about__spread_the_word_share_text">Эй! Зацените #dandelion! %1$s</string>
+    <string name="about">О приложении</string>
+    <string name="license">Лицензия</string>
+    <string name="debugging">Отладка</string>
+    <string name="application">Приложение</string>
+    <string name="device">Устройство</string>
+    <string name="diaspora_pod__appspecific">Под diaspora*</string>
+    <string name="debug_log">Журнал отладки</string>
+    <string name="debug_log_verbose">Журнал отладки (подробный)</string>
+    <string name="app_version_with_arg">Версия приложения: %1$s</string>
+    <string name="android_version_witharg">Версия Android: %1$s</string>
+    <string name="device_name_witharg">Имя устройства: %1$s</string>
+    <string name="code_name_witharg">Кодовое имя: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Имя профиля пода: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Домен пода: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Журнал отладки скопирован в буфер обмена</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* - это приложение-компаньон для социальной сети Диаспора*. Приложение добавляет такие функции как полезные панели инструментов и поддержку прокси-серверов (таких как Tor).</string>
+    <string name="contribute_code">Сделайте свой вклад!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* разрабатывается как свободное ПО и следует идеям проекта Диаспора*. Если вы хотите помочь - вперёд! В настоящее время мы является очень небольшой командой, поэтому мы высоко ценим любые виды помощи!</string>
+    <string name="get_the_source">Получить исходный код</string>
+    <string name="translate_the_app">Переведите приложение!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Приложение недоступно на вашем языке? Вы можете это изменить! Почему бы вам не помочь нам перевести его? Мы используем платформу crowdin, чтобы позволить любому сделать это.</string>
+    <string name="let_me_translate">Перейти к переводу</string>
+    <string name="give_feedback">Оставьте отзыв!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* всё ещё находится в разработке, так что, если у вас есть предложения или пожелания, пожалуйста, воспользуйтесь нашим трекером ошибок, чтобы сообщить нам об этом!</string>
+    <string name="report_bugs">Сообщить об ошибках</string>
+    <string name="spread_the_word">Расскажите друзьям!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Расскажите вашим друзьям и семье о Диаспоре* и #dandelion! Почему бы вам не разместить запись о вашем опыте в блоге? Мы будем рады услышать об этом!</string>
+    <string name="share_the_app">Рассказать о приложении</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Эй! Зацените #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Мейнтейнеры</string>
-    <string name="fragment_license__maintainers_text">Это приложение в настоящее время разрабатывается и поддерживается следующими людьми: &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Участники</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Спасибо вам!</string>
-    <string name="fragment_license__license_button">Лицензия GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Сторонние библиотеки</string>
-    <string name="fragment_license__thirdparty_libs_text">Используются следующие библиотеки:</string>
-    <string name="fragment_license__misc_leafpic">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
-    <string name="fragment_license__misc_leafpic_button">Расскажите мне больше</string>
+    <string name="maintainers">Мейнтейнеры</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Это приложение в настоящее время разрабатывается и поддерживается следующими людьми: &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Участники</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Спасибо вам!</string>
+    <string name="gnu_gplv3_license">Лицензия GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Сторонние библиотеки</string>
+    <string name="the_following_libraries_are_used">Используются следующие библиотеки:</string>
+    <string name="inspiration_from_leafpic__appspecific">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
+    <string name="tell_me_more">Расскажите мне больше</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -139,62 +139,62 @@
     <string name="pref_desc__primary_color">Цвет панелей инструментов</string>
     <string name="pref_title__accent_color">Акцентирующий цвет</string>
     <string name="pref_desc__accent_color">Цвет индикатора загрузки</string>
-    <string name="pref_title__primary_color__amoled_mode">Режим AMOLED</string>
+    <string name="amoled_mode">Режим AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Переопределить цвета на благоприятный для AMOLED чёрный во многих частях приложения. Вам нужно перезапустить приложение, чтобы включить эту опцию. Для просмотра диаспоры* в тёмных тонах, вам также необходимо активировать тёмную тему в настройках аккаунта.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Расширенные уведомления</string>
-    <string name="pref_desc__extended_notifications">Показывать выпадающее меню с категориями уведомлений при нажатии на иконку уведомлений</string>
-    <string name="pref_desc__language">Изменить язык этого приложения. Перезапустите приложение, чтобы изменения вступили в силу</string>
-    <string name="pref_title__language">Язык</string>
-    <string name="language_system">Язык системы</string>
+    <string name="extended_notifications">Расширенные уведомления</string>
+    <string name="extendend_notifications_bell_description__appspecific">Показывать выпадающее меню с категориями уведомлений при нажатии на иконку уведомлений</string>
+    <string name="language_change_restart_description">Изменить язык этого приложения. Перезапустите приложение, чтобы изменения вступили в силу</string>
+    <string name="language">Язык</string>
+    <string name="system_language">Язык системы</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Управление размером текста WebView</string>
-    <string name="pref_title__font_size">Размер шрифта</string>
-    <string name="font_size_normal">Нормальный</string>
-    <string name="font_size_large">Крупный</string>
-    <string name="font_size_huge">Огромный</string>
+    <string name="control_textsize_of_webview">Управление размером текста WebView</string>
+    <string name="font_size">Размер шрифта</string>
+    <string name="normal">Нормальный</string>
+    <string name="large">Крупный</string>
+    <string name="huge">Огромный</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Загружать изображения</string>
-    <string name="pref_desc__load_images">Отключить загрузку изображений для экономии трафика</string>
+    <string name="load_images">Загружать изображения</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Отключить загрузку изображений для экономии трафика</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Поворот экрана</string>
-    <string name="pref_desc__screen_rotation">Контролировать автоматический поворот экрана</string>
-    <string name="rotation_system">По умолчанию</string>
-    <string name="rotation_sensor">Сенсор\n(игнорировать системные настройки)</string>
-    <string name="rotation_portrait">Вертикальная ориентация</string>
-    <string name="rotation_landscape">Горизонтальная ориентация</string>
+    <string name="screen_rotation">Поворот экрана</string>
+    <string name="control_screen_rotation">Контролировать автоматический поворот экрана</string>
+    <string name="default_">По умолчанию</string>
+    <string name="sensor_ignore_system_settings">Сенсор\n(игнорировать системные настройки)</string>
+    <string name="portrait">Вертикальная ориентация</string>
+    <string name="landscape">Горизонтальная ориентация</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Загрузить шаблон конфигурации Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Загрузить настройки прокси для Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Прокси</string>
-    <string name="pref_title__proxy_enabled">Включить прокси</string>
-    <string name="pref_desc__http_proxy_enabled">Проксировать трафик dandelion* для обхода брандмауэров.\nМожет потребоваться перезапуск</string>
-    <string name="pref_title__http_proxy_host">Хост</string>
-    <string name="pref_title__http_proxy_port">Порт</string>
-    <string name="toast__proxy_disabled__restart_required">Приложению необходимо перезапуститься, чтобы отключить использование прокси</string>
-    <string name="toast__proxy_orbot_preset_loaded">Шаблон конфигурации прокси Orbot загружен</string>
+    <string name="load_tor_preset">Загрузить шаблон конфигурации Tor</string>
+    <string name="load_proxy_settins_for_tor">Загрузить настройки прокси для Tor (Orbot)</string>
+    <string name="proxy">Прокси</string>
+    <string name="enable_proxy">Включить прокси</string>
+    <string name="proxy_dandelion_traffic__appspecific">Проксировать трафик dandelion* для обхода брандмауэров.\nМожет потребоваться перезапуск</string>
+    <string name="host">Хост</string>
+    <string name="port">Порт</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Приложению необходимо перезапуститься, чтобы отключить использование прокси</string>
+    <string name="orbot_proxy_preset_loaded">Шаблон конфигурации прокси Orbot загружен</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Открывать внешние ссылки с помощью Chrome Custom Tabs. Для этого должен быть установлен Chromium или Google Chrome. \nВАЖНОЕ ЗАМЕЧАНИЕ: Chrome Custom Tabs не использует настройки прокси-серверов!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Открывать внешние ссылки с помощью Chrome Custom Tabs. Для этого должен быть установлен Chromium или Google Chrome. \nВАЖНОЕ ЗАМЕЧАНИЕ: Chrome Custom Tabs не использует настройки прокси-серверов!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Личные настройки</string>
-    <string name="pref_desc__personal_settings">Открыть настройки аккаунта diaspora*</string>
-    <string name="pref_desc__manage_contacts">Управление списком контактов</string>
-    <string name="pref_title__manage_tags">Управление тегами</string>
-    <string name="pref_desc__manage_tags">Отписаться от тегов</string>
-    <string name="pref_title__change_account">Сменить учётную запись</string>
-    <string name="pref_desc__change_account">Стереть данные локального сеанса и переключиться на другой под/аккаунт diaspora*</string>
-    <string name="pref_warning__change_account">Это сотрёт все куки и данные сеанса. Вы действительно хотите сменить учётную запись?</string>
-    <string name="pref_title__clear_cache">Очистить кэш</string>
-    <string name="pref_desc__clear_cache">Очистить кэш WebView</string>
-    <string name="pref_desc__intellihide_toolbars">Скрывать верхнюю и нижнюю панели инструментов автоматически во время прокрутки</string>
-    <string name="pref_title__intellihide_toolbars">Интеллектуальное скрытие панелей инструментов</string>
-    <string name="pref_title__append_shared_via_app">Добавлять \"Опубликовано из\" к сообщению</string>
-    <string name="pref_desc__append_shared_via_app">Добавлять к сообщениям ссылку на это приложение: [via #dandelion]</string>
+    <string name="personal_settings">Личные настройки</string>
+    <string name="open_diaspora_account_settings__appspecific">Открыть настройки аккаунта diaspora*</string>
+    <string name="manage_your_contact_list">Управление списком контактов</string>
+    <string name="manage_hashtags">Управление тегами</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Отписаться от тегов</string>
+    <string name="change_account">Сменить учётную запись</string>
+    <string name="loug_warning_description__appspecific">Стереть данные локального сеанса и переключиться на другой под/аккаунт diaspora*</string>
+    <string name="logout_warning_description">Это сотрёт все куки и данные сеанса. Вы действительно хотите сменить учётную запись?</string>
+    <string name="clear_cache">Очистить кэш</string>
+    <string name="clear_webview_cache">Очистить кэш WebView</string>
+    <string name="intellihide_toolbars__appspecific">Скрывать верхнюю и нижнюю панели инструментов автоматически во время прокрутки</string>
+    <string name="intellihide_toolbars">Интеллектуальное скрытие панелей инструментов</string>
+    <string name="append_shared_by_notice">Добавлять \"Опубликовано из\" к сообщению</string>
+    <string name="append_shared_by_notice__appspecific">Добавлять к сообщениям ссылку на это приложение: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Прочее</string>
-    <string name="pref_title__wipe_settings">Полный сброс</string>
-    <string name="pref_desc__wipe_settings">Локально стереть все параметры, относящиеся к приложению и выйти из всех учётных записей</string>
-    <string name="dialog_content__wipe_settings">Это сбросит все изменённые параметры приложения на значения по умолчанию и выйдет из аккаунтов на всех подах. Ваши загруженные изображения останутся нетронутыми. Вы уверены, что хотите продолжить?</string>
-    <string name="pref_desc__adblock_enable">Включить простой блокировщик рекламы. Реклама может быть во встроенных элементах страницы</string>
-    <string name="pref_title__adblock_enable">Блокировать рекламу</string>
+    <string name="miscellaneous">Прочее</string>
+    <string name="full_reset">Полный сброс</string>
+    <string name="wipe_settings_and_logout">Локально стереть все параметры, относящиеся к приложению и выйти из всех учётных записей</string>
+    <string name="wipe_settings_warning__appspecific">Это сбросит все изменённые параметры приложения на значения по умолчанию и выйдет из аккаунтов на всех подах. Ваши загруженные изображения останутся нетронутыми. Вы уверены, что хотите продолжить?</string>
+    <string name="enable_basic_adblocker_description">Включить простой блокировщик рекламы. Реклама может быть во встроенных элементах страницы</string>
+    <string name="block_advertisments">Блокировать рекламу</string>
 </resources>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 35c57504..f4cc7020 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -96,52 +96,52 @@
     <string name="launcher_shortcut">Incurtzada de s\'allughidore</string>
 
 
-    <string name="about_activity__title_about_app">Informatziones</string>
-    <string name="about_activity__title_about_license">Litzèntzia</string>
-    <string name="about_activity__title_debug_info">Depuratzione dae sos errores</string>
-    <string name="fragment_debug__section_app">Aplicatzione</string>
-    <string name="fragment_debug__section_device">Dispositivu</string>
-    <string name="fragment_debug__section_pod">Pod de diaspora*</string>
-    <string name="fragment_debug__section_log">Registru de depuratzione</string>
-    <string name="fragment_debug__section_log_spam">Registru de depuratzione (a sa minuda)</string>
-    <string name="fragment_debug__app_version">Versione aplicatzione: %1$s</string>
-    <string name="fragment_debug__android_version">Versione Android: %1$s</string>
-    <string name="fragment_debug__device_name">Nùmene dispositivu: %1$s</string>
-    <string name="fragment_debug__app_codename">Nùmene còdighe: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Nùmene de profilu de su pod: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Domìniu de su pod: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Registru de depuratzione copiadu in sos apuntos</string>
+    <string name="about">Informatziones</string>
+    <string name="license">Litzèntzia</string>
+    <string name="debugging">Depuratzione dae sos errores</string>
+    <string name="application">Aplicatzione</string>
+    <string name="device">Dispositivu</string>
+    <string name="diaspora_pod__appspecific">Pod de diaspora*</string>
+    <string name="debug_log">Registru de depuratzione</string>
+    <string name="debug_log_verbose">Registru de depuratzione (a sa minuda)</string>
+    <string name="app_version_with_arg">Versione aplicatzione: %1$s</string>
+    <string name="android_version_witharg">Versione Android: %1$s</string>
+    <string name="device_name_witharg">Nùmene dispositivu: %1$s</string>
+    <string name="code_name_witharg">Nùmene còdighe: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nùmene de profilu de su pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domìniu de su pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Registru de depuratzione copiadu in sos apuntos</string>
 
-    <string name="fragment_about__about_text">dandelion* est s\'aplicatzione tua pro s\'esploratzione de sa retza sotziale diaspora*. Annanghet funtzionalidades comente a barras de ainas utilosas e a su suportu pro server intermediàrios (proxies) comente a sa retza Tor pro s\'esperièntzia sotziale tua.</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* est s\'aplicatzione tua pro s\'esploratzione de sa retza sotziale diaspora*. Annanghet funtzionalidades comente a barras de ainas utilosas e a su suportu pro server intermediàrios (proxies) comente a sa retza Tor pro s\'esperièntzia sotziale tua.</string>
 
-    <string name="fragment_about__contribute">Contribui a su còdighe!</string>
-    <string name="fragment_about__contribute_text">dandelion* est iscvilupada liberamente e sighit sas idea de su progetu diaspora*. Si cheres contribuire, faghe·lu! In custu momentu semus unu grupu minore meda, nos diat agradare a tènnere cale si siat casta de agiudu!</string>
-    <string name="fragment_about__contribute_button">Otenne su còdighe mitza</string>
+    <string name="contribute_code">Contribui a su còdighe!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* est iscvilupada liberamente e sighit sas idea de su progetu diaspora*. Si cheres contribuire, faghe·lu! In custu momentu semus unu grupu minore meda, nos diat agradare a tènnere cale si siat casta de agiudu!</string>
+    <string name="get_the_source">Otenne su còdighe mitza</string>
 
-    <string name="fragment_about__translate">Tradui s\'aplicatzione!</string>
-    <string name="fragment_about__translate_text">S\'aplicatzione no est disponìbile in sa limba tua? Lu podes cambiare! Proite non nos agiudas traduinde·la? Nois impreamus sa prataforma crowdin pro permìtere a totus de traduire s\'aplicatzione.</string>
-    <string name="fragment_about__translate_button">Faghe·mi traduire</string>
+    <string name="translate_the_app">Tradui s\'aplicatzione!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">S\'aplicatzione no est disponìbile in sa limba tua? Lu podes cambiare! Proite non nos agiudas traduinde·la? Nois impreamus sa prataforma crowdin pro permìtere a totus de traduire s\'aplicatzione.</string>
+    <string name="let_me_translate">Faghe·mi traduire</string>
 
-    <string name="fragment_about__feedback">Lassa·nos s\'opinione tua!</string>
-    <string name="fragment_about__feedback_text">dandelion* est galu in isvilupu. Si tenes impòsitos o cale si siat casta de cosa da sinnalare, pro praghere, faghe·la·nos ischire impreende s\'aina de sinnalatziones de errores nostra!</string>
-    <string name="fragment_about__feedback_button">Sinnala errores</string>
+    <string name="give_feedback">Lassa·nos s\'opinione tua!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* est galu in isvilupu. Si tenes impòsitos o cale si siat casta de cosa da sinnalare, pro praghere, faghe·la·nos ischire impreende s\'aina de sinnalatziones de errores nostra!</string>
+    <string name="report_bugs">Sinnala errores</string>
 
-    <string name="fragment_about__spread_the_word">Cumpartzi sa paràula!</string>
-    <string name="fragment_about__spread_the_word_text">Faghe connòschere diaspora* e #dandelion a sos amigos e a sa familia tua! Proite no iscries carchi cosa a pitzu de sas esperièntzias tuas? Noas diat agradare meda a ischire ite nde pensas!</string>
-    <string name="fragment_about__spread_the_word_button">Cumpartzi s\'aplicatzione</string>
-    <string name="fragment_about__spread_the_word_share_text">Ei! Dae un\'ograda a #dandelion! %1$s</string>
+    <string name="spread_the_word">Cumpartzi sa paràula!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Faghe connòschere diaspora* e #dandelion a sos amigos e a sa familia tua! Proite no iscries carchi cosa a pitzu de sas esperièntzias tuas? Noas diat agradare meda a ischire ite nde pensas!</string>
+    <string name="share_the_app">Cumpartzi s\'aplicatzione</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ei! Dae un\'ograda a #dandelion! %1$s</string>
 
 
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Manutentores</string>
-    <string name="fragment_license__maintainers_text">Custa aplicatzione est beninde isvilupada e manutentada dae &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Contribuidores</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Gràtzias!</string>
-    <string name="fragment_license__license_button">Litzèntzia GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Librerias de terzas partes</string>
-    <string name="fragment_license__thirdparty_libs_text">Sunt impreadas custas librerias:</string>
-    <string name="fragment_license__misc_leafpic">Amus pigadu ispiratzione e parte de su còdighe dae LeafPic. Abbistade·bos·lu, est fintzas cussu unu programma lìberu!</string>
-    <string name="fragment_license__misc_leafpic_button">Àteras informatziones</string>
+    <string name="maintainers">Manutentores</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Custa aplicatzione est beninde isvilupada e manutentada dae &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contribuidores</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Gràtzias!</string>
+    <string name="gnu_gplv3_license">Litzèntzia GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Librerias de terzas partes</string>
+    <string name="the_following_libraries_are_used">Sunt impreadas custas librerias:</string>
+    <string name="inspiration_from_leafpic__appspecific">Amus pigadu ispiratzione e parte de su còdighe dae LeafPic. Abbistade·bos·lu, est fintzas cussu unu programma lìberu!</string>
+    <string name="tell_me_more">Àteras informatziones</string>
 
     <!-- Key Names (Untranslatable) -->
 
@@ -171,84 +171,84 @@
     <string name="pref_desc__primary_color">Colore de sas barras de sas ainas</string>
     <string name="pref_title__accent_color">Colore secondàriu</string>
     <string name="pref_desc__accent_color">Colore de sa barra de progressu</string>
-    <string name="pref_title__primary_color__amoled_mode">Modalidade AMOLED</string>
+    <string name="amoled_mode">Modalidade AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Remplasa sos colores cun su nigheddu pro ischermos AMOLED in medas tretos de s\'aplicatzione. As a dèpere torrare a allùghere s\'aplicatzione pro ativare custa impostatzione. Pro navigare in diaspora* cun su tema iscuru lu depes fintzas allùghere dae sas optziones personales de su contu de diaspora* tuo.</string>
 
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Notìficas ismanniadas</string>
-    <string name="pref_desc__extended_notifications">Ismànnia su butone de sas notìficas cun unu menù chi ammustrat sas categorias de sas notìficas</string>
+    <string name="extended_notifications">Notìficas ismanniadas</string>
+    <string name="extendend_notifications_bell_description__appspecific">Ismànnia su butone de sas notìficas cun unu menù chi ammustrat sas categorias de sas notìficas</string>
 
-    <string name="pref_desc__language">Càmbia sa limba de custa aplicatzione. Torra·la a allùghere pro fàghere tènnere efetu a su cambiamentu</string>
-    <string name="pref_title__language">Limba</string>
-    <string name="language_system">Limba de sistema</string>
+    <string name="language_change_restart_description">Càmbia sa limba de custa aplicatzione. Torra·la a allùghere pro fàghere tènnere efetu a su cambiamentu</string>
+    <string name="language">Limba</string>
+    <string name="system_language">Limba de sistema</string>
 
     <!-- Font size -->
-    <string name="pref_desc__font_size">Controlla sa mannària de su testu de sa vista web</string>
-    <string name="pref_title__font_size">Mannària de su testu</string>
-    <string name="font_size_normal">Normale</string>
-    <string name="font_size_large">Mannu</string>
-    <string name="font_size_huge">Mannu meda</string>
+    <string name="control_textsize_of_webview">Controlla sa mannària de su testu de sa vista web</string>
+    <string name="font_size">Mannària de su testu</string>
+    <string name="normal">Normale</string>
+    <string name="large">Mannu</string>
+    <string name="huge">Mannu meda</string>
 
     <!-- Load images -->
-    <string name="pref_title__load_images">Iscàrriga sas immàgines</string>
-    <string name="pref_desc__load_images">Allughe/istuda su carrigamentu de sas immàgines pro risparmiare sos datos mòbiles</string>
+    <string name="load_images">Iscàrriga sas immàgines</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Allughe/istuda su carrigamentu de sas immàgines pro risparmiare sos datos mòbiles</string>
 
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Rotatzione de s\'ischermu</string>
-    <string name="pref_desc__screen_rotation">Controlla sa rotatzione automàtica de s\'ischermu</string>
-    <string name="rotation_system">Predefinidu</string>
-    <string name="rotation_sensor">Sensore\n
+    <string name="screen_rotation">Rotatzione de s\'ischermu</string>
+    <string name="control_screen_rotation">Controlla sa rotatzione automàtica de s\'ischermu</string>
+    <string name="default_">Predefinidu</string>
+    <string name="sensor_ignore_system_settings">Sensore\n
     (ignora sas impostatziones de sistema)</string>
-    <string name="rotation_portrait">Verticale</string>
-    <string name="rotation_landscape">Orizontale</string>
+    <string name="portrait">Verticale</string>
+    <string name="landscape">Orizontale</string>
 
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Càrriga sos valores predefinidos de Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Càrriga sas impostatziones pro su sèrver intermèdiu HTTP de Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Server intermèdiu (Proxy)</string>
-    <string name="pref_title__proxy_enabled">Abìlita unu server intermèdiu</string>
-    <string name="pref_desc__http_proxy_enabled">Faghe colare su tràficu de dandelion* in unu server intermèdiu pro isfrancare sos firewalls.\n
+    <string name="load_tor_preset">Càrriga sos valores predefinidos de Tor</string>
+    <string name="load_proxy_settins_for_tor">Càrriga sas impostatziones pro su sèrver intermèdiu HTTP de Tor (Orbot)</string>
+    <string name="proxy">Server intermèdiu (Proxy)</string>
+    <string name="enable_proxy">Abìlita unu server intermèdiu</string>
+    <string name="proxy_dandelion_traffic__appspecific">Faghe colare su tràficu de dandelion* in unu server intermèdiu pro isfrancare sos firewalls.\n
     Diat pòdere èssere netzessàriu a torrare a allùghere s\'aplicatzione. Diat pòdere non funtzionare pro carchi telèfono.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Ghenna</string>
-    <string name="toast__proxy_disabled__restart_required">Depes torrare a allùghere s\'aplicatzione pro istudare s\'impreu de su server intermediàriu</string>
-    <string name="toast__proxy_orbot_preset_loaded">Impostatziones de su server de Orbot carrigadas</string>
+    <string name="host">Host</string>
+    <string name="port">Ghenna</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Depes torrare a allùghere s\'aplicatzione pro istudare s\'impreu de su server intermediàriu</string>
+    <string name="orbot_proxy_preset_loaded">Impostatziones de su server de Orbot carrigadas</string>
 
 
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Aberi sos ligàmenes esternos cun sas ischedas personalizadas de Chrome. Chromium o Google Chrome depent èssere installados pro lu pòdere fàghere. \n
+    <string name="open_external_links_with_chrome_custom_tabs_description">Aberi sos ligàmenes esternos cun sas ischedas personalizadas de Chrome. Chromium o Google Chrome depent èssere installados pro lu pòdere fàghere. \n
     NOTA DE IMPORTU: sas ischedas personalizadas de Chrome no impreant sos servers intermediàrios configurados!</string>
 
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Impostatziones personales</string>
-    <string name="pref_desc__personal_settings">Aberi sas impostatziones de su contu de diaspora* tuo</string>
-    <string name="pref_desc__manage_contacts">Amministra sa lista de sos contatos tuos</string>
+    <string name="personal_settings">Impostatziones personales</string>
+    <string name="open_diaspora_account_settings__appspecific">Aberi sas impostatziones de su contu de diaspora* tuo</string>
+    <string name="manage_your_contact_list">Amministra sa lista de sos contatos tuos</string>
 
-    <string name="pref_title__manage_tags">Amministra sas etichetas</string>
-    <string name="pref_desc__manage_tags">Acaba·la de sighire sas etichetas sighidas</string>
+    <string name="manage_hashtags">Amministra sas etichetas</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Acaba·la de sighire sas etichetas sighidas</string>
 
-    <string name="pref_title__change_account">Càmbia contu</string>
-    <string name="pref_desc__change_account">Iscantzella sos datos de sa sessione locale e cola a un\'àteru contu o pod de diaspora*</string>
-    <string name="pref_warning__change_account">Custu at a iscantzellare totu sos cookies e sos datos de sa sessione. Seguru ses de chèrrere cambiare su contu tuo?</string>
+    <string name="change_account">Càmbia contu</string>
+    <string name="loug_warning_description__appspecific">Iscantzella sos datos de sa sessione locale e cola a un\'àteru contu o pod de diaspora*</string>
+    <string name="logout_warning_description">Custu at a iscantzellare totu sos cookies e sos datos de sa sessione. Seguru ses de chèrrere cambiare su contu tuo?</string>
 
-    <string name="pref_title__clear_cache">Iscantzella sa cache</string>
-    <string name="pref_desc__clear_cache">Iscantzella sa cache de sa vista web</string>
+    <string name="clear_cache">Iscantzella sa cache</string>
+    <string name="clear_webview_cache">Iscantzella sa cache de sa vista web</string>
 
 
-    <string name="pref_desc__intellihide_toolbars">Istichi automaticamente sas barras superiores e inferiores cando ses iscurrende sa pàgina</string>
-    <string name="pref_title__intellihide_toolbars">Barras chi s\'istichint intelligentemente</string>
+    <string name="intellihide_toolbars__appspecific">Istichi automaticamente sas barras superiores e inferiores cando ses iscurrende sa pàgina</string>
+    <string name="intellihide_toolbars">Barras chi s\'istichint intelligentemente</string>
 
-    <string name="pref_title__append_shared_via_app">Annanghe un\'avisu de s\'aplicatzione</string>
-    <string name="pref_desc__append_shared_via_app">Annanghe unu riferimentu a custa aplicatzione a sos testos cumpartzidos: [via #dandelion]</string>
+    <string name="append_shared_by_notice">Annanghe un\'avisu de s\'aplicatzione</string>
+    <string name="append_shared_by_notice__appspecific">Annanghe unu riferimentu a custa aplicatzione a sos testos cumpartzidos: [via #dandelion]</string>
 
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Vàriu</string>
+    <string name="miscellaneous">Vàriu</string>
 
-    <string name="pref_title__wipe_settings">Reimpostatzione intrea</string>
-    <string name="pref_desc__wipe_settings">Iscantzella localmente totu sos datos relativos a s\'aplicatzione e essi dae totu sos contos</string>
+    <string name="full_reset">Reimpostatzione intrea</string>
+    <string name="wipe_settings_and_logout">Iscantzella localmente totu sos datos relativos a s\'aplicatzione e essi dae totu sos contos</string>
 
-    <string name="dialog_content__wipe_settings">Custu at a fàghere torrare totu sas impostatziones de s\'aplicatzione a sos valores predefinidos e t\'at a fàghere essire dae totu sos pods. Sas immàgines iscarrigadas dae tie no ant a èssere tocadas. Seguru ses de chèrrere sighire?</string>
+    <string name="wipe_settings_warning__appspecific">Custu at a fàghere torrare totu sas impostatziones de s\'aplicatzione a sos valores predefinidos e t\'at a fàghere essire dae totu sos pods. Sas immàgines iscarrigadas dae tie no ant a èssere tocadas. Seguru ses de chèrrere sighire?</string>
 
-    <string name="pref_desc__adblock_enable">Abìlita su blocadore de publitzidade de base. Sa publitzidade diat pòdere èssere incluida, pro esèmpiu, in sas visualizatziones incorporadas</string>
-    <string name="pref_title__adblock_enable">Bloca sa publitzidade</string>
+    <string name="enable_basic_adblocker_description">Abìlita su blocadore de publitzidade de base. Sa publitzidade diat pòdere èssere incluida, pro esèmpiu, in sas visualizatziones incorporadas</string>
+    <string name="block_advertisments">Bloca sa publitzidade</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 171d9c05..6cf0e5ca 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -78,45 +78,45 @@
     <string name="missing_value">Värde saknas</string>
     <string name="jump_to_last_visited_timestamp_in_stream">Vill du hoppa senast besökta sida i strömmen?</string>
 
-    <string name="about_activity__title_about_app">Om</string>
-    <string name="about_activity__title_about_license">Licens</string>
-    <string name="about_activity__title_debug_info">Avlusning</string>
-    <string name="fragment_debug__section_app">Program</string>
-    <string name="fragment_debug__section_device">Enhet</string>
-    <string name="fragment_debug__section_pod">diaspora*-pod</string>
-    <string name="fragment_debug__section_log">Avlusningslogg</string>
-    <string name="fragment_debug__section_log_spam">Avlusningslogg (detaljerad)</string>
-    <string name="fragment_debug__app_version">Programversion: %1$s</string>
-    <string name="fragment_debug__android_version">Androidversion: %1$s</string>
-    <string name="fragment_debug__device_name">Enhetens namn: %1$s</string>
-    <string name="fragment_debug__app_codename">Kodnamn: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Podprofilens namn: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Poddomän: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Texten kopierad till urklippen</string>
-    <string name="fragment_about__about_text">dandelion* är en kompletterande app till att använda det sociala nätverket diaspora*. Den lägger till funktioner såsom användbara verktyg and stöd för proxyservrar såsom Tor.</string>
-    <string name="fragment_about__contribute">Bidrag med kod!</string>
-    <string name="fragment_about__contribute_text">dandelion* är utvecklat för att vara fritt som i frihet och lyder under samma filosofi som diaspora*-projektet. Om du vill bidra, är det fritt fram! I dagsläget är vi få, så uppskattar öppenhjärtigt all hjälp!</string>
-    <string name="fragment_about__contribute_button">Hämta källkoden</string>
-    <string name="fragment_about__translate">Översätt appen!</string>
-    <string name="fragment_about__translate_text">Är appen inte tillgänglig på ditt mål? Det kan du ändra på! Hjälp oss översätta! Vi använder oss av plattformen Crowdin så att alla kan hjälpa till att översätta appen.</string>
-    <string name="fragment_about__translate_button">Jag vill översätta</string>
-    <string name="fragment_about__feedback">Lämna respons!</string>
-    <string name="fragment_about__feedback_text">dandelion* utvecklas fortfarande, så har du några förslag eller annan återkoppling, använd vårt buggrapporteringssystem!</string>
-    <string name="fragment_about__feedback_button">Rapportera buggar</string>
-    <string name="fragment_about__spread_the_word">Berätta om oss!</string>
-    <string name="fragment_about__spread_the_word_text">Berätta för dina närmaste om diaspora* och #dandelion! Blogga om dina erfarenheter! Vi vill gärna veta vad du tycker!</string>
-    <string name="fragment_about__spread_the_word_button">Dela appen</string>
-    <string name="fragment_about__spread_the_word_share_text">Hallå! Kolla in #dandelion! %1$s</string>
+    <string name="about">Om</string>
+    <string name="license">Licens</string>
+    <string name="debugging">Avlusning</string>
+    <string name="application">Program</string>
+    <string name="device">Enhet</string>
+    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
+    <string name="debug_log">Avlusningslogg</string>
+    <string name="debug_log_verbose">Avlusningslogg (detaljerad)</string>
+    <string name="app_version_with_arg">Programversion: %1$s</string>
+    <string name="android_version_witharg">Androidversion: %1$s</string>
+    <string name="device_name_witharg">Enhetens namn: %1$s</string>
+    <string name="code_name_witharg">Kodnamn: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Podprofilens namn: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Poddomän: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Texten kopierad till urklippen</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* är en kompletterande app till att använda det sociala nätverket diaspora*. Den lägger till funktioner såsom användbara verktyg and stöd för proxyservrar såsom Tor.</string>
+    <string name="contribute_code">Bidrag med kod!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* är utvecklat för att vara fritt som i frihet och lyder under samma filosofi som diaspora*-projektet. Om du vill bidra, är det fritt fram! I dagsläget är vi få, så uppskattar öppenhjärtigt all hjälp!</string>
+    <string name="get_the_source">Hämta källkoden</string>
+    <string name="translate_the_app">Översätt appen!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Är appen inte tillgänglig på ditt mål? Det kan du ändra på! Hjälp oss översätta! Vi använder oss av plattformen Crowdin så att alla kan hjälpa till att översätta appen.</string>
+    <string name="let_me_translate">Jag vill översätta</string>
+    <string name="give_feedback">Lämna respons!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* utvecklas fortfarande, så har du några förslag eller annan återkoppling, använd vårt buggrapporteringssystem!</string>
+    <string name="report_bugs">Rapportera buggar</string>
+    <string name="spread_the_word">Berätta om oss!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Berätta för dina närmaste om diaspora* och #dandelion! Blogga om dina erfarenheter! Vi vill gärna veta vad du tycker!</string>
+    <string name="share_the_app">Dela appen</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hallå! Kolla in #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Utvecklare</string>
-    <string name="fragment_license__maintainers_text">Denna app utvecklas för närvarande och underhålls av &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="fragment_license__contributors">Bidragsgivare</string>
-    <string name="fragment_license__contributors_thank_you">%1$s &lt; br &gt;&lt; br &gt; Tack så hjärtligt!</string>
-    <string name="fragment_license__license_button">GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Tredjepartsbibliotek</string>
-    <string name="fragment_license__thirdparty_libs_text">Följande bibliotek används:</string>
-    <string name="fragment_license__misc_leafpic">Vi hämtade inspiration och kod från LeafPic. Kika på det, det är också fri programvara!</string>
-    <string name="fragment_license__misc_leafpic_button">Berätta mer</string>
+    <string name="maintainers">Utvecklare</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Denna app utvecklas för närvarande och underhålls av &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Bidragsgivare</string>
+    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; Tack så hjärtligt!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Tredjepartsbibliotek</string>
+    <string name="the_following_libraries_are_used">Följande bibliotek används:</string>
+    <string name="inspiration_from_leafpic__appspecific">Vi hämtade inspiration och kod från LeafPic. Kika på det, det är också fri programvara!</string>
+    <string name="tell_me_more">Berätta mer</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -141,62 +141,62 @@
     <string name="pref_desc__primary_color">Färgen på verktygspanelerna</string>
     <string name="pref_title__accent_color">Accentfärg</string>
     <string name="pref_desc__accent_color">Färg på förloppsindikatorn</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED-läge</string>
+    <string name="amoled_mode">AMOLED-läge</string>
     <string name="pref_desc__primary_color__amoled_mode">Överskrid färger med svart i flera delar av appen, anpassad AMOLED-skärmar. Du behöver starta om för att verkställa. För att använda Diaspora* i mörkt läge behöver du också aktivera Dark theme, som du hittar bland dina personliga Diaspora*-kontoinställningar.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Utökade notifikationer</string>
-    <string name="pref_desc__extended_notifications">Utöka notifikationsklockan med en rullgardinsmeny som visar kategorier för notifieringar</string>
-    <string name="pref_desc__language">Byt språk för appen. Starta om för att fastställa ändringar</string>
-    <string name="pref_title__language">Språk</string>
-    <string name="language_system">Systemspråk</string>
+    <string name="extended_notifications">Utökade notifikationer</string>
+    <string name="extendend_notifications_bell_description__appspecific">Utöka notifikationsklockan med en rullgardinsmeny som visar kategorier för notifieringar</string>
+    <string name="language_change_restart_description">Byt språk för appen. Starta om för att fastställa ändringar</string>
+    <string name="language">Språk</string>
+    <string name="system_language">Systemspråk</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Justera textstorleken för WebView</string>
-    <string name="pref_title__font_size">Teckenstorlek</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Stor</string>
-    <string name="font_size_huge">Enorm</string>
+    <string name="control_textsize_of_webview">Justera textstorleken för WebView</string>
+    <string name="font_size">Teckenstorlek</string>
+    <string name="normal">Normal</string>
+    <string name="large">Stor</string>
+    <string name="huge">Enorm</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Läs in bilder</string>
-    <string name="pref_desc__load_images">Växla bildinläsning för t.ex. låg mobildata</string>
+    <string name="load_images">Läs in bilder</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Växla bildinläsning för t.ex. låg mobildata</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Skärmrotation</string>
-    <string name="pref_desc__screen_rotation">Styr automatisk skärmrotering</string>
-    <string name="rotation_system">Förvald</string>
-    <string name="rotation_sensor">Sensor\n(överskrid systeminställningar)</string>
-    <string name="rotation_portrait">Porträtt</string>
-    <string name="rotation_landscape">Landskap</string>
+    <string name="screen_rotation">Skärmrotation</string>
+    <string name="control_screen_rotation">Styr automatisk skärmrotering</string>
+    <string name="default_">Förvald</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(överskrid systeminställningar)</string>
+    <string name="portrait">Porträtt</string>
+    <string name="landscape">Landskap</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Ladda Tor-nställningar</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Ladda proxyinställningar för Tor (Orbot) HTTP Proxy</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Aktivera proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Använd proxy med dandelion* för att kringgå brandväggar.\nKan kräva omstart. Detta fungerar inte på vissa telefoner.</string>
-    <string name="pref_title__http_proxy_host">Värd</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">Appen måste startas om för att inaktivera proxyanvändning</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot-proxyinställningar laddade</string>
+    <string name="load_tor_preset">Ladda Tor-nställningar</string>
+    <string name="load_proxy_settins_for_tor">Ladda proxyinställningar för Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Aktivera proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Använd proxy med dandelion* för att kringgå brandväggar.\nKan kräva omstart. Detta fungerar inte på vissa telefoner.</string>
+    <string name="host">Värd</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Appen måste startas om för att inaktivera proxyanvändning</string>
+    <string name="orbot_proxy_preset_loaded">Orbot-proxyinställningar laddade</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Öppna externa länkar med Chrome Custom Tabs. Chromium eller Google Chrome måste installeras för att använda den här funktionen. \nOBSERVERA: Chrome Custom Tabs använder inte den konfigurerade proxyservern!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Öppna externa länkar med Chrome Custom Tabs. Chromium eller Google Chrome måste installeras för att använda den här funktionen. \nOBSERVERA: Chrome Custom Tabs använder inte den konfigurerade proxyservern!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Personliga inställningar</string>
-    <string name="pref_desc__personal_settings">Öppna dina kontoinställningar i diaspora*</string>
-    <string name="pref_desc__manage_contacts">Hantera din kontaktlista</string>
-    <string name="pref_title__manage_tags">Hantera fyrkantstaggar</string>
-    <string name="pref_desc__manage_tags">Sluta följa taggar du redan följer</string>
-    <string name="pref_title__change_account">Ändra Konto</string>
-    <string name="pref_desc__change_account">Radera lokal sessionsdata och växla till en annan diaspora*-pod eller -konto</string>
-    <string name="pref_warning__change_account">Detta kommer att radera alla kakor och all sessionsdata. Vill du verkligen byta konto?</string>
-    <string name="pref_title__clear_cache">Rensa cache</string>
-    <string name="pref_desc__clear_cache">Rensa WebView-cache</string>
-    <string name="pref_desc__intellihide_toolbars">Dölj automatiskt de övre och undre verktygsfälten när du skrollar</string>
-    <string name="pref_title__intellihide_toolbars">Intellihide-verktygsfält</string>
-    <string name="pref_title__append_shared_via_app">Lägg till delade-av-meddelande</string>
-    <string name="pref_desc__append_shared_via_app">Lägg till en hänvisning till denna app när du skriver: [via #dandelion]</string>
+    <string name="personal_settings">Personliga inställningar</string>
+    <string name="open_diaspora_account_settings__appspecific">Öppna dina kontoinställningar i diaspora*</string>
+    <string name="manage_your_contact_list">Hantera din kontaktlista</string>
+    <string name="manage_hashtags">Hantera fyrkantstaggar</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Sluta följa taggar du redan följer</string>
+    <string name="change_account">Ändra Konto</string>
+    <string name="loug_warning_description__appspecific">Radera lokal sessionsdata och växla till en annan diaspora*-pod eller -konto</string>
+    <string name="logout_warning_description">Detta kommer att radera alla kakor och all sessionsdata. Vill du verkligen byta konto?</string>
+    <string name="clear_cache">Rensa cache</string>
+    <string name="clear_webview_cache">Rensa WebView-cache</string>
+    <string name="intellihide_toolbars__appspecific">Dölj automatiskt de övre och undre verktygsfälten när du skrollar</string>
+    <string name="intellihide_toolbars">Intellihide-verktygsfält</string>
+    <string name="append_shared_by_notice">Lägg till delade-av-meddelande</string>
+    <string name="append_shared_by_notice__appspecific">Lägg till en hänvisning till denna app när du skriver: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Diverse</string>
-    <string name="pref_title__wipe_settings">Total återställning</string>
-    <string name="pref_desc__wipe_settings">Rensa alla lokala inställningar som har med appen att göra och logga ut alla konton</string>
-    <string name="dialog_content__wipe_settings">Detta kommer att återställa alla ändrade inställningarna på appen till deras standardvärden och loggar ut dig från alla poddar. Dina nedladdade bilder förblir orörda. Är du säker på att du vill fortsätta?</string>
-    <string name="pref_desc__adblock_enable">Använd lätt reklamblockering. Reklam finns bland annat i inbyggda vyer</string>
-    <string name="pref_title__adblock_enable">Blockera reklam</string>
+    <string name="miscellaneous">Diverse</string>
+    <string name="full_reset">Total återställning</string>
+    <string name="wipe_settings_and_logout">Rensa alla lokala inställningar som har med appen att göra och logga ut alla konton</string>
+    <string name="wipe_settings_warning__appspecific">Detta kommer att återställa alla ändrade inställningarna på appen till deras standardvärden och loggar ut dig från alla poddar. Dina nedladdade bilder förblir orörda. Är du säker på att du vill fortsätta?</string>
+    <string name="enable_basic_adblocker_description">Använd lätt reklamblockering. Reklam finns bland annat i inbyggda vyer</string>
+    <string name="block_advertisments">Blockera reklam</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index afcb63ee..709cc91d 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -28,39 +28,39 @@
     <!-- More from MainActivity -->
     <!-- Permissions -->
 
-    <string name="about_activity__title_about_app">Hakkında</string>
-    <string name="about_activity__title_about_license">Lisans</string>
-    <string name="about_activity__title_debug_info">Hata Ayıklama</string>
-    <string name="fragment_debug__section_app">Uygulama</string>
-    <string name="fragment_debug__section_device">Cihaz</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Hata Ayıklama Günlükleri</string>
-    <string name="fragment_debug__section_log_spam">Hata Ayıklama Günlüğü (Detaylı)</string>
-    <string name="fragment_debug__app_version">Uygulama Sürümü: %1$s</string>
-    <string name="fragment_debug__android_version">Android Sürümü: %1$s</string>
-    <string name="fragment_debug__device_name">Cihaz Adı: %1$s</string>
-    <string name="fragment_debug__app_codename">Kod adı: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod Profil Adı: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod Adresi: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Hata ayıklama günlüğü panoya kopyalandı</string>
-    <string name="fragment_about__contribute">Koda katkıda bulun!</string>
-    <string name="fragment_about__contribute_button">Kaynağı al</string>
-    <string name="fragment_about__translate">Uygulamayı tercüme et!</string>
-    <string name="fragment_about__translate_text">Uygulamayı kendi dilinde kullanamıyor musun? Bunu değiştirebilirsin. Neden çeviride bize yardımcı olmuyorsun? Herkesin çeviriye katkıda bulunabilmesi için Crowdin platformunu kullanıyoruz.</string>
-    <string name="fragment_about__translate_button">Hadi çevirelim</string>
-    <string name="fragment_about__feedback">Geri bildirimde bulun!</string>
-    <string name="fragment_about__feedback_button">Hataları Bildir</string>
-    <string name="fragment_about__spread_the_word">Herkese duyur!</string>
-    <string name="fragment_about__spread_the_word_button">Uygulamayı paylaş</string>
-    <string name="fragment_about__spread_the_word_share_text">Hey %1$s ! #dandelion’a bir göz at!</string>
+    <string name="about">Hakkında</string>
+    <string name="license">Lisans</string>
+    <string name="debugging">Hata Ayıklama</string>
+    <string name="application">Uygulama</string>
+    <string name="device">Cihaz</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Hata Ayıklama Günlükleri</string>
+    <string name="debug_log_verbose">Hata Ayıklama Günlüğü (Detaylı)</string>
+    <string name="app_version_with_arg">Uygulama Sürümü: %1$s</string>
+    <string name="android_version_witharg">Android Sürümü: %1$s</string>
+    <string name="device_name_witharg">Cihaz Adı: %1$s</string>
+    <string name="code_name_witharg">Kod adı: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profil Adı: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Adresi: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Hata ayıklama günlüğü panoya kopyalandı</string>
+    <string name="contribute_code">Koda katkıda bulun!</string>
+    <string name="get_the_source">Kaynağı al</string>
+    <string name="translate_the_app">Uygulamayı tercüme et!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Uygulamayı kendi dilinde kullanamıyor musun? Bunu değiştirebilirsin. Neden çeviride bize yardımcı olmuyorsun? Herkesin çeviriye katkıda bulunabilmesi için Crowdin platformunu kullanıyoruz.</string>
+    <string name="let_me_translate">Hadi çevirelim</string>
+    <string name="give_feedback">Geri bildirimde bulun!</string>
+    <string name="report_bugs">Hataları Bildir</string>
+    <string name="spread_the_word">Herkese duyur!</string>
+    <string name="share_the_app">Uygulamayı paylaş</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey %1$s ! #dandelion’a bir göz at!</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Yardımcılar</string>
-    <string name="fragment_license__contributors">Katkıda Bulunanlar</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Teşekkürler!</string>
-    <string name="fragment_license__license_button">GNU GPLv3+ License</string>
-    <string name="fragment_license__thirdparty_libs">Üçüncü Parti Kütüphaneler</string>
-    <string name="fragment_license__thirdparty_libs_text">Şu kütüphaneler kullanıldı:</string>
-    <string name="fragment_license__misc_leafpic_button">Daha fazla göster</string>
+    <string name="maintainers">Yardımcılar</string>
+    <string name="contributors">Katkıda Bulunanlar</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Teşekkürler!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ License</string>
+    <string name="show_third_party_licenses">Üçüncü Parti Kütüphaneler</string>
+    <string name="the_following_libraries_are_used">Şu kütüphaneler kullanıldı:</string>
+    <string name="tell_me_more">Daha fazla göster</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -84,33 +84,33 @@
     <string name="pref_desc__primary_color">Araç çubuğu rengi</string>
     <string name="pref_title__accent_color">Vurgu rengi</string>
     <string name="pref_desc__accent_color">İlerleme çubuğunun rengi</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED Modu</string>
+    <string name="amoled_mode">AMOLED Modu</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Genişletilmiş Bildirimler</string>
-    <string name="pref_title__language">Dil</string>
-    <string name="language_system">Sistem dili</string>
+    <string name="extended_notifications">Genişletilmiş Bildirimler</string>
+    <string name="language">Dil</string>
+    <string name="system_language">Sistem dili</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Web Görünümünün yazı boyutunu ayarların</string>
-    <string name="pref_title__font_size">Yazı Boyutu</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Büyük</string>
-    <string name="font_size_huge">Çok Büyük</string>
+    <string name="control_textsize_of_webview">Web Görünümünün yazı boyutunu ayarların</string>
+    <string name="font_size">Yazı Boyutu</string>
+    <string name="normal">Normal</string>
+    <string name="large">Büyük</string>
+    <string name="huge">Çok Büyük</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Resimleri yükle</string>
-    <string name="pref_desc__load_images">Örneğin veri tasarrufu için resimlerin yüklenmesini ayarlayın</string>
+    <string name="load_images">Resimleri yükle</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Örneğin veri tasarrufu için resimlerin yüklenmesini ayarlayın</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Ekran döndürme</string>
-    <string name="pref_desc__screen_rotation">Otomatik ekran döndürmeyi ayarlayın</string>
-    <string name="rotation_system">Varsayılan</string>
-    <string name="rotation_portrait">Dikey</string>
-    <string name="rotation_landscape">Yatay</string>
+    <string name="screen_rotation">Ekran döndürme</string>
+    <string name="control_screen_rotation">Otomatik ekran döndürmeyi ayarlayın</string>
+    <string name="default_">Varsayılan</string>
+    <string name="portrait">Dikey</string>
+    <string name="landscape">Yatay</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Tor hazır ayarını yükle</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Tor (Orbot) HTTP Proxy için proxy ayarlarını yükle</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Proxy etkinleştir</string>
-    <string name="pref_title__http_proxy_host">Sunucu</string>
-    <string name="pref_title__http_proxy_port">Port</string>
+    <string name="load_tor_preset">Tor hazır ayarını yükle</string>
+    <string name="load_proxy_settins_for_tor">Tor (Orbot) HTTP Proxy için proxy ayarlarını yükle</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Proxy etkinleştir</string>
+    <string name="host">Sunucu</string>
+    <string name="port">Port</string>
     <!-- Chrome custom tabs -->
     <!-- Diaspora Settings -->
     <!-- More -->
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 0994db0f..47ab10f7 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -78,45 +78,45 @@
     <string name="missing_value">Відсутнє значення</string>
     <string name="jump_to_last_visited_timestamp_in_stream">Перейти на останню відвідану сторінку в потоці?</string>
 
-    <string name="about_activity__title_about_app">Про нас</string>
-    <string name="about_activity__title_about_license">Ліцензія</string>
-    <string name="about_activity__title_debug_info">Налагодження</string>
-    <string name="fragment_debug__section_app">Програма</string>
-    <string name="fragment_debug__section_device">Пристрій</string>
-    <string name="fragment_debug__section_pod">Под Діаспора*</string>
-    <string name="fragment_debug__section_log">Журнал налагодження</string>
-    <string name="fragment_debug__section_log_spam">Журнал налагодження (детальний)</string>
-    <string name="fragment_debug__app_version">Версія програми: %1$s</string>
-    <string name="fragment_debug__android_version">Версія Android: %1$s</string>
-    <string name="fragment_debug__device_name">Назва пристрою: %1$s</string>
-    <string name="fragment_debug__app_codename">Кодова назва: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Назва профілю поду: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Домен поду: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Журнал налагодження скопійовано в буфер обміну</string>
-    <string name="fragment_about__about_text">dandelion* — це ваша програмка для перегляду соціальної мережі Діаспора*. Для зручності, застосунок додає такі функції, як використання панелей інструментів і підримку проксі-серверів на зразок мережі Tor.</string>
-    <string name="fragment_about__contribute">Зробіть внесок у код!</string>
-    <string name="fragment_about__contribute_text">dandelion* розробляється як вільне програмне забезпечення і слідує ідеям проекту Діаспора*. Якщо ви хочете зробити внесок, приєднуйтеся! Зараз ми дуже маленька команда, тож будемо раді будь-якій допомозі!</string>
-    <string name="fragment_about__contribute_button">Отримати вихідний код</string>
-    <string name="fragment_about__translate">Перекласти цю програмку</string>
-    <string name="fragment_about__translate_text">Цей застосунок недоступний вашою мовою? Ви можете це змінити! Чому б не допомогти нам, переклавши його? Ми використовуємо платформу crowdin, де будь-хто може перекласти програмку.</string>
-    <string name="fragment_about__translate_button">Хочу перекладати</string>
-    <string name="fragment_about__feedback">Залишіть відгук!</string>
-    <string name="fragment_about__feedback_text">dandelion* все ще перебуває у розробці, тому якщо у вас є побажання або відгуки, будь ласка, скористайтеся нашим баг-трекером, щоб ми знали!</string>
-    <string name="fragment_about__feedback_button">Повідомити про помилку</string>
-    <string name="fragment_about__spread_the_word">Поділіться з друзями!</string>
-    <string name="fragment_about__spread_the_word_text">Розкажіть про Діаспору і #dandelion друзям і родині! Чому б не написати у блог про свій досвід? Будемо раді почути вашу думку!</string>
-    <string name="fragment_about__spread_the_word_button">Поділитися застосунком</string>
-    <string name="fragment_about__spread_the_word_share_text">Привіт! Спробуй #dandelion! %1$s</string>
+    <string name="about">Про нас</string>
+    <string name="license">Ліцензія</string>
+    <string name="debugging">Налагодження</string>
+    <string name="application">Програма</string>
+    <string name="device">Пристрій</string>
+    <string name="diaspora_pod__appspecific">Под Діаспора*</string>
+    <string name="debug_log">Журнал налагодження</string>
+    <string name="debug_log_verbose">Журнал налагодження (детальний)</string>
+    <string name="app_version_with_arg">Версія програми: %1$s</string>
+    <string name="android_version_witharg">Версія Android: %1$s</string>
+    <string name="device_name_witharg">Назва пристрою: %1$s</string>
+    <string name="code_name_witharg">Кодова назва: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Назва профілю поду: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Домен поду: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Журнал налагодження скопійовано в буфер обміну</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* — це ваша програмка для перегляду соціальної мережі Діаспора*. Для зручності, застосунок додає такі функції, як використання панелей інструментів і підримку проксі-серверів на зразок мережі Tor.</string>
+    <string name="contribute_code">Зробіть внесок у код!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* розробляється як вільне програмне забезпечення і слідує ідеям проекту Діаспора*. Якщо ви хочете зробити внесок, приєднуйтеся! Зараз ми дуже маленька команда, тож будемо раді будь-якій допомозі!</string>
+    <string name="get_the_source">Отримати вихідний код</string>
+    <string name="translate_the_app">Перекласти цю програмку</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Цей застосунок недоступний вашою мовою? Ви можете це змінити! Чому б не допомогти нам, переклавши його? Ми використовуємо платформу crowdin, де будь-хто може перекласти програмку.</string>
+    <string name="let_me_translate">Хочу перекладати</string>
+    <string name="give_feedback">Залишіть відгук!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* все ще перебуває у розробці, тому якщо у вас є побажання або відгуки, будь ласка, скористайтеся нашим баг-трекером, щоб ми знали!</string>
+    <string name="report_bugs">Повідомити про помилку</string>
+    <string name="spread_the_word">Поділіться з друзями!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Розкажіть про Діаспору і #dandelion друзям і родині! Чому б не написати у блог про свій досвід? Будемо раді почути вашу думку!</string>
+    <string name="share_the_app">Поділитися застосунком</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Привіт! Спробуй #dandelion! %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Розробники</string>
-    <string name="fragment_license__maintainers_text">Зараз цю програмку розробляють і підтримують &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">Учасники</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;Дякуємо!</string>
-    <string name="fragment_license__license_button">Ліцензія GNU GPLv3+</string>
-    <string name="fragment_license__thirdparty_libs">Сторонні бібліотеки</string>
-    <string name="fragment_license__thirdparty_libs_text">Використовуються такі бібліотеки:</string>
-    <string name="fragment_license__misc_leafpic">Ми взяли трохи натхнення і коду з LeafPic. Це також вільне програмне забезпечення, тож користуйтеся!</string>
-    <string name="fragment_license__misc_leafpic_button">Хочу знати більше</string>
+    <string name="maintainers">Розробники</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Зараз цю програмку розробляють і підтримують &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Учасники</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Дякуємо!</string>
+    <string name="gnu_gplv3_license">Ліцензія GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Сторонні бібліотеки</string>
+    <string name="the_following_libraries_are_used">Використовуються такі бібліотеки:</string>
+    <string name="inspiration_from_leafpic__appspecific">Ми взяли трохи натхнення і коду з LeafPic. Це також вільне програмне забезпечення, тож користуйтеся!</string>
+    <string name="tell_me_more">Хочу знати більше</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -141,62 +141,62 @@
     <string name="pref_desc__primary_color">Колір панелей</string>
     <string name="pref_title__accent_color">Контрастний колір</string>
     <string name="pref_desc__accent_color">Колір панелі прогресу</string>
-    <string name="pref_title__primary_color__amoled_mode">Режим AMOLED</string>
+    <string name="amoled_mode">Режим AMOLED</string>
     <string name="pref_desc__primary_color__amoled_mode">Замінити кольори у багатьох частинах програмки на чорний, сприядливий для AMOLED-дисплеїв. Вам треба здійснити перезавантаження, щоб це налаштування запрацювало. Щоб перекладати Діаспору* в темних тонах, Вам також треба активувати темну тему у своїх налаштуваннях обліковки Діаспори*.</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Розширені сповіщення</string>
-    <string name="pref_desc__extended_notifications">Додати до дзвоника сповіщень випадне меню з категоріями сповіщень</string>
-    <string name="pref_desc__language">Змінити мову цієї програмки. Перезавантажте застосунок, щоб зміни запрацювали</string>
-    <string name="pref_title__language">Мова</string>
-    <string name="language_system">Мова системи</string>
+    <string name="extended_notifications">Розширені сповіщення</string>
+    <string name="extendend_notifications_bell_description__appspecific">Додати до дзвоника сповіщень випадне меню з категоріями сповіщень</string>
+    <string name="language_change_restart_description">Змінити мову цієї програмки. Перезавантажте застосунок, щоб зміни запрацювали</string>
+    <string name="language">Мова</string>
+    <string name="system_language">Мова системи</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">Налаштування розміру тексту WebView</string>
-    <string name="pref_title__font_size">Розмір шрифту</string>
-    <string name="font_size_normal">Звичайний</string>
-    <string name="font_size_large">Великий</string>
-    <string name="font_size_huge">Величезний</string>
+    <string name="control_textsize_of_webview">Налаштування розміру тексту WebView</string>
+    <string name="font_size">Розмір шрифту</string>
+    <string name="normal">Звичайний</string>
+    <string name="large">Великий</string>
+    <string name="huge">Величезний</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">Завантаження зображень</string>
-    <string name="pref_desc__load_images">Вимкнути завантаження зображень, напр. для зменшення трафіку</string>
+    <string name="load_images">Завантаження зображень</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Вимкнути завантаження зображень, напр. для зменшення трафіку</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Поворот екрану</string>
-    <string name="pref_desc__screen_rotation">Налаштування автоматичного повертання екрану</string>
-    <string name="rotation_system">За замовчуванням</string>
-    <string name="rotation_sensor">Сенсор\n(ігнорувати системні налаштування)</string>
-    <string name="rotation_portrait">Портрет</string>
-    <string name="rotation_landscape">Пейзаж</string>
+    <string name="screen_rotation">Поворот екрану</string>
+    <string name="control_screen_rotation">Налаштування автоматичного повертання екрану</string>
+    <string name="default_">За замовчуванням</string>
+    <string name="sensor_ignore_system_settings">Сенсор\n(ігнорувати системні налаштування)</string>
+    <string name="portrait">Портрет</string>
+    <string name="landscape">Пейзаж</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Завантажити шаблон налаштувань Tor</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Завантажити налаштування проксі для Tor (Orbot)</string>
-    <string name="pref_title__sub_proxy">Проксі</string>
-    <string name="pref_title__proxy_enabled">Увімкнути проксі</string>
-    <string name="pref_desc__http_proxy_enabled">Пускати трафік dandelion* через проксі для обходу фаєрволів.\nМоже потребувати перезапуску. На деяких телефонах може не працювати.</string>
-    <string name="pref_title__http_proxy_host">Хост</string>
-    <string name="pref_title__http_proxy_port">Порт</string>
-    <string name="toast__proxy_disabled__restart_required">Потрібен перезапуск програмки, щоб вимкнути використання проксі</string>
-    <string name="toast__proxy_orbot_preset_loaded">Завантажено шаблон налаштувань Orbot</string>
+    <string name="load_tor_preset">Завантажити шаблон налаштувань Tor</string>
+    <string name="load_proxy_settins_for_tor">Завантажити налаштування проксі для Tor (Orbot)</string>
+    <string name="proxy">Проксі</string>
+    <string name="enable_proxy">Увімкнути проксі</string>
+    <string name="proxy_dandelion_traffic__appspecific">Пускати трафік dandelion* через проксі для обходу фаєрволів.\nМоже потребувати перезапуску. На деяких телефонах може не працювати.</string>
+    <string name="host">Хост</string>
+    <string name="port">Порт</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Потрібен перезапуск програмки, щоб вимкнути використання проксі</string>
+    <string name="orbot_proxy_preset_loaded">Завантажено шаблон налаштувань Orbot</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Відкривати зовнішні посилання у Chrome Custom Tabs. Для використання цієї функції має бути встановлений Chromium або Google Chrome.\nВАЖЛИВО: Chrome Custom Tabs не використовують налаштовані проксі-сервери!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Відкривати зовнішні посилання у Chrome Custom Tabs. Для використання цієї функції має бути встановлений Chromium або Google Chrome.\nВАЖЛИВО: Chrome Custom Tabs не використовують налаштовані проксі-сервери!</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Персональні налаштування</string>
-    <string name="pref_desc__personal_settings">Відкрити налаштування обліковки Діаспори*</string>
-    <string name="pref_desc__manage_contacts">Налаштувати список контактів</string>
-    <string name="pref_title__manage_tags">Керувати мітками</string>
-    <string name="pref_desc__manage_tags">Відписатися від поточних міток</string>
-    <string name="pref_title__change_account">Змінити обліковий запис</string>
-    <string name="pref_desc__change_account">Стерти локальні дані сесії і перемкнутися на інший под/обліковий запис Діаспори*</string>
-    <string name="pref_warning__change_account">Це видалить усі куки та дані сесії. Ви справді хочете змінити обліковку?</string>
-    <string name="pref_title__clear_cache">Очистити кеш</string>
-    <string name="pref_desc__clear_cache">Очистити кеш WebView</string>
-    <string name="pref_desc__intellihide_toolbars">Автоматично приховувати верхню і нижню панелі при прокручуванні</string>
-    <string name="pref_title__intellihide_toolbars">Інтелектуальне приховування панелей</string>
-    <string name="pref_title__append_shared_via_app">Додати примітку via</string>
-    <string name="pref_desc__append_shared_via_app">Додати до поширюваних текстів примітку: [via #dandelion]</string>
+    <string name="personal_settings">Персональні налаштування</string>
+    <string name="open_diaspora_account_settings__appspecific">Відкрити налаштування обліковки Діаспори*</string>
+    <string name="manage_your_contact_list">Налаштувати список контактів</string>
+    <string name="manage_hashtags">Керувати мітками</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Відписатися від поточних міток</string>
+    <string name="change_account">Змінити обліковий запис</string>
+    <string name="loug_warning_description__appspecific">Стерти локальні дані сесії і перемкнутися на інший под/обліковий запис Діаспори*</string>
+    <string name="logout_warning_description">Це видалить усі куки та дані сесії. Ви справді хочете змінити обліковку?</string>
+    <string name="clear_cache">Очистити кеш</string>
+    <string name="clear_webview_cache">Очистити кеш WebView</string>
+    <string name="intellihide_toolbars__appspecific">Автоматично приховувати верхню і нижню панелі при прокручуванні</string>
+    <string name="intellihide_toolbars">Інтелектуальне приховування панелей</string>
+    <string name="append_shared_by_notice">Додати примітку via</string>
+    <string name="append_shared_by_notice__appspecific">Додати до поширюваних текстів примітку: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Різне</string>
-    <string name="pref_title__wipe_settings">Повне скидання</string>
-    <string name="pref_desc__wipe_settings">Стерти усі локальні налаштування програмки і вийти з усіх обліковок</string>
-    <string name="dialog_content__wipe_settings">Це зітре усі змінені налаштування застосунку до їхніх значень за замовчуванням і вилогінить вас з усіх подів. Ваші завантажені зображення залишаться на міці. Бажаєте продовжити?</string>
-    <string name="pref_desc__adblock_enable">Увімкнути базовий AdBlocker. Реклама може зберегтися, напр., у вбудованих переглядах</string>
-    <string name="pref_title__adblock_enable">Блокувати рекламу</string>
+    <string name="miscellaneous">Різне</string>
+    <string name="full_reset">Повне скидання</string>
+    <string name="wipe_settings_and_logout">Стерти усі локальні налаштування програмки і вийти з усіх обліковок</string>
+    <string name="wipe_settings_warning__appspecific">Це зітре усі змінені налаштування застосунку до їхніх значень за замовчуванням і вилогінить вас з усіх подів. Ваші завантажені зображення залишаться на міці. Бажаєте продовжити?</string>
+    <string name="enable_basic_adblocker_description">Увімкнути базовий AdBlocker. Реклама може зберегтися, напр., у вбудованих переглядах</string>
+    <string name="block_advertisments">Блокувати рекламу</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 50bffbc7..30c8a78e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -76,45 +76,45 @@
     <string name="pref_summary__show_title">在主畫面中顯示標題列</string>
     <string name="pref_title__show_title">顯示標題列</string>
 
-    <string name="about_activity__title_about_app">說明</string>
-    <string name="about_activity__title_about_license">授權條款</string>
-    <string name="about_activity__title_debug_info">除錯</string>
-    <string name="fragment_debug__section_app">應用程式</string>
-    <string name="fragment_debug__section_device">裝置</string>
-    <string name="fragment_debug__section_pod">diaspora* 豆莢</string>
-    <string name="fragment_debug__section_log">除錯紀錄</string>
-    <string name="fragment_debug__section_log_spam">除錯紀錄(詳細版)</string>
-    <string name="fragment_debug__app_version">應用程式版本: %1$s</string>
-    <string name="fragment_debug__android_version">Android 版本: %1$s</string>
-    <string name="fragment_debug__device_name">裝置名稱: %1$s</string>
-    <string name="fragment_debug__app_codename">代號: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">豆莢設定名稱: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">豆莢網址: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">已經複製除錯紀錄到剪貼簿了</string>
-    <string name="fragment_about__about_text">dandelion* (蒲公英*) 是你瀏覽 diaspora* 社交網站的好朋友。它讓你的體驗增加了好用的工具列，並且支援像是 Tor 之類的代理伺服器服務。</string>
-    <string name="fragment_about__contribute">貢獻程式碼！</string>
-    <string name="fragment_about__contribute_text">dandelion* 是自由軟體開發專案，並且追隨 diaspora* 專案的信念。想要貢獻你的心力嗎？那就來吧！目前我們還只是個很小的團隊，任何形式的幫忙都會讓我們足感心！</string>
-    <string name="fragment_about__contribute_button">取得源碼</string>
-    <string name="fragment_about__translate">翻譯應用程式！</string>
-    <string name="fragment_about__translate_text">應用程式沒有你使用語言的版本嗎？你可以改變現狀！何不來幫忙我們翻譯呢？我們使用 crowdin 平台，好讓每個人都能夠參與應用程式的翻譯工作。</string>
-    <string name="fragment_about__translate_button">我來翻譯</string>
-    <string name="fragment_about__feedback">意見回饋！</string>
-    <string name="fragment_about__feedback_text">dandelion* 還在開發階段，所以如果你有任何建議，或是有其他的意見要回饋，請使用我們的臭蟲追蹤網站來讓我們知道！</string>
-    <string name="fragment_about__feedback_button">回報臭蟲</string>
-    <string name="fragment_about__spread_the_word">報給人知！</string>
-    <string name="fragment_about__spread_the_word_text">告訴你的朋友和家人有 #dandelion 這個好東西！何不部落格一下你的使用經驗呢？我們期待聽聽你的故事！</string>
-    <string name="fragment_about__spread_the_word_button">分享應用程式</string>
-    <string name="fragment_about__spread_the_word_share_text">哇！看看 #dandelion 這套應用程式！ %1$s</string>
+    <string name="about">說明</string>
+    <string name="license">授權條款</string>
+    <string name="debugging">除錯</string>
+    <string name="application">應用程式</string>
+    <string name="device">裝置</string>
+    <string name="diaspora_pod__appspecific">diaspora* 豆莢</string>
+    <string name="debug_log">除錯紀錄</string>
+    <string name="debug_log_verbose">除錯紀錄(詳細版)</string>
+    <string name="app_version_with_arg">應用程式版本: %1$s</string>
+    <string name="android_version_witharg">Android 版本: %1$s</string>
+    <string name="device_name_witharg">裝置名稱: %1$s</string>
+    <string name="code_name_witharg">代號: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">豆莢設定名稱: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">豆莢網址: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">已經複製除錯紀錄到剪貼簿了</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* (蒲公英*) 是你瀏覽 diaspora* 社交網站的好朋友。它讓你的體驗增加了好用的工具列，並且支援像是 Tor 之類的代理伺服器服務。</string>
+    <string name="contribute_code">貢獻程式碼！</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* 是自由軟體開發專案，並且追隨 diaspora* 專案的信念。想要貢獻你的心力嗎？那就來吧！目前我們還只是個很小的團隊，任何形式的幫忙都會讓我們足感心！</string>
+    <string name="get_the_source">取得源碼</string>
+    <string name="translate_the_app">翻譯應用程式！</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">應用程式沒有你使用語言的版本嗎？你可以改變現狀！何不來幫忙我們翻譯呢？我們使用 crowdin 平台，好讓每個人都能夠參與應用程式的翻譯工作。</string>
+    <string name="let_me_translate">我來翻譯</string>
+    <string name="give_feedback">意見回饋！</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* 還在開發階段，所以如果你有任何建議，或是有其他的意見要回饋，請使用我們的臭蟲追蹤網站來讓我們知道！</string>
+    <string name="report_bugs">回報臭蟲</string>
+    <string name="spread_the_word">報給人知！</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">告訴你的朋友和家人有 #dandelion 這個好東西！何不部落格一下你的使用經驗呢？我們期待聽聽你的故事！</string>
+    <string name="share_the_app">分享應用程式</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">哇！看看 #dandelion 這套應用程式！ %1$s</string>
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">維護人員</string>
-    <string name="fragment_license__maintainers_text">目前這套應用程式是由以下人員開發與維護： &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="fragment_license__contributors">貢獻人</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br&gt;&lt;br&gt;感謝你們！</string>
-    <string name="fragment_license__license_button">GNU GPLv3+ 授權條款</string>
-    <string name="fragment_license__thirdparty_libs">第三方程式庫</string>
-    <string name="fragment_license__thirdparty_libs_text">我們使用了下列程式庫：</string>
-    <string name="fragment_license__misc_leafpic">我們從 LeafPic 應用程式得到一些啟發以及程式碼。去看看吧，它也是自由軟體喔！</string>
-    <string name="fragment_license__misc_leafpic_button">再多說一些</string>
+    <string name="maintainers">維護人員</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">目前這套應用程式是由以下人員開發與維護： &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">貢獻人</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;感謝你們！</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ 授權條款</string>
+    <string name="show_third_party_licenses">第三方程式庫</string>
+    <string name="the_following_libraries_are_used">我們使用了下列程式庫：</string>
+    <string name="inspiration_from_leafpic__appspecific">我們從 LeafPic 應用程式得到一些啟發以及程式碼。去看看吧，它也是自由軟體喔！</string>
+    <string name="tell_me_more">再多說一些</string>
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
@@ -139,63 +139,63 @@
     <string name="pref_desc__primary_color">工具列使用的顏色</string>
     <string name="pref_title__accent_color">強調顏色</string>
     <string name="pref_desc__accent_color">進度條使用的顏色</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED 顯示模式</string>
+    <string name="amoled_mode">AMOLED 顯示模式</string>
     <string name="pref_desc__primary_color__amoled_mode">在應用程式中使用適合 AMOLED 螢幕的黑色來顯示。改變這項設定後需要重開應用程式。另外你還需要使用色彩主題 Dark 才會有深色的版面，請到你的 diaspora* 帳號設定頁面修改。</string>
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">延伸型通知</string>
-    <string name="pref_desc__extended_notifications">將通知鈴伸展成為顯示通知類別的下拉式選單</string>
-    <string name="pref_desc__language">更改應用程式使用的語言。要重新開啟應用程式才會生效</string>
-    <string name="pref_title__language">語言</string>
-    <string name="language_system">系統設定語言</string>
+    <string name="extended_notifications">延伸型通知</string>
+    <string name="extendend_notifications_bell_description__appspecific">將通知鈴伸展成為顯示通知類別的下拉式選單</string>
+    <string name="language_change_restart_description">更改應用程式使用的語言。要重新開啟應用程式才會生效</string>
+    <string name="language">語言</string>
+    <string name="system_language">系統設定語言</string>
     <!-- Font size -->
-    <string name="pref_desc__font_size">控制網頁視圖中的文字大小</string>
-    <string name="pref_title__font_size">字型大小</string>
-    <string name="font_size_normal">一般</string>
-    <string name="font_size_large">較大</string>
-    <string name="font_size_huge">超大</string>
+    <string name="control_textsize_of_webview">控制網頁視圖中的文字大小</string>
+    <string name="font_size">字型大小</string>
+    <string name="normal">一般</string>
+    <string name="large">較大</string>
+    <string name="huge">超大</string>
     <!-- Load images -->
-    <string name="pref_title__load_images">載入圖片</string>
-    <string name="pref_desc__load_images">切換是否要載入圖片，以節省行動資料流量等等</string>
+    <string name="load_images">載入圖片</string>
+    <string name="toggle_image_loading_to_save_mobile_data">切換是否要載入圖片，以節省行動資料流量等等</string>
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">畫面旋轉</string>
-    <string name="pref_desc__screen_rotation">控制畫面自動旋轉功能</string>
-    <string name="rotation_system">系統預設</string>
-    <string name="rotation_sensor">感應\n(忽略系統設定)</string>
-    <string name="rotation_portrait">直向</string>
-    <string name="rotation_landscape">横向</string>
+    <string name="screen_rotation">畫面旋轉</string>
+    <string name="control_screen_rotation">控制畫面自動旋轉功能</string>
+    <string name="default_">系統預設</string>
+    <string name="sensor_ignore_system_settings">感應\n(忽略系統設定)</string>
+    <string name="portrait">直向</string>
+    <string name="landscape">横向</string>
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">載入 Tor 的預設值</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">載入使用 Tor (Orbot) HTTP 代理伺服器的設定</string>
-    <string name="pref_title__sub_proxy">代理伺服器</string>
-    <string name="pref_title__proxy_enabled">啓用代理伺服器</string>
-    <string name="pref_desc__http_proxy_enabled">讓 dandelion* 透用代理伺服器連網來避開防火牆。\n設定後可能需要重新啟動。某些手機上可能會沒有作用。</string>
-    <string name="pref_title__http_proxy_host">主機</string>
-    <string name="pref_title__http_proxy_port">通訊埠</string>
-    <string name="toast__proxy_disabled__restart_required">應用程式要重新啟動以停止使用代理伺服器</string>
-    <string name="toast__proxy_orbot_preset_loaded">已經載入 Orbot 的代理伺服器設定了</string>
+    <string name="load_tor_preset">載入 Tor 的預設值</string>
+    <string name="load_proxy_settins_for_tor">載入使用 Tor (Orbot) HTTP 代理伺服器的設定</string>
+    <string name="proxy">代理伺服器</string>
+    <string name="enable_proxy">啓用代理伺服器</string>
+    <string name="proxy_dandelion_traffic__appspecific">讓 dandelion* 透用代理伺服器連網來避開防火牆。\n設定後可能需要重新啟動。某些手機上可能會沒有作用。</string>
+    <string name="host">主機</string>
+    <string name="port">通訊埠</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">應用程式要重新啟動以停止使用代理伺服器</string>
+    <string name="orbot_proxy_preset_loaded">已經載入 Orbot 的代理伺服器設定了</string>
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">使用 Chrome Custom Tabs 開啟外部連結。必須要安裝 Chromium 或是 Google Chrome 才能使用這個功能。
+    <string name="open_external_links_with_chrome_custom_tabs_description">使用 Chrome Custom Tabs 開啟外部連結。必須要安裝 Chromium 或是 Google Chrome 才能使用這個功能。
 \n請留意：Chrome Custom Tabs 不會使用應用程式設定的代理伺服器！</string>
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">個人設定</string>
-    <string name="pref_desc__personal_settings">打開你的 diaspora* 帳號設定頁面</string>
-    <string name="pref_desc__manage_contacts">管理聯絡人清單</string>
-    <string name="pref_title__manage_tags">管理雜湊標籤</string>
-    <string name="pref_desc__manage_tags">停止追蹤目前正在追蹤中的雜湊標籤</string>
-    <string name="pref_title__change_account">更換帳號</string>
-    <string name="pref_desc__change_account">刪除本機連線 session 資料，並改用另外一個 diaspora* 豆莢或帳號</string>
-    <string name="pref_warning__change_account">將要清除所有的 cookie 和 session 資料。確定真的要切換帳號嗎？</string>
-    <string name="pref_title__clear_cache">清除快取資料</string>
-    <string name="pref_desc__clear_cache">清除網頁視圖的快取資料</string>
-    <string name="pref_desc__intellihide_toolbars">當捲動畫面時，自動隱藏上下兩邊的工具列</string>
-    <string name="pref_title__intellihide_toolbars">自動隱藏工具列</string>
-    <string name="pref_title__append_shared_via_app">分享時附加應用程式標記</string>
-    <string name="pref_desc__append_shared_via_app">在分享的文字之後附加以下應用程式標記: [via #dandelion]</string>
+    <string name="personal_settings">個人設定</string>
+    <string name="open_diaspora_account_settings__appspecific">打開你的 diaspora* 帳號設定頁面</string>
+    <string name="manage_your_contact_list">管理聯絡人清單</string>
+    <string name="manage_hashtags">管理雜湊標籤</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">停止追蹤目前正在追蹤中的雜湊標籤</string>
+    <string name="change_account">更換帳號</string>
+    <string name="loug_warning_description__appspecific">刪除本機連線 session 資料，並改用另外一個 diaspora* 豆莢或帳號</string>
+    <string name="logout_warning_description">將要清除所有的 cookie 和 session 資料。確定真的要切換帳號嗎？</string>
+    <string name="clear_cache">清除快取資料</string>
+    <string name="clear_webview_cache">清除網頁視圖的快取資料</string>
+    <string name="intellihide_toolbars__appspecific">當捲動畫面時，自動隱藏上下兩邊的工具列</string>
+    <string name="intellihide_toolbars">自動隱藏工具列</string>
+    <string name="append_shared_by_notice">分享時附加應用程式標記</string>
+    <string name="append_shared_by_notice__appspecific">在分享的文字之後附加以下應用程式標記: [via #dandelion]</string>
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">其他</string>
-    <string name="pref_title__wipe_settings">完全重置</string>
-    <string name="pref_desc__wipe_settings">將本機上此應用程式的設定全部刪掉，並將所有帳號都登出</string>
-    <string name="dialog_content__wipe_settings">將要重設此應用程式的所有設定為預設值，並登出你在所有豆莢的帳號。不過不會變動已經下載了的圖片。確定要繼續嗎？</string>
-    <string name="pref_desc__adblock_enable">開啟基本的廣告封鎖器。廣告可能會出現在嵌入式視圖之類的地方。</string>
-    <string name="pref_title__adblock_enable">廣告封鎖</string>
+    <string name="miscellaneous">其他</string>
+    <string name="full_reset">完全重置</string>
+    <string name="wipe_settings_and_logout">將本機上此應用程式的設定全部刪掉，並將所有帳號都登出</string>
+    <string name="wipe_settings_warning__appspecific">將要重設此應用程式的所有設定為預設值，並登出你在所有豆莢的帳號。不過不會變動已經下載了的圖片。確定要繼續嗎？</string>
+    <string name="enable_basic_adblocker_description">開啟基本的廣告封鎖器。廣告可能會出現在嵌入式視圖之類的地方。</string>
+    <string name="block_advertisments">廣告封鎖</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4decbb45..5b082257 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="pref_entries__font_size" translatable="false">
-        <item translatable="false">@string/font_size_normal</item>
-        <item translatable="false">@string/font_size_large</item>
-        <item translatable="false">@string/font_size_huge</item>
+        <item translatable="false">@string/normal</item>
+        <item translatable="false">@string/large</item>
+        <item translatable="false">@string/huge</item>
     </array>
     <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
     <array name="pref_entries_values__font_size" translatable="false">
@@ -20,9 +20,9 @@
         <item translatable="false">@string/rotation_val_landscape</item>
     </array>
     <array name="pref_entries__screen_rotation" translatable="false">
-        <item translatable="false">@string/rotation_system</item>
-        <item translatable="false">@string/rotation_sensor</item>
-        <item translatable="false">@string/rotation_portrait</item>
-        <item translatable="false">@string/rotation_landscape</item>
+        <item translatable="false">@string/default_</item>
+        <item translatable="false">@string/sensor_ignore_system_settings</item>
+        <item translatable="false">@string/portrait</item>
+        <item translatable="false">@string/landscape</item>
     </array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
index 997959cc..b63ea92c 100644
--- a/app/src/main/res/values/strings-not_translatable.xml
+++ b/app/src/main/res/values/strings-not_translatable.xml
@@ -18,7 +18,7 @@
     <string name="http" translatable="false">http</string>
     <string name="https" translatable="false">https</string>
 
-    <string name="licenses" translatable="false">@string/about_activity__title_about_license</string>
+    <string name="licenses" translatable="false">@string/license</string>
     <string name="copyright_license_text_official" translatable="false">
         Copyright © 2015-2018
         \nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -26,7 +26,7 @@
         \nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
     </string>
     <string name="fragment_license__license_gpl_link" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
-    <string name="fragment_license__misc" translatable="false">@string/pref_title__sub_miscelaneous</string>
+    <string name="fragment_license__misc" translatable="false">@string/miscellaneous</string>
     <string name="fragment_licesen__misc_leafpic_link" translatable="false">https://github.com/HoraApps/LeafPic</string>
     <string name="fragment_about__fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android</string>
     <string name="fragment_about__about" translatable="false">@string/app_name</string>
@@ -65,11 +65,11 @@
     <string name="pref_title__chrome_custom_tabs_enabled" translatable="false">Chrome Custom Tabs</string>
     <string name="pref_key__proxy_was_enabled" translatable="false">wasProxyEnabled</string>
     <string name="pref_title__manage_contacts" translatable="false">@string/contacts</string>
-    <string name="pref_title__sub_logging" translatable="false">@string/about_activity__title_debug_info</string>
-    <string name="pref_desc__sub_logging" translatable="false">@string/fragment_debug__section_log</string>
-    <string name="pref_title__logging_enabled" translatable="false">@string/fragment_debug__section_log</string>
-    <string name="pref_title__logging_spam_enabled" translatable="false">@string/fragment_debug__section_log_spam</string>
-    <string name="pref_desc__sub_proxy" translatable="false">@string/pref_desc__http_proxy_enabled</string>
+    <string name="pref_title__sub_logging" translatable="false">@string/debugging</string>
+    <string name="pref_desc__sub_logging" translatable="false">@string/debug_log</string>
+    <string name="pref_title__logging_enabled" translatable="false">@string/debug_log</string>
+    <string name="pref_title__logging_spam_enabled" translatable="false">@string/debug_log_verbose</string>
+    <string name="pref_desc__sub_proxy" translatable="false">@string/proxy_dandelion_traffic__appspecific</string>
     <string name="pref_cat__more" translatable="false">@string/nav_menu_more</string>
 
     <!--
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f85f2d9a..1fb98512 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,131 +127,131 @@
     <string name="pref_desc__primary_color">Color of the toolbars</string>
     <string name="pref_title__accent_color">Accent Color</string>
     <string name="pref_desc__accent_color">Color of the progressbar</string>
-    <string name="pref_title__primary_color__amoled_mode">AMOLED Mode</string>
+    <string name="amoled_mode">AMOLED Mode</string>
     <string name="pref_desc__primary_color__amoled_mode">Override colors with AMOLED display friendly black at many parts of the app. You need to restart to toggle this setting. To browse diaspora* in dark you also need to activate the Dark theme, which can be found in your personal diaspora* account settings.</string>
 
     <!-- Notifications dropdown -->
-    <string name="pref_title__extended_notifications">Extended Notifications</string>
-    <string name="pref_desc__extended_notifications">Extend the notifications bell with a dropdown menu that shows notification categories</string>
+    <string name="extended_notifications">Extended Notifications</string>
+    <string name="extendend_notifications_bell_description__appspecific">Extend the notifications bell with a dropdown menu that shows notification categories</string>
 
-    <string name="pref_desc__language">Change language of this app. Restart app for changes to take effect</string>
-    <string name="pref_title__language">Language</string>
-    <string name="language_system">System language</string>
+    <string name="language_change_restart_description">Change language of this app. Restart app for changes to take effect</string>
+    <string name="language">Language</string>
+    <string name="system_language">System language</string>
 
     <!-- Font size -->
-    <string name="pref_desc__font_size">Control text size of the WebView</string>
-    <string name="pref_title__font_size">Font size</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Large</string>
-    <string name="font_size_huge">Huge</string>
+    <string name="control_textsize_of_webview">Control text size of the WebView</string>
+    <string name="font_size">Font size</string>
+    <string name="normal">Normal</string>
+    <string name="large">Large</string>
+    <string name="huge">Huge</string>
 
     <!-- Load images -->
-    <string name="pref_title__load_images">Load images</string>
-    <string name="pref_desc__load_images">Toggle image loading to eg. save mobile data</string>
+    <string name="load_images">Load images</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Toggle image loading to eg. save mobile data</string>
 
     <!-- Screen rotation -->
-    <string name="pref_title__screen_rotation">Screen rotation</string>
-    <string name="pref_desc__screen_rotation">Control automatic screen rotation</string>
-    <string name="rotation_system">Default</string>
-    <string name="rotation_sensor">Sensor\n(ignore system settings)</string>
-    <string name="rotation_portrait">Portrait</string>
-    <string name="rotation_landscape">Landscape</string>
+    <string name="screen_rotation">Screen rotation</string>
+    <string name="control_screen_rotation">Control automatic screen rotation</string>
+    <string name="default_">Default</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignore system settings)</string>
+    <string name="portrait">Portrait</string>
+    <string name="landscape">Landscape</string>
 
     <!-- Proxy -->
-    <string name="pref_title__http_proxy_load_tor_preset">Load Tor Preset</string>
-    <string name="pref_desc__http_proxy_load_tor_preset">Load proxy settings for Tor (Orbot) HTTP Proxy</string>
-    <string name="pref_title__sub_proxy">Proxy</string>
-    <string name="pref_title__proxy_enabled">Enable Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy dandelion*\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.</string>
-    <string name="pref_title__http_proxy_host">Host</string>
-    <string name="pref_title__http_proxy_port">Port</string>
-    <string name="toast__proxy_disabled__restart_required">App needs to restart to disable proxy usage</string>
-    <string name="toast__proxy_orbot_preset_loaded">Orbot proxy preset loaded</string>
+    <string name="load_tor_preset">Load Tor Preset</string>
+    <string name="load_proxy_settins_for_tor">Load proxy settings for Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Enable Proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy dandelion*\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.</string>
+    <string name="host">Host</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">App needs to restart to disable proxy usage</string>
+    <string name="orbot_proxy_preset_loaded">Orbot proxy preset loaded</string>
 
 
     <!-- Chrome custom tabs -->
-    <string name="pref_desc__chrome_custom_tabs_enabled">Open external links with Chrome Custom Tabs. Chromium, Firefox or Google Chrome needs to be installed in order to use this feature. \nIMPORTANT NOTE: Chrome Custom Tabs do not use configured proxy servers!</string>
+    <string name="open_external_links_with_chrome_custom_tabs_description">Open external links with Chrome Custom Tabs. Chromium, Firefox or Google Chrome needs to be installed in order to use this feature. \nIMPORTANT NOTE: Chrome Custom Tabs do not use configured proxy servers!</string>
 
     <!-- Diaspora Settings -->
-    <string name="pref_title__personal_settings">Personal settings</string>
-    <string name="pref_desc__personal_settings">Open your diaspora* account settings</string>
-    <string name="pref_desc__manage_contacts">Manage your contact list</string>
+    <string name="personal_settings">Personal settings</string>
+    <string name="open_diaspora_account_settings__appspecific">Open your diaspora* account settings</string>
+    <string name="manage_your_contact_list">Manage your contact list</string>
 
-    <string name="pref_title__manage_tags">Manage Hashtags</string>
-    <string name="pref_desc__manage_tags">Unfollow already followed hashtags</string>
+    <string name="manage_hashtags">Manage Hashtags</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Unfollow already followed hashtags</string>
 
-    <string name="pref_title__change_account">Change Account</string>
-    <string name="pref_desc__change_account">Erase local session data and switch to another diaspora* pod/account</string>
-    <string name="pref_warning__change_account">This will erase all cookies and session data. Do you really want to change your account?</string>
+    <string name="change_account">Change Account</string>
+    <string name="loug_warning_description__appspecific">Erase local session data and switch to another diaspora* pod/account</string>
+    <string name="logout_warning_description">This will erase all cookies and session data. Do you really want to change your account?</string>
 
-    <string name="pref_title__clear_cache">Clear cache</string>
-    <string name="pref_desc__clear_cache">Clear WebView cache</string>
+    <string name="clear_cache">Clear cache</string>
+    <string name="clear_webview_cache">Clear WebView cache</string>
 
 
-    <string name="pref_desc__intellihide_toolbars">Automatically hide top and bottom toolbars while scrolling</string>
-    <string name="pref_title__intellihide_toolbars">Intellihide Toolbars</string>
+    <string name="intellihide_toolbars__appspecific">Automatically hide top and bottom toolbars while scrolling</string>
+    <string name="intellihide_toolbars">Intellihide Toolbars</string>
 
-    <string name="pref_title__append_shared_via_app">Append shared-by-notice</string>
-    <string name="pref_desc__append_shared_via_app">Append a reference to this app to shared texts: [via #dandelion]</string>
+    <string name="append_shared_by_notice">Append shared-by-notice</string>
+    <string name="append_shared_by_notice__appspecific">Append a reference to this app to shared texts: [via #dandelion]</string>
 
     <!-- More -->
-    <string name="pref_title__sub_miscelaneous">Miscellaneous</string>
+    <string name="miscellaneous">Miscellaneous</string>
 
-    <string name="pref_title__wipe_settings">Full Reset</string>
-    <string name="pref_desc__wipe_settings">Locally wipe all settings related to the app and log out from all accounts</string>
+    <string name="full_reset">Full Reset</string>
+    <string name="wipe_settings_and_logout">Locally wipe all settings related to the app and log out from all accounts</string>
 
-    <string name="dialog_content__wipe_settings">This will reset all changed settings of the app to their default values and log you out from all pods. Your downloaded images will stay untouched. Are you sure you want to proceed?</string>
+    <string name="wipe_settings_warning__appspecific">This will reset all changed settings of the app to their default values and log you out from all pods. Your downloaded images will stay untouched. Are you sure you want to proceed?</string>
 
-    <string name="pref_desc__adblock_enable">Enable basic AdBlocker. Ads may be included e.g. in embedded views</string>
-    <string name="pref_title__adblock_enable">Block advertisements</string>
+    <string name="enable_basic_adblocker_description">Enable basic AdBlocker. Ads may be included e.g. in embedded views</string>
+    <string name="block_advertisments">Block advertisements</string>
 
 
-    <string name="about_activity__title_about_app">About</string>
-    <string name="about_activity__title_about_license">License</string>
-    <string name="about_activity__title_debug_info">Debugging</string>
-    <string name="fragment_debug__section_app">Application</string>
-    <string name="fragment_debug__section_device">Device</string>
-    <string name="fragment_debug__section_pod">diaspora* Pod</string>
-    <string name="fragment_debug__section_log">Debug Log</string>
-    <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
-    <string name="fragment_debug__app_version">App Version: %1$s</string>
-    <string name="fragment_debug__android_version">Android Version: %1$s</string>
-    <string name="fragment_debug__device_name">Device Name: %1$s</string>
-    <string name="fragment_debug__app_codename">Codename: %1$s</string>
-    <string name="fragment_debug__pod_profile_name">Pod Profile Name: %1$s</string>
-    <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
-    <string name="fragment_debug__toast_log_copied">Debug log copied to clipboard</string>
+    <string name="about">About</string>
+    <string name="license">License</string>
+    <string name="debugging">Debugging</string>
+    <string name="application">Application</string>
+    <string name="device">Device</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Debug Log</string>
+    <string name="debug_log_verbose">Debug Log (Verbose)</string>
+    <string name="app_version_with_arg">App Version: %1$s</string>
+    <string name="android_version_witharg">Android Version: %1$s</string>
+    <string name="device_name_witharg">Device Name: %1$s</string>
+    <string name="code_name_witharg">Codename: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profile Name: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Domain: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Debug log copied to clipboard</string>
 
-    <string name="fragment_about__about_text">dandelion* is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
 
-    <string name="fragment_about__contribute">Contribute Code!</string>
-    <string name="fragment_about__contribute_text">dandelion* is developed free as in Freedom and follows the ideas of the diaspora* project. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
-    <string name="fragment_about__contribute_button">Get the source</string>
+    <string name="contribute_code">Contribute Code!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* is developed free as in Freedom and follows the ideas of the diaspora* project. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
+    <string name="get_the_source">Get the source</string>
 
-    <string name="fragment_about__translate">Translate the App!</string>
-    <string name="fragment_about__translate_text">The app is not available in your language? You can change that! Why don\'t you help us by translating it? We use the crowdin platform to enable anyone to translate the app.</string>
-    <string name="fragment_about__translate_button">Let me translate</string>
+    <string name="translate_the_app">Translate the App!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">The app is not available in your language? You can change that! Why don\'t you help us by translating it? We use Stringlate to enable anyone to translate the app.</string>
+    <string name="let_me_translate">Let me translate</string>
 
-    <string name="fragment_about__feedback">Give Feedback!</string>
-    <string name="fragment_about__feedback_text">dandelion* is still in development, so if you have suggestions or any kind of feedback, please use our bug tracker to let us know!</string>
-    <string name="fragment_about__feedback_button">Report Bugs</string>
+    <string name="give_feedback">Give Feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* is still in development, so if you have suggestions or any kind of feedback, please use our bug tracker to let us know!</string>
+    <string name="report_bugs">Report Bugs</string>
 
-    <string name="fragment_about__spread_the_word">Spread the word!</string>
-    <string name="fragment_about__spread_the_word_text">Tell your friends and family about diaspora* and #dandelion! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
-    <string name="fragment_about__spread_the_word_button">Share the app</string>
-    <string name="fragment_about__spread_the_word_share_text">Hey! Check out #dandelion! %1$s</string>
+    <string name="spread_the_word">Spread the word!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Tell your friends and family about diaspora* and #dandelion! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
+    <string name="share_the_app">Share the app</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Check out #dandelion! %1$s</string>
 
 
     <!-- License & help (large amount of text) -->
-    <string name="fragment_license__maintainers">Maintainers</string>
-    <string name="fragment_license__maintainers_text">This app is currently being developed and maintained by &lt;br>&lt;br>%1$s</string>
-    <string name="fragment_license__contributors">Contributors</string>
-    <string name="fragment_license__contributors_thank_you">%1$s&lt;br>&lt;br>Thank you!</string>
+    <string name="maintainers">Maintainers</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">This app is currently being developed and maintained by &lt;br>&lt;br>%1$s</string>
+    <string name="contributors">Contributors</string>
+    <string name="thank_you_witharg">%1$s&lt;br>&lt;br>Thank you!</string>
 
-    <string name="fragment_license__license_button">GNU GPLv3+ License</string>
-    <string name="fragment_license__thirdparty_libs">Third-Party Libraries</string>
-    <string name="fragment_license__thirdparty_libs_text">The following libraries are used:</string>
-    <string name="fragment_license__misc_leafpic">We took some inspiration and code from LeafPic. Go check it out, it\'s free software as well!</string>
-    <string name="fragment_license__misc_leafpic_button">Tell me more</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ License</string>
+    <string name="show_third_party_licenses">Third-Party Libraries</string>
+    <string name="the_following_libraries_are_used">The following libraries are used:</string>
+    <string name="inspiration_from_leafpic__appspecific">We took some inspiration and code from LeafPic. Go check it out, it\'s free software as well!</string>
+    <string name="tell_me_more">Tell me more</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml
index db8ba451..bd04c9f6 100644
--- a/app/src/main/res/xml/preferences__master.xml
+++ b/app/src/main/res/xml/preferences__master.xml
@@ -20,17 +20,17 @@
         <net.gsantner.opoc.preference.nonsupport.LanguagePreference
             android:icon="@drawable/ic_language_black_48px"
             android:key="@string/pref_key__language"
-            android:summary="@string/pref_desc__language"
-            android:title="@string/pref_title__language"/>
+            android:summary="@string/language_change_restart_description"
+            android:title="@string/language"/>
 
         <ListPreference
-            android:dialogTitle="@string/pref_title__font_size"
+            android:dialogTitle="@string/font_size"
             android:entries="@array/pref_entries__font_size"
             android:entryValues="@array/pref_entries_values__font_size"
             android:icon="@drawable/ic_format_size_black_24px"
             android:key="@string/pref_key__font_size"
-            android:summary="@string/pref_desc__font_size"
-            android:title="@string/pref_title__font_size"/>
+            android:summary="@string/control_textsize_of_webview"
+            android:title="@string/font_size"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
@@ -42,8 +42,8 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_zoom_out_map_black_24px"
             android:key="@string/pref_key__intellihide_toolbars"
-            android:summary="@string/pref_desc__intellihide_toolbars"
-            android:title="@string/pref_title__intellihide_toolbars"/>
+            android:summary="@string/intellihide_toolbars__appspecific"
+            android:title="@string/intellihide_toolbars"/>
 
         <CheckBoxPreference
             android:icon="@drawable/ic_visibility_black_24dp"
@@ -56,21 +56,21 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_notifications_black_24px"
             android:key="@string/pref_key__extended_notifications"
-            android:summary="@string/pref_desc__extended_notifications"
-            android:title="@string/pref_title__extended_notifications"/>
+            android:summary="@string/extendend_notifications_bell_description__appspecific"
+            android:title="@string/extended_notifications"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_thumb_up_black_24px"
             android:key="@string/pref_key__append_shared_via_app"
-            android:summary="@string/pref_desc__append_shared_via_app"
-            android:title="@string/pref_title__append_shared_via_app"/>
+            android:summary="@string/append_shared_by_notice__appspecific"
+            android:title="@string/append_shared_by_notice"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_open_in_new_black_24px"
             android:key="@string/pref_key__chrome_custom_tabs_enabled"
-            android:summary="@string/pref_desc__chrome_custom_tabs_enabled"
+            android:summary="@string/open_external_links_with_chrome_custom_tabs_description"
             android:title="@string/pref_title__chrome_custom_tabs_enabled"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
@@ -93,8 +93,8 @@
             android:entryValues="@array/pref_entries_values__screen_rotation"
             android:icon="@drawable/ic_screen_rotation_black_24px"
             android:key="@string/pref_key__screen_rotation"
-            android:summary="@string/pref_desc__screen_rotation"
-            android:title="@string/pref_title__screen_rotation"/>
+            android:summary="@string/control_screen_rotation"
+            android:title="@string/screen_rotation"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
@@ -105,26 +105,26 @@
         <Preference
             android:icon="@drawable/ic_person_black_24px"
             android:key="@string/pref_key__personal_settings"
-            android:summary="@string/pref_desc__personal_settings"
-            android:title="@string/pref_title__personal_settings"/>
+            android:summary="@string/open_diaspora_account_settings__appspecific"
+            android:title="@string/personal_settings"/>
 
         <Preference
             android:icon="@drawable/ic_people_black_24px"
             android:key="@string/pref_key__manage_contacts"
-            android:summary="@string/pref_desc__manage_contacts"
+            android:summary="@string/manage_your_contact_list"
             android:title="@string/pref_title__manage_contacts"/>
 
         <Preference
             android:icon="@drawable/ic_format_list_bulleted_black_24px"
             android:key="@string/pref_key__manage_tags"
-            android:summary="@string/pref_desc__manage_tags"
-            android:title="@string/pref_title__manage_tags"/>
+            android:summary="@string/unfollow_already_followed_hashtags__appspecific"
+            android:title="@string/manage_hashtags"/>
 
         <Preference
             android:icon="@drawable/ic_arrow_back_black_24px"
             android:key="@string/pref_key__change_account"
-            android:summary="@string/pref_desc__change_account"
-            android:title="@string/pref_title__change_account"/>
+            android:summary="@string/loug_warning_description__appspecific"
+            android:title="@string/change_account"/>
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
     <!-- Networking -->
@@ -135,27 +135,27 @@
             android:defaultValue="true"
             android:icon="@drawable/ic_file_download_black_24px"
             android:key="@string/pref_key__load_images"
-            android:summary="@string/pref_desc__load_images"
-            android:title="@string/pref_title__load_images"/>
+            android:summary="@string/toggle_image_loading_to_save_mobile_data"
+            android:title="@string/load_images"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_file_download_black_24px"
             android:key="@string/pref_key__adblock_enable"
-            android:summary="@string/pref_desc__adblock_enable"
-            android:title="@string/pref_title__adblock_enable"/>
+            android:summary="@string/enable_basic_adblocker_description"
+            android:title="@string/block_advertisments"/>
 
         <Preference
             android:icon="@drawable/ic_clear_black_24px"
             android:key="@string/pref_key__clear_cache"
-            android:summary="@string/pref_desc__clear_cache"
-            android:title="@string/pref_title__clear_cache"/>
+            android:summary="@string/clear_webview_cache"
+            android:title="@string/clear_cache"/>
 
         <Preference
             android:icon="@drawable/ic_vpn_lock_black_24px"
             android:key="@string/pref_key__cat_proxy"
             android:summary="@string/pref_desc__sub_proxy"
-            android:title="@string/pref_title__sub_proxy"/>
+            android:title="@string/proxy"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
diff --git a/app/src/main/res/xml/preferences__sub_debugging.xml b/app/src/main/res/xml/preferences__sub_debugging.xml
index 8115f012..3715729a 100644
--- a/app/src/main/res/xml/preferences__sub_debugging.xml
+++ b/app/src/main/res/xml/preferences__sub_debugging.xml
@@ -20,12 +20,12 @@
 
     <!-- Miscellaneous -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-        android:title="@string/pref_title__sub_miscelaneous">
+        android:title="@string/miscellaneous">
 
         <Preference
             android:key="@string/pref_key__wipe_settings"
-            android:title="@string/pref_title__wipe_settings"
-            android:summary="@string/pref_desc__wipe_settings" />
+            android:title="@string/full_reset"
+            android:summary="@string/wipe_settings_and_logout" />
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences__sub_proxy.xml b/app/src/main/res/xml/preferences__sub_proxy.xml
index ab7b01da..0e85fbe4 100644
--- a/app/src/main/res/xml/preferences__sub_proxy.xml
+++ b/app/src/main/res/xml/preferences__sub_proxy.xml
@@ -6,26 +6,26 @@
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:key="@string/pref_key__http_proxy_enabled"
-            android:summary="@string/pref_desc__http_proxy_enabled"
-            android:title="@string/pref_title__proxy_enabled"/>
+            android:summary="@string/proxy_dandelion_traffic__appspecific"
+            android:title="@string/enable_proxy"/>
 
         <EditTextPreference
             android:dependency="@string/pref_key__http_proxy_enabled"
             android:inputType="textNoSuggestions"
             android:key="@string/pref_key__http_proxy_host"
-            android:title="@string/pref_title__http_proxy_host"/>
+            android:title="@string/host"/>
         <EditTextPreference
             android:dependency="@string/pref_key__http_proxy_enabled"
             android:inputType="number"
             android:key="@string/pref_key__http_proxy_port"
-            android:title="@string/pref_title__http_proxy_port"/>
+            android:title="@string/port"/>
 
         <Preference
             android:icon="@drawable/tor_onion"
             android:dependency="@string/pref_key__http_proxy_enabled"
             android:key="@string/pref_key__http_proxy_load_tor_preset"
-            android:summary="@string/pref_desc__http_proxy_load_tor_preset"
-            android:title="@string/pref_title__http_proxy_load_tor_preset"/>
+            android:summary="@string/load_proxy_settins_for_tor"
+            android:title="@string/load_tor_preset"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences__sub_themes.xml b/app/src/main/res/xml/preferences__sub_themes.xml
index 318a68c8..bfcc6685 100644
--- a/app/src/main/res/xml/preferences__sub_themes.xml
+++ b/app/src/main/res/xml/preferences__sub_themes.xml
@@ -19,7 +19,7 @@
             android:defaultValue="false"
             android:key="@string/pref_key__primary_color__amoled_mode"
             android:summary="@string/pref_desc__primary_color__amoled_mode"
-            android:title="@string/pref_title__primary_color__amoled_mode"
+            android:title="@string/amoled_mode"
             android:icon="@drawable/ic_color_lens_black_24px" />
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file