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 a11f0027..0a68ee00 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
@@ -214,7 +214,7 @@ public class AboutActivity extends ThemedActivity
                     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.hey_checkout_dandelion_tag__appspecific, getString(R.string.fragment_about__fdroid_link)));
-                    startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
+                    startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.share_dotdotdot)));
                     break;
             }
         }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
index 77bd31fd..b583fffe 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
@@ -152,7 +152,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                 sharingIntent.setType("text/plain");
                 sharingIntent.putExtra(Intent.EXTRA_SUBJECT, webView.getTitle());
                 sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
-                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
+                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.share_dotdotdot)));
                 return true;
             }
 
@@ -165,7 +165,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
 
             case R.id.action_share_link_to_clipboard: {
                 shu.setClipboard(webView.getUrl());
-                Toast.makeText(getContext(), R.string.share__toast_link_address_copied, Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), R.string.link_adress_copied, Toast.LENGTH_SHORT).show();
                 return true;
             }
 
@@ -180,13 +180,13 @@ public class DiasporaStreamFragment extends BrowserFragment {
             }
 
             case R.id.action_take_screenshot: {
-                if (permc.doIfExtStoragePermissionGranted(getString(R.string.permissions_screenshot))) {
+                if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
                     File fileSaveDirectory = appSettings.getAppSaveDirectory();
                     if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
                         Bitmap bmp = ShareUtil.getBitmapFromWebView(webView);
                         String filename = "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()) + ".jpg";
                         _cu.writeImageToFileJpeg(new File(fileSaveDirectory, filename), bmp);
-                        Snackbar.make(webView, getString(R.string.share__toast_screenshot)
+                        Snackbar.make(webView, getString(R.string.saving_screenshot_as)
                                 + " " + filename, Snackbar.LENGTH_LONG).show();
                     }
                 }
@@ -194,7 +194,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
             }
 
             case R.id.action_share_screenshot: {
-                if (permc.doIfExtStoragePermissionGranted(getString(R.string.permissions_screenshot))) {
+                if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
                     shu.shareImage(ShareUtil.getBitmapFromWebView(webView), Bitmap.CompressFormat.JPEG);
                 }
                 return true;
@@ -293,7 +293,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                 if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
                     if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
                         new ThemedAlertDialogBuilder(getContext(), appSettings)
-                                .setMessage(R.string.permissions_image)
+                                .setMessage(R.string.image_permission_description__appspecific)
                                 .setNegativeButton(android.R.string.no, null)
                                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                                     @Override
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 628b404c..9eb6045a 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
@@ -264,7 +264,7 @@ public class MainActivity extends ThemedActivity
 
         //Setup snackbar
         snackbarExitApp = Snackbar
-                .make(fragmentContainer, R.string.confirm_exit, Snackbar.LENGTH_LONG)
+                .make(fragmentContainer, R.string.do_you_want_to_exit, Snackbar.LENGTH_LONG)
                 .setAction(android.R.string.yes, new View.OnClickListener() {
                     public void onClick(View view) {
                         finish();
@@ -273,13 +273,13 @@ public class MainActivity extends ThemedActivity
                 });
         snackbarLastVisitedTimestampInStream =
                 Snackbar.make(fragmentContainer,
-                        R.string.jump_to_last_visited_timestamp_in_stream, Snackbar.LENGTH_LONG)
+                        R.string.jump_to_last_visited_page_in_stream__appspecific, Snackbar.LENGTH_LONG)
                         .setAction(android.R.string.yes, new View.OnClickListener() {
                             public void onClick(View view) {
                                 openDiasporaUrl(urls.getStreamWithTimestampUrl(diasporaUserProfile.getLastVisitedPositionInStream()));
                             }
                         });
-        snackbarNoInternet = Snackbar.make(fragmentContainer, R.string.no_internet, Snackbar.LENGTH_LONG);
+        snackbarNoInternet = Snackbar.make(fragmentContainer, R.string.sorry_need_to_be_connected_to_internet, Snackbar.LENGTH_LONG);
 
         // Load app settings
         setupNavigationSlider();
@@ -388,7 +388,7 @@ public class MainActivity extends ThemedActivity
      */
     private void setupNavigationSlider() {
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, navDrawer, toolbarTop, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+                this, navDrawer, toolbarTop, R.string.open_navdrawer, R.string.close_navdrawer);
         navDrawer.addDrawerListener(toggle);
         toggle.syncState();
 
@@ -856,7 +856,7 @@ public class MainActivity extends ThemedActivity
                         public void onClick(DialogInterface dialogInterface, int which) {
                             String query = input.getText().toString().trim().replaceAll((which == DialogInterface.BUTTON_NEGATIVE ? "\\*" : "\\#"), "");
                             if (query.equals("")) {
-                                Snackbar.make(fragmentContainer, R.string.search_alert_bypeople_validate_needsomedata, Snackbar.LENGTH_LONG).show();
+                                Snackbar.make(fragmentContainer, R.string.please_add_a_name, Snackbar.LENGTH_LONG).show();
                             } else {
                                 openDiasporaUrl(which == DialogInterface.BUTTON_NEGATIVE ? urls.getSearchPeopleUrl(query) : urls.getSearchTagsUrl(query));
                             }
@@ -868,8 +868,8 @@ public class MainActivity extends ThemedActivity
                     final AlertDialog dialog = new ThemedAlertDialogBuilder(this, _appSettings)
                             .setView(layout).setTitle(R.string.search_alert_title)
                             .setCancelable(true)
-                            .setPositiveButton(R.string.search_alert_tag, clickListener)
-                            .setNegativeButton(R.string.search_alert_people, clickListener)
+                            .setPositiveButton(R.string.by_tags, clickListener)
+                            .setNegativeButton(R.string.by_people, clickListener)
                             .create();
 
                     input.setOnEditorActionListener(new TextView.OnEditorActionListener() {
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java
index 4e310ae6..24da3d47 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java
@@ -161,7 +161,7 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
                     } catch (JSONException ignored) {
                     }
                 } else {
-                    Snackbar.make(listViewPod, R.string.podlist_error, Snackbar.LENGTH_SHORT).show();
+                    Snackbar.make(listViewPod, R.string.could_not_retrieve_list_of_pods__appspecific, Snackbar.LENGTH_SHORT).show();
                 }
             }
         }
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 6593c3b9..acda2b0d 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
@@ -310,7 +310,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
             final LineColorPicker base = dialogLayout.findViewById(R.id.color_picker_dialog__base_picker);
             final LineColorPicker shade = dialogLayout.findViewById(R.id.color_picker_dialog__shade_picker);
 
-            title.setText(type == 1 ? R.string.pref_title__primary_color : R.string.pref_title__accent_color);
+            title.setText(type == 1 ? R.string.primary_colors : R.string.accent_color);
             title.setTextColor(getResources().getColor(R.color.white));
             final int[] current = (type == 1 ? appSettings.getPrimaryColorSettings() : appSettings.getAccentColorSettings());
             base.setColors((type == 1 ? ColorPalette.getBaseColors(context) : ColorPalette.getAccentColors(context)));
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
index 817b8e10..09ecb767 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
@@ -52,7 +52,7 @@ public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils {
     public boolean showInfoIfUserNotConnectedToInternet(View anchor) {
         boolean isOnline = WebHelper.isOnline(_context);
         if (!isOnline) {
-            showSnackBar(R.string.no_internet, true);
+            showSnackBar(R.string.sorry_need_to_be_connected_to_internet, true);
         }
         return !isOnline;
     }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
index 6cb85c8f..277b2caa 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
@@ -85,7 +85,7 @@ public class ContextMenuWebView extends NestedWebView {
                 switch (item.getItemId()) {
                     //Save image to external memory
                     case ID_SAVE_IMAGE: {
-                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.permissions_image))) {
+                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.image_permission_description__appspecific))) {
                             File fileSaveDirectory = appSettings.getAppSaveDirectory();
                             if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
                                 String filename = "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()) + url.substring(url.lastIndexOf("."));
@@ -95,7 +95,7 @@ public class ContextMenuWebView extends NestedWebView {
                                 ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);*/
                                 new DownloadTask(new File(fileSaveDirectory, filename), (ok, dlfile) -> {
                                     if (ok) {
-                                        Toast.makeText(context, context.getText(R.string.share__toast_saved_image_to_location) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
+                                        Toast.makeText(context, context.getText(R.string.saving_image_to) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
                                     }
                                 }).execute(url);
                             }
@@ -104,13 +104,13 @@ public class ContextMenuWebView extends NestedWebView {
                     }
 
                     case ID_SHARE_IMAGE: {
-                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.permissions_image))) {
+                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.image_permission_description__appspecific))) {
                             File fileSaveDirectory = appSettings.getAppSaveDirectory();
                             if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
                                 String filename = ".dandelion-shared" + url.substring(url.lastIndexOf("."));
                                 new DownloadTask(new File(fileSaveDirectory, filename), (ok, dlfile) -> {
                                     if (ok) {
-                                        Toast.makeText(context, context.getText(R.string.share__toast_saved_image_to_location) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
+                                        Toast.makeText(context, context.getText(R.string.saving_image_to) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
                                         shu.shareStream(dlfile, "image/" + dlfile.getAbsolutePath().lastIndexOf(".") + 1);
                                     }
                                 }).execute(url);
@@ -132,7 +132,7 @@ public class ContextMenuWebView extends NestedWebView {
                         if (url != null) {
                             ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
                             clipboard.setPrimaryClip(ClipData.newPlainText("text", url));
-                            Toast.makeText(context, R.string.share__toast_link_address_copied, Toast.LENGTH_SHORT).show();
+                            Toast.makeText(context, R.string.link_adress_copied, Toast.LENGTH_SHORT).show();
                         }
                         break;
 
@@ -144,7 +144,7 @@ public class ContextMenuWebView extends NestedWebView {
                             sendIntent.putExtra(Intent.EXTRA_TEXT, url);
                             sendIntent.setType("text/plain");
                             context.startActivity(Intent.createChooser(sendIntent, getResources()
-                                    .getText(R.string.context_menu_share_link)));
+                                    .getText(R.string.share_link_address)));
                         }
                         break;
                 }
@@ -157,16 +157,16 @@ public class ContextMenuWebView extends NestedWebView {
                 result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
             // Menu options for an image.
             menu.setHeaderTitle(result.getExtra());
-            menu.add(0, ID_SAVE_IMAGE, 0, context.getString(R.string.context_menu_save_image)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_IMAGE_EXTERNAL_BROWSER, 0, context.getString(R.string.context_menu_open_external_browser)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_SHARE_IMAGE, 0, context.getString(R.string.context_menu_share_image)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_COPY_IMAGE_LINK, 0, context.getString(R.string.context_menu_copy_image_link)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SAVE_IMAGE, 0, context.getString(R.string.save_image)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_IMAGE_EXTERNAL_BROWSER, 0, context.getString(R.string.open_in_external_browser)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SHARE_IMAGE, 0, context.getString(R.string.share_image)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_COPY_IMAGE_LINK, 0, context.getString(R.string.copy_image_address_to_clipboard)).setOnMenuItemClickListener(handler);
         } else if (result.getType() == HitTestResult.ANCHOR_TYPE ||
                 result.getType() == HitTestResult.SRC_ANCHOR_TYPE) {
             // Menu options for a hyperlink.
             menu.setHeaderTitle(result.getExtra());
-            menu.add(0, ID_COPY_LINK, 0, context.getString(R.string.copy_link_to_clipboard)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_SHARE_LINK, 0, context.getString(R.string.context_menu_share_link)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_COPY_LINK, 0, context.getString(R.string.copy_link_adress_to_clipboard)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SHARE_LINK, 0, context.getString(R.string.share_link_address)).setOnMenuItemClickListener(handler);
         }
     }
 
diff --git a/app/src/main/res/layout/podselection__dialog.xml b/app/src/main/res/layout/podselection__dialog.xml
index ec09eee0..34e0b291 100644
--- a/app/src/main/res/layout/podselection__dialog.xml
+++ b/app/src/main/res/layout/podselection__dialog.xml
@@ -73,7 +73,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_horizontal_margin_half"
-            android:text="@string/http_protocol"
+            android:text="@string/protocol"
             android:textAppearance="@style/AppTheme.TextAppearance.Caption" />
 
         <RadioGroup
diff --git a/app/src/main/res/layout/podselection__fragment.xml b/app/src/main/res/layout/podselection__fragment.xml
index c6d9f45f..862beee0 100644
--- a/app/src/main/res/layout/podselection__fragment.xml
+++ b/app/src/main/res/layout/podselection__fragment.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:text="@string/podselection__custom_pod"
+        android:text="@string/custom_pod"
         tools:text="Benutzerdefinierter Pod" />
 
 
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index 92c17a7a..8929b0a9 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -26,43 +26,43 @@
             <item
                 android:id="@+id/action_notifications_all"
                 android:icon="@drawable/ic_dashboard_black_48px"
-                android:title="@string/notifications__all" />
+                android:title="@string/all_notifications" />
 
             <item
                 android:id="@+id/action_notifications_also_commented"
                 android:icon="@drawable/ic_question_answer_black_48px"
-                android:title="@string/notifications__also_commented" />
+                android:title="@string/also_commented" />
 
             <item
                 android:id="@+id/action_notifications_comment_on_post"
                 android:icon="@drawable/ic_comment_black_48px"
-                android:title="@string/notifications__comment_on_post" />
+                android:title="@string/comment_on_post" />
 
             <item
                 android:id="@+id/action_notifications_liked"
                 android:icon="@drawable/ic_thumb_up_black_48px"
-                android:title="@string/notifications__liked" />
+                android:title="@string/deleteme_____1" />
 
             <item
                 android:id="@+id/action_notifications_mentioned"
                 android:icon="@drawable/ic_person_pin_black_48px"
-                android:title="@string/notifications__mentioned" />
+                android:title="@string/mentioned" />
 
             <item
                 android:id="@+id/action_notifications_reshared"
                 android:icon="@drawable/ic_repeat_black_48px"
-                android:title="@string/notifications__reshared" />
+                android:title="@string/reshared" />
             <item
                 android:id="@+id/action_notifications_started_sharing"
                 android:icon="@drawable/ic_person_add_black_48px"
-                android:title="@string/notifications__started_sharing" />
+                android:title="@string/started_sharing" />
         </menu>
     </item>
 
     <item
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search_white_48px"
-        android:title="@string/action_search_by_tags_or_persons"
+        android:title="@string/search_by_tags_or_persons__appspecific"
         app:showAsAction="always" />
 
     <item
diff --git a/app/src/main/res/menu/main__navdrawer.xml b/app/src/main/res/menu/main__navdrawer.xml
index b542506a..8c8eebd2 100644
--- a/app/src/main/res/menu/main__navdrawer.xml
+++ b/app/src/main/res/menu/main__navdrawer.xml
@@ -51,7 +51,7 @@
         <item
             android:id="@+id/nav_public"
             android:icon="@drawable/ic_public_black_48px"
-            android:title="@string/nav_public_activities" />
+            android:title="@string/public_activities" />
 
         <item
             android:id="@+id/nav_product_support"
@@ -66,12 +66,12 @@
         <item
             android:id="@+id/nav_reports"
             android:icon="@drawable/ic_report_black_48px"
-            android:title="@string/nav_reports" />
+            android:title="@string/reports" />
 
         <item
             android:id="@+id/nav_exit"
             android:icon="@drawable/ic_cancel_black_48px"
-            android:title="@string/action_exit_app"
+            android:title="@string/exit_app"
             android:visible="false" />
     </group>
 
@@ -79,7 +79,7 @@
         <item
             android:id="@+id/nav_toggle_desktop_page"
             android:icon="@drawable/ic_sync_white_48px"
-            android:title="@string/action_toggle_desktop_page" />
+            android:title="@string/toggle_mobile_desktop_view" />
 
         <item
             android:id="@+id/nav_settings"
@@ -89,7 +89,7 @@
         <item
             android:id="@+id/nav_about"
             android:icon="@drawable/ic_info_black_48px"
-            android:title="@string/nav_help_license" />
+            android:title="@string/help_license" />
     </group>
 
 </menu>
diff --git a/app/src/main/res/menu/stream__menu_top.xml b/app/src/main/res/menu/stream__menu_top.xml
index 36a410b8..8638c533 100644
--- a/app/src/main/res/menu/stream__menu_top.xml
+++ b/app/src/main/res/menu/stream__menu_top.xml
@@ -5,25 +5,25 @@
     <item
         android:icon="@drawable/ic_share_white_48px"
         android:orderInCategory="300"
-        android:title="@string/action_share_dotdotdot"
+        android:title="@string/share_dotdotdot"
         app:showAsAction="never">
         <menu>
             <item
                 android:id="@+id/action_share_screenshot"
-                android:title="@string/share__share_screenshot" />
+                android:title="@string/share_screenshot_of_webpage" />
             <item
                 android:id="@+id/action_take_screenshot"
-                android:title="@string/share__take_screenshot" />
+                android:title="@string/take_screenshot_of_webpage" />
             <item
                 android:id="@+id/action_share_pdf"
                 android:title="@string/pdf"
                 android:visible="false" />
             <item
                 android:id="@+id/action_share_link"
-                android:title="@string/share__share_link_as_text" />
+                android:title="@string/share_link_as_text" />
             <item
                 android:id="@+id/action_share_link_to_clipboard"
-                android:title="@string/copy_link_to_clipboard" />
+                android:title="@string/copy_link_adress_to_clipboard" />
             <item
                 android:id="@+id/action_create_launcher_shortcut"
                 android:title="@string/launcher_shortcut" />
@@ -34,7 +34,7 @@
         android:id="@+id/action_go_to_top"
         android:icon="@drawable/ic_arrow_upward_white_48px"
         android:orderInCategory="400"
-        android:title="@string/action_go_to_top"
+        android:title="@string/go_to_top"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
deleted file mode 100644
index 985ee35d..00000000
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <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 e6794f8b..ead188d6 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -19,17 +19,17 @@
     <string name="changelog">Ændringslog</string>
     <string name="statistics">Statistik</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Alle notifikationer</string>
-    <string name="notifications__also_commented">Kommenterede også</string>
-    <string name="notifications__comment_on_post">Kommenter på opslag</string>
-    <string name="notifications__liked">Syntes om</string>
-    <string name="notifications__mentioned">Nævnte</string>
-    <string name="notifications__reshared">Gendelte</string>
+    <string name="all_notifications">Alle notifikationer</string>
+    <string name="also_commented">Kommenterede også</string>
+    <string name="comment_on_post">Kommenter på opslag</string>
+    <string name="deleteme_____1">Syntes om</string>
+    <string name="mentioned">Nævnte</string>
+    <string name="reshared">Gendelte</string>
     <!-- Pod Activity -->
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="context_menu_share_image">Del billede</string>
-    <string name="context_menu_open_external_browser">Åben i ekstern browser&#8230;</string>
-    <string name="copy_link_to_clipboard">Kopier link-adresse til udklipsholder</string>
+    <string name="share_image">Del billede</string>
+    <string name="open_in_external_browser">Åben i ekstern browser&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Kopier link-adresse til udklipsholder</string>
     <!-- More from MainActivity -->
     <!-- Permissions -->
 
@@ -63,15 +63,15 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Øverste værktøjslinje indlæser strøm</string>
-    <string name="pref_desc__topbar_stream_shortcut">Klik på tom plads i den øverste værktøjslinje for at åbne strømme</string>
+    <string name="top_toolbar_loads_stream__appsp">Øverste værktøjslinje indlæser strøm</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Klik på tom plads i den øverste værktøjslinje for at åbne strømme</string>
     <!-- Category Titles -->
     <!-- Visuals -->
     <!-- Navigiation Slider -->
     <!-- Themes -->
-    <string name="pref_title__primary_color">Primær farve</string>
-    <string name="pref_desc__primary_color">Værktøjslinjers farver</string>
-    <string name="pref_title__accent_color">Markeringsfarve</string>
+    <string name="primary_colors">Primær farve</string>
+    <string name="colors_of_toolbars">Værktøjslinjers farver</string>
+    <string name="accent_color">Markeringsfarve</string>
     <!-- Notifications dropdown -->
     <!-- Font size -->
     <!-- Load images -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 15eb1d15..a59044d1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,65 +20,65 @@
     <string name="changelog">Änderungen</string>
     <string name="statistics">Statistik</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Alle Benachrichtigungen</string>
-    <string name="notifications__also_commented">Auch kommentiert</string>
-    <string name="notifications__comment_on_post">Einen Beitrag kommentiert</string>
-    <string name="notifications__liked">Gefällt</string>
-    <string name="notifications__mentioned">Erwähnt</string>
-    <string name="notifications__reshared">Weitergesagt</string>
-    <string name="notifications__started_sharing">Angefangen zu teilen</string>
+    <string name="all_notifications">Alle Benachrichtigungen</string>
+    <string name="also_commented">Auch kommentiert</string>
+    <string name="comment_on_post">Einen Beitrag kommentiert</string>
+    <string name="deleteme_____1">Gefällt</string>
+    <string name="mentioned">Erwähnt</string>
+    <string name="reshared">Weitergesagt</string>
+    <string name="started_sharing">Angefangen zu teilen</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Fehler: Konnte die Podliste nicht abfragen!</string>
-    <string name="no_internet">Entschuldigung, du musst mit dem Internet verbunden sein, um fortzufahren.</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Fehler: Konnte die Podliste nicht abfragen!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Entschuldigung, du musst mit dem Internet verbunden sein, um fortzufahren.</string>
     <string name="confirmation">Bestätigung</string>
-    <string name="confirm_exit">Möchtest du die App verlassen?</string>
+    <string name="do_you_want_to_exit">Möchtest du die App verlassen?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Mehr</string>
-    <string name="nav_help_license">Über | Hilfe</string>
-    <string name="nav_followed_tags">Tags</string>
-    <string name="nav_public_activities">Öffentliche Aktivitäten</string>
-    <string name="nav_reports">Meldungen</string>
-    <string name="share__share_link_as_text">Link als Text teilen</string>
-    <string name="share__share_screenshot">Bildschirmfoto teilen</string>
-    <string name="share__take_screenshot">Bildschirmfoto speichern</string>
-    <string name="share__toast_saved_image_to_location">Speichere Bild als</string>
-    <string name="share__toast_screenshot">Bildschirmfoto wird gespeichert unter:</string>
-    <string name="share__toast_link_address_copied">Link-Adresse kopiert &#8230;</string>
+    <string name="more">Mehr</string>
+    <string name="help_license">Über | Hilfe</string>
+    <string name="followed_tags">Tags</string>
+    <string name="public_activities">Öffentliche Aktivitäten</string>
+    <string name="reports">Meldungen</string>
+    <string name="share_link_as_text">Link als Text teilen</string>
+    <string name="share_screenshot_of_webpage">Bildschirmfoto teilen</string>
+    <string name="take_screenshot_of_webpage">Bildschirmfoto speichern</string>
+    <string name="saving_image_to">Speichere Bild als</string>
+    <string name="saving_screenshot_as">Bildschirmfoto wird gespeichert unter:</string>
+    <string name="link_adress_copied">Link-Adresse kopiert &#8230;</string>
     <string name="new_post">Neuer Beitrag</string>
-    <string name="action_go_to_top">Nach oben scrollen</string>
-    <string name="action_search_by_tags_or_persons">Suche nach Tags oder Personen…</string>
-    <string name="action_exit_app">App beenden</string>
-    <string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
-    <string name="action_share_dotdotdot">Teilen&#8230;</string>
-    <string name="search_alert_tag">nach Tags</string>
-    <string name="search_alert_people">nach Personen</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Füge einen Namen ein.</string>
-    <string name="context_menu_share_link">Link-Adresse teilen</string>
-    <string name="context_menu_save_image">Bild speichern</string>
-    <string name="context_menu_share_image">Bild teilen</string>
-    <string name="context_menu_open_external_browser">In externem Browser öffnen&#8230;</string>
-    <string name="copy_link_to_clipboard">Link-Adresse kopieren</string>
-    <string name="context_menu_copy_image_link">Bild-Adresse kopieren</string>
+    <string name="go_to_top">Nach oben scrollen</string>
+    <string name="search_by_tags_or_persons__appspecific">Suche nach Tags oder Personen…</string>
+    <string name="exit_app">App beenden</string>
+    <string name="toggle_mobile_desktop_view">Mobil-/Desktopansicht umschalten</string>
+    <string name="share_dotdotdot">Teilen&#8230;</string>
+    <string name="by_tags">nach Tags</string>
+    <string name="by_people">nach Personen</string>
+    <string name="please_add_a_name">Füge einen Namen ein.</string>
+    <string name="share_link_address">Link-Adresse teilen</string>
+    <string name="save_image">Bild speichern</string>
+    <string name="share_image">Bild teilen</string>
+    <string name="open_in_external_browser">In externem Browser öffnen&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Link-Adresse kopieren</string>
+    <string name="copy_image_address_to_clipboard">Bild-Adresse kopieren</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Konnte Bild nicht laden…</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto
+    <string name="screenshot_permission__appspecific">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto
         gespeichert werden kann. Danach solltest du die Anwendung komplett schließen oder das Gerät neu starten.
         Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung
         nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*. Im Bereich Berechtigungen kannst
         dann die entsprechende Einstellung vornehmen.</string>
-    <string name="permissions_image">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit Bilder gespeichert oder hochgeladen werden können. Danach solltest du die Anwendung komplett schließen oder das Telefon neu starten. Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung
+    <string name="image_permission_description__appspecific">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit Bilder gespeichert oder hochgeladen werden können. Danach solltest du die Anwendung komplett schließen oder das Telefon neu starten. Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung
 nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*. Im Bereich Berechtigungen kannst dann die entsprechende Einstellung vornehmen.</string>
     <string name="permission_denied">Berechtigung verweigert.</string>
     <string name="permission_granted_try_again">Berechtigung erteilt. Bitte versuche es erneut.</string>
-    <string name="podselection__custom_pod">Benutzerdefinierter Pod</string>
+    <string name="custom_pod">Benutzerdefinierter Pod</string>
     <string name="pod_name">Pod Name</string>
-    <string name="http_protocol">Protokoll</string>
+    <string name="protocol">Protokoll</string>
     <string name="pod_address">Pod Adresse</string>
     <string name="missing_value">Fehlender Wert</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Zuletzt besuchte Seite im Stream aufrufen?</string>
-    <string name="pref_summary__is_statusbar_hidden">Statusleiste in Hauptansicht verstecken</string>
-    <string name="pref_title__is_statusbar_hidden">Statusleiste verstecken</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Zuletzt besuchte Seite im Stream aufrufen?</string>
+    <string name="hide_statusbar_in_mainview">Statusleiste in Hauptansicht verstecken</string>
+    <string name="hide_statusbar">Statusleiste verstecken</string>
 
     <string name="about">Über</string>
     <string name="license">Lizenz</string>
@@ -122,29 +122,29 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Obere Werkzeugleiste lädt Stream</string>
-    <string name="pref_desc__topbar_stream_shortcut">Klicks auf leere Flächen der oberen Werkzeugleiste öffnen den Stream</string>
+    <string name="top_toolbar_loads_stream__appsp">Obere Werkzeugleiste lädt Stream</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Klicks auf leere Flächen der oberen Werkzeugleiste öffnen den Stream</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Erscheinungsbild</string>
-    <string name="pref_cat__network">Netzwerk</string>
-    <string name="pref_cat__pod_settings">Pod Einstellungen</string>
-    <string name="pref_cat__operability">Bedienbarkeit</string>
+    <string name="appearance">Erscheinungsbild</string>
+    <string name="network">Netzwerk</string>
+    <string name="pod_settings__appspecfic">Pod Einstellungen</string>
+    <string name="operability">Bedienbarkeit</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigations Slider</string>
-    <string name="pref_desc__sub_nav_slider">Konfiguration der Sichtbarkeit von Einträgen im Navigation-Slider</string>
-    <string name="pref_cat__visibility_nav_items__user">Benutzer</string>
-    <string name="pref_cat__visibility_nav_items__general">Allgemeines</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
+    <string name="navigation_drawer">Navigations Slider</string>
+    <string name="control_visibility_of_entries_nav_drawer">Konfiguration der Sichtbarkeit von Einträgen im Navigation-Slider</string>
+    <string name="user">Benutzer</string>
+    <string name="general">Allgemeines</string>
+    <string name="admin">Administrator</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Farbschema</string>
-    <string name="pref_desc__themes">Einstellungen des Farbdesigns</string>
-    <string name="pref_title__primary_color">Primärfarbe</string>
-    <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="theme_and_colors">Farbschema</string>
+    <string name="control_which_colors_are_used_in_app">Einstellungen des Farbdesigns</string>
+    <string name="primary_colors">Primärfarbe</string>
+    <string name="colors_of_toolbars">Färbung der Werkzeugleisten</string>
+    <string name="accent_color">Akzentfarbe</string>
+    <string name="color_of_progressbar">Färbung der Details</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>
+    <string name="amoled_mode_description__app_specific">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="extended_notifications">Erweiterte Benachrichtigungen</string>
     <string name="extendend_notifications_bell_description__appspecific">Erweitere die Benachrichtigungsglocke um ein Ausklappmenü mit verschiedenen Benachrichtigungskategorien</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 65eb2af1..0f782b30 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,62 +19,62 @@
     <string name="changelog">Registro de cambios</string>
     <string name="statistics">Estadísticas</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Todas las notificaciones</string>
-    <string name="notifications__also_commented">También Comentado</string>
-    <string name="notifications__comment_on_post">Comentar en Publicación</string>
-    <string name="notifications__liked">Gustado</string>
-    <string name="notifications__mentioned">Mencionado</string>
-    <string name="notifications__reshared">Recompartido</string>
-    <string name="notifications__started_sharing">Empezado Compartir</string>
+    <string name="all_notifications">Todas las notificaciones</string>
+    <string name="also_commented">También Comentado</string>
+    <string name="comment_on_post">Comentar en Publicación</string>
+    <string name="deleteme_____1">Gustado</string>
+    <string name="mentioned">Mencionado</string>
+    <string name="reshared">Recompartido</string>
+    <string name="started_sharing">Empezado Compartir</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Error: No pudimos recuperar la lista de pods!</string>
-    <string name="no_internet">Debe conectarse a internet para poder continuar</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Error: No pudimos recuperar la lista de pods!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Debe conectarse a internet para poder continuar</string>
     <string name="confirmation">Confirmación</string>
-    <string name="confirm_exit">¿Desea salir?</string>
+    <string name="do_you_want_to_exit">¿Desea salir?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Más</string>
-    <string name="nav_help_license">Sobre | Ayuda</string>
-    <string name="nav_followed_tags">Etiquetas seguidas</string>
-    <string name="nav_public_activities">Actividad pública</string>
-    <string name="nav_reports">Informes</string>
-    <string name="share__share_link_as_text">Compartir enlace como texto</string>
-    <string name="share__share_screenshot">Compartir captura de pantalla de la página web</string>
-    <string name="share__take_screenshot">Tomar captura de pantalla de la página web</string>
-    <string name="share__toast_saved_image_to_location">Guardando imagen a</string>
-    <string name="share__toast_screenshot">Guardando captura de pantalla como:</string>
-    <string name="share__toast_link_address_copied">Dirección de enlace copiada</string>
+    <string name="more">Más</string>
+    <string name="help_license">Sobre | Ayuda</string>
+    <string name="followed_tags">Etiquetas seguidas</string>
+    <string name="public_activities">Actividad pública</string>
+    <string name="reports">Informes</string>
+    <string name="share_link_as_text">Compartir enlace como texto</string>
+    <string name="share_screenshot_of_webpage">Compartir captura de pantalla de la página web</string>
+    <string name="take_screenshot_of_webpage">Tomar captura de pantalla de la página web</string>
+    <string name="saving_image_to">Guardando imagen a</string>
+    <string name="saving_screenshot_as">Guardando captura de pantalla como:</string>
+    <string name="link_adress_copied">Dirección de enlace copiada</string>
     <string name="new_post">Nueva publicación</string>
-    <string name="action_go_to_top">Ir arriba</string>
-    <string name="action_search_by_tags_or_persons">Buscar por etiquetas o por personas</string>
-    <string name="action_exit_app">Salir de la aplicación</string>
-    <string name="action_toggle_desktop_page">Alternar vista de móvil/escritorio</string>
-    <string name="action_share_dotdotdot">Compartir&#8230;</string>
-    <string name="search_alert_tag">por etiquetas</string>
-    <string name="search_alert_people">por personas</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Por favor, añade un nombre</string>
-    <string name="context_menu_share_link">Compartir dirección de enlace</string>
-    <string name="context_menu_save_image">Guardar imagen</string>
-    <string name="context_menu_share_image">Compartir imagen</string>
-    <string name="context_menu_open_external_browser">Abrir en navegador externo&#8230;</string>
-    <string name="copy_link_to_clipboard">Copiar dirección del enlace al portapapeles</string>
-    <string name="context_menu_copy_image_link">Copiar dirección de imagen al portapapeles</string>
+    <string name="go_to_top">Ir arriba</string>
+    <string name="search_by_tags_or_persons__appspecific">Buscar por etiquetas o por personas</string>
+    <string name="exit_app">Salir de la aplicación</string>
+    <string name="toggle_mobile_desktop_view">Alternar vista de móvil/escritorio</string>
+    <string name="share_dotdotdot">Compartir&#8230;</string>
+    <string name="by_tags">por etiquetas</string>
+    <string name="by_people">por personas</string>
+    <string name="please_add_a_name">Por favor, añade un nombre</string>
+    <string name="share_link_address">Compartir dirección de enlace</string>
+    <string name="save_image">Guardar imagen</string>
+    <string name="share_image">Compartir imagen</string>
+    <string name="open_in_external_browser">Abrir en navegador externo&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Copiar dirección del enlace al portapapeles</string>
+    <string name="copy_image_address_to_clipboard">Copiar dirección de imagen al portapapeles</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">No se pudo cargar la imagen</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - dandelion*. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
-    <string name="permissions_image">Debe conceder \"Permiso de acceso al almacenamiento\" para guardar imágenes. Después, debe cerrar completamente la aplicación o reiniciar el aparato. Si usted no permite el almacenamiento  pero quiere guardar imágenes en otro momento, puede conceder el permiso más tarde.  Por favor abra: ajustes del sistema -aplicaciones- dandelion*. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
+    <string name="screenshot_permission__appspecific">Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - dandelion*. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
+    <string name="image_permission_description__appspecific">Debe conceder \"Permiso de acceso al almacenamiento\" para guardar imágenes. Después, debe cerrar completamente la aplicación o reiniciar el aparato. Si usted no permite el almacenamiento  pero quiere guardar imágenes en otro momento, puede conceder el permiso más tarde.  Por favor abra: ajustes del sistema -aplicaciones- dandelion*. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
     <string name="permission_denied">Permiso denegado.</string>
     <string name="permission_granted_try_again">Permiso concedido. Por favor, inténtelo de nuevo.</string>
-    <string name="podselection__custom_pod">Pod personalizado</string>
+    <string name="custom_pod">Pod personalizado</string>
     <string name="pod_name">Nombre de Pod</string>
-    <string name="http_protocol">Protocolo</string>
+    <string name="protocol">Protocolo</string>
     <string name="pod_address">Dirección de Pod</string>
     <string name="missing_value">Valor ausente</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">¿Saltar a la última página visitada?</string>
-    <string name="pref_summary__is_statusbar_hidden">Ocultar barra de estado en la vista principal</string>
-    <string name="pref_title__is_statusbar_hidden">Ocultar barra de estado</string>
-    <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="jump_to_last_visited_page_in_stream__appspecific">¿Saltar a la última página visitada?</string>
+    <string name="hide_statusbar_in_mainview">Ocultar barra de estado en la vista principal</string>
+    <string name="hide_statusbar">Ocultar barra de estado</string>
+    <string name="show_title_in_main_view">Mostrar título en la vista princial</string>
+    <string name="show_title">Mostrar título</string>
 
     <string name="about">Acerca de</string>
     <string name="license">Licencia</string>
@@ -118,29 +118,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Barra de herramientas superior carga la portada</string>
-    <string name="pref_desc__topbar_stream_shortcut">Haga clic en un espacio vacío en la barra de herramientas superior para abrir portada</string>
+    <string name="top_toolbar_loads_stream__appsp">Barra de herramientas superior carga la portada</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Haga clic en un espacio vacío en la barra de herramientas superior para abrir portada</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Apariencia</string>
-    <string name="pref_cat__network">Red</string>
-    <string name="pref_cat__pod_settings">Ajustes del Pod</string>
-    <string name="pref_cat__operability">Operatividad</string>
+    <string name="appearance">Apariencia</string>
+    <string name="network">Red</string>
+    <string name="pod_settings__appspecfic">Ajustes del Pod</string>
+    <string name="operability">Operatividad</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Control deslizante de navegación</string>
-    <string name="pref_desc__sub_nav_slider">Control de visibilidad de las entradas en el cajón de navegación</string>
-    <string name="pref_cat__visibility_nav_items__user">Usuario</string>
-    <string name="pref_cat__visibility_nav_items__general">General</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administrador</string>
+    <string name="navigation_drawer">Control deslizante de navegación</string>
+    <string name="control_visibility_of_entries_nav_drawer">Control de visibilidad de las entradas en el cajón de navegación</string>
+    <string name="user">Usuario</string>
+    <string name="general">General</string>
+    <string name="admin">Administrador</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema y Colores</string>
-    <string name="pref_desc__themes">Control de colores que se utilizan en la aplicación</string>
-    <string name="pref_title__primary_color">Color primario</string>
-    <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="theme_and_colors">Tema y Colores</string>
+    <string name="control_which_colors_are_used_in_app">Control de colores que se utilizan en la aplicación</string>
+    <string name="primary_colors">Color primario</string>
+    <string name="colors_of_toolbars">Color de las barras de herramientas</string>
+    <string name="accent_color">Color de Énfasis</string>
+    <string name="color_of_progressbar">Color de la barra de progreso</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a49ce1f4..9162948b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,64 +19,64 @@
     <string name="changelog">Nouveautés</string>
     <string name="statistics">Statistiques</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Toutes les notifications</string>
-    <string name="notifications__also_commented">Aussi commenté</string>
-    <string name="notifications__comment_on_post">Commentaires sur posts</string>
-    <string name="notifications__liked">Aimés</string>
-    <string name="notifications__mentioned">Mentionnés</string>
-    <string name="notifications__reshared">Repartagés</string>
-    <string name="notifications__started_sharing">A commencé à partager</string>
+    <string name="all_notifications">Toutes les notifications</string>
+    <string name="also_commented">Aussi commenté</string>
+    <string name="comment_on_post">Commentaires sur posts</string>
+    <string name="deleteme_____1">Aimés</string>
+    <string name="mentioned">Mentionnés</string>
+    <string name="reshared">Repartagés</string>
+    <string name="started_sharing">A commencé à partager</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Erreur : impossible de récupérer la liste des pods !</string>
-    <string name="no_internet">Désolé, vous devez être connecté à Internet pour continuer</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Erreur : impossible de récupérer la liste des pods !</string>
+    <string name="sorry_need_to_be_connected_to_internet">Désolé, vous devez être connecté à Internet pour continuer</string>
     <string name="confirmation">Vérification</string>
-    <string name="confirm_exit">Souhaitez-vous quitter ?</string>
+    <string name="do_you_want_to_exit">Souhaitez-vous quitter ?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Plus</string>
-    <string name="nav_help_license">A propos | Aide</string>
-    <string name="nav_followed_tags">Hashtags suivis</string>
-    <string name="nav_public_activities">Activités publiques</string>
-    <string name="nav_reports">Signalements</string>
-    <string name="share__share_link_as_text">Partager le lien comme texte</string>
-    <string name="share__share_screenshot">Partager la capture d\'écran d\'un site web</string>
-    <string name="share__take_screenshot">Prendre une capture d\'écran d\'un site web</string>
-    <string name="share__toast_saved_image_to_location">Enregistrer l\'image sous</string>
-    <string name="share__toast_screenshot">Enregistrer la capture d\'écran sous :</string>
-    <string name="share__toast_link_address_copied">Lien copié&#8230;</string>
+    <string name="more">Plus</string>
+    <string name="help_license">A propos | Aide</string>
+    <string name="followed_tags">Hashtags suivis</string>
+    <string name="public_activities">Activités publiques</string>
+    <string name="reports">Signalements</string>
+    <string name="share_link_as_text">Partager le lien comme texte</string>
+    <string name="share_screenshot_of_webpage">Partager la capture d\'écran d\'un site web</string>
+    <string name="take_screenshot_of_webpage">Prendre une capture d\'écran d\'un site web</string>
+    <string name="saving_image_to">Enregistrer l\'image sous</string>
+    <string name="saving_screenshot_as">Enregistrer la capture d\'écran sous :</string>
+    <string name="link_adress_copied">Lien copié&#8230;</string>
     <string name="new_post">Nouveau message</string>
-    <string name="action_go_to_top">Retour en haut</string>
-    <string name="action_search_by_tags_or_persons">Recherche par tags ou par personnes</string>
-    <string name="action_exit_app">Quitter l\'application</string>
-    <string name="action_toggle_desktop_page">Activer/désactiver la vue bureau/mobile</string>
-    <string name="action_share_dotdotdot">Partager&#8230;</string>
-    <string name="search_alert_tag">par tags</string>
-    <string name="search_alert_people">par personne</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Veuillez ajouter un nom</string>
-    <string name="context_menu_share_link">Partager un lien</string>
-    <string name="context_menu_save_image">Enregistrer l\'image</string>
-    <string name="context_menu_share_image">Partager l\'image</string>
-    <string name="context_menu_open_external_browser">Ouvrir dans un navigateur externe&#8230;</string>
-    <string name="copy_link_to_clipboard">Copier le lien dans le presse-papier</string>
-    <string name="context_menu_copy_image_link">Copier le lien de l\'image dans le presse-papiers</string>
+    <string name="go_to_top">Retour en haut</string>
+    <string name="search_by_tags_or_persons__appspecific">Recherche par tags ou par personnes</string>
+    <string name="exit_app">Quitter l\'application</string>
+    <string name="toggle_mobile_desktop_view">Activer/désactiver la vue bureau/mobile</string>
+    <string name="share_dotdotdot">Partager&#8230;</string>
+    <string name="by_tags">par tags</string>
+    <string name="by_people">par personne</string>
+    <string name="please_add_a_name">Veuillez ajouter un nom</string>
+    <string name="share_link_address">Partager un lien</string>
+    <string name="save_image">Enregistrer l\'image</string>
+    <string name="share_image">Partager l\'image</string>
+    <string name="open_in_external_browser">Ouvrir dans un navigateur externe&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Copier le lien dans le presse-papier</string>
+    <string name="copy_image_address_to_clipboard">Copier le lien de l\'image dans le presse-papiers</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Impossible de récupérer l\'image</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les captures d\'écrans. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez utiliser la fonctionnalité de prise de capture d\'écran plus tard, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - dandelion*. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
-    <string name="permissions_image">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder/téléverser les images. Ensuite, vous devriez        fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images        ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications -        dandelion*. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
+    <string name="screenshot_permission__appspecific">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les captures d\'écrans. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez utiliser la fonctionnalité de prise de capture d\'écran plus tard, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - dandelion*. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
+    <string name="image_permission_description__appspecific">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder/téléverser les images. Ensuite, vous devriez        fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images        ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications -        dandelion*. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
     <string name="permission_denied">Permission refusée.</string>
     <string name="permission_granted_try_again">Permission accordée. Veuillez réessayer.</string>
-    <string name="podselection__custom_pod">Pod personnalisé</string>
+    <string name="custom_pod">Pod personnalisé</string>
     <string name="pod_name">Nom du Pod</string>
-    <string name="http_protocol">Protocole</string>
+    <string name="protocol">Protocole</string>
     <string name="pod_address">Adresse du Pod</string>
     <string name="missing_value">Valeur manquante</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Sauter à la dernière page visitée dans le flux ?</string>
-    <string name="pref_summary__is_statusbar_hidden">Cacher la barre de statut sur la vue principale</string>
-    <string name="pref_title__is_statusbar_hidden">Cacher la barre de statut</string>
-    <string name="pref_summary__show_title">Afficher le titre dans la vue principale</string>
-    <string name="pref_title__show_title">Afficher le titre</string>
-    <string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
-    <string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Sauter à la dernière page visitée dans le flux ?</string>
+    <string name="hide_statusbar_in_mainview">Cacher la barre de statut sur la vue principale</string>
+    <string name="hide_statusbar">Cacher la barre de statut</string>
+    <string name="show_title_in_main_view">Afficher le titre dans la vue principale</string>
+    <string name="show_title">Afficher le titre</string>
+    <string name="open_navdrawer">Ouvrir le tiroir de navigation</string>
+    <string name="close_navdrawer">Fermer le tiroir de navigation</string>
     <string name="launcher_shortcut">Raccourci de l\'écran d\'accueil</string>
 
     <string name="about">À propos</string>
@@ -121,29 +121,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">La barre du haut charge le flux</string>
-    <string name="pref_desc__topbar_stream_shortcut">Cliquez sur un espace vide sur la barre du haut pour ouvrir le flux</string>
+    <string name="top_toolbar_loads_stream__appsp">La barre du haut charge le flux</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Cliquez sur un espace vide sur la barre du haut pour ouvrir le flux</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Apparence</string>
-    <string name="pref_cat__network">Paramètres du réseau</string>
-    <string name="pref_cat__pod_settings">Paramètres du pod</string>
-    <string name="pref_cat__operability">Opérabilité</string>
+    <string name="appearance">Apparence</string>
+    <string name="network">Paramètres du réseau</string>
+    <string name="pod_settings__appspecfic">Paramètres du pod</string>
+    <string name="operability">Opérabilité</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Curseur de navigation</string>
-    <string name="pref_desc__sub_nav_slider">Visibilité de contrôle des entrées dans le volet de navigation</string>
-    <string name="pref_cat__visibility_nav_items__user">Utilisateur</string>
-    <string name="pref_cat__visibility_nav_items__general">Général</string>
-    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
+    <string name="navigation_drawer">Curseur de navigation</string>
+    <string name="control_visibility_of_entries_nav_drawer">Visibilité de contrôle des entrées dans le volet de navigation</string>
+    <string name="user">Utilisateur</string>
+    <string name="general">Général</string>
+    <string name="admin">Admin</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Thème et couleurs</string>
-    <string name="pref_desc__themes">Contrôler les couleurs utilisées pour l\'application</string>
-    <string name="pref_title__primary_color">Couleur principale</string>
-    <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="theme_and_colors">Thème et couleurs</string>
+    <string name="control_which_colors_are_used_in_app">Contrôler les couleurs utilisées pour l\'application</string>
+    <string name="primary_colors">Couleur principale</string>
+    <string name="colors_of_toolbars">Couleur des barres d\'outils</string>
+    <string name="accent_color">Couleur secondaire</string>
+    <string name="color_of_progressbar">Couleur de la barre de progression</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 6dd6cbf4..1046e470 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -2,8 +2,8 @@
 <!--Editado con nano-->
 <resources>
     <!-- Application -->
-<string name="navigation_drawer_open">Abrir cadro de navegación</string>
-<string name="navigation_drawer_close">Pechar cadro de navegación</string>
+<string name="open_navdrawer">Abrir cadro de navegación</string>
+<string name="close_navdrawer">Pechar cadro de navegación</string>
     <string name="reload">Actualizar</string>
     <!-- Common Words -->
     <string name="settings">Axustes</string>
@@ -22,65 +22,65 @@
     <string name="changelog">Rexistro de cambios</string>
     <string name="statistics">Estatísticas</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Todas as notificacións</string>
-    <string name="notifications__also_commented">Tamén comentado</string>
-    <string name="notifications__comment_on_post">Comentario nunha publicación</string>
-    <string name="notifications__liked">Gústame</string>
-    <string name="notifications__mentioned">Mencionado</string>
-    <string name="notifications__reshared">Compartido</string>
-    <string name="notifications__started_sharing">Comezou a compartir</string>
+    <string name="all_notifications">Todas as notificacións</string>
+    <string name="also_commented">Tamén comentado</string>
+    <string name="comment_on_post">Comentario nunha publicación</string>
+    <string name="deleteme_____1">Gústame</string>
+    <string name="mentioned">Mencionado</string>
+    <string name="reshared">Compartido</string>
+    <string name="started_sharing">Comezou a compartir</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Problema: non se obtivo a lista de nodos!</string>
-    <string name="no_internet">Desculpe, precisa unha conexión a internet para esa tarefa</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Problema: non se obtivo a lista de nodos!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Desculpe, precisa unha conexión a internet para esa tarefa</string>
     <string name="confirmation">Confirmación</string>
-    <string name="confirm_exit">Quere saír?</string>
+    <string name="do_you_want_to_exit">Quere saír?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Máis</string>
-    <string name="nav_help_license">Sobre | Axuda</string>
-    <string name="nav_followed_tags">Etiquetas seguidas</string>
-    <string name="nav_public_activities">Actividade pública</string>
-    <string name="nav_reports">Informes</string>
-    <string name="share__share_link_as_text">Compartir ligazón como texto</string>
-    <string name="share__share_screenshot">Compartir captura de páxina</string>
-    <string name="share__take_screenshot">Capturar imaxe de páxina web</string>
-    <string name="share__toast_saved_image_to_location">Gardar imaxe en</string>
-    <string name="share__toast_screenshot">Gardando captura como:</string>
-    <string name="share__toast_link_address_copied">Enderezo da ligazón copiado &#8230;</string>
+    <string name="more">Máis</string>
+    <string name="help_license">Sobre | Axuda</string>
+    <string name="followed_tags">Etiquetas seguidas</string>
+    <string name="public_activities">Actividade pública</string>
+    <string name="reports">Informes</string>
+    <string name="share_link_as_text">Compartir ligazón como texto</string>
+    <string name="share_screenshot_of_webpage">Compartir captura de páxina</string>
+    <string name="take_screenshot_of_webpage">Capturar imaxe de páxina web</string>
+    <string name="saving_image_to">Gardar imaxe en</string>
+    <string name="saving_screenshot_as">Gardando captura como:</string>
+    <string name="link_adress_copied">Enderezo da ligazón copiado &#8230;</string>
     <string name="new_post">Nova mensaxe</string>
-    <string name="action_go_to_top">Ir arriba</string>
-    <string name="action_search_by_tags_or_persons">Buscar persoas ou etiquetas</string>
-    <string name="action_exit_app">Saír do app</string>
-    <string name="action_toggle_desktop_page">Vista móbil/escritorio</string>
-    <string name="action_share_dotdotdot">Compartir&#8230;</string>
-    <string name="search_alert_tag">Etiquetas</string>
-    <string name="search_alert_people">Persoas</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Por favor, engada un nome</string>
-    <string name="context_menu_share_link">Compartir ligazón</string>
-    <string name="context_menu_save_image">Gardar imaxe</string>
-    <string name="context_menu_share_image">Compartir imaxe</string>
-    <string name="context_menu_open_external_browser">Abrir nun navegador externo&#8230;</string>
-    <string name="copy_link_to_clipboard">Copiar ligazón ao portapapeis</string>
-    <string name="context_menu_copy_image_link">Copia enderezo da imaxe ao portapapeis</string>
+    <string name="go_to_top">Ir arriba</string>
+    <string name="search_by_tags_or_persons__appspecific">Buscar persoas ou etiquetas</string>
+    <string name="exit_app">Saír do app</string>
+    <string name="toggle_mobile_desktop_view">Vista móbil/escritorio</string>
+    <string name="share_dotdotdot">Compartir&#8230;</string>
+    <string name="by_tags">Etiquetas</string>
+    <string name="by_people">Persoas</string>
+    <string name="please_add_a_name">Por favor, engada un nome</string>
+    <string name="share_link_address">Compartir ligazón</string>
+    <string name="save_image">Gardar imaxe</string>
+    <string name="share_image">Compartir imaxe</string>
+    <string name="open_in_external_browser">Abrir nun navegador externo&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Copiar ligazón ao portapapeis</string>
+    <string name="copy_image_address_to_clipboard">Copia enderezo da imaxe ao portapapeis</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Non se cargou a imaxe</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Debe permitir \"Permiso de acceso a almacenamento\" para gardar capturas. Pode
+    <string name="screenshot_permission__appspecific">Debe permitir \"Permiso de acceso a almacenamento\" para gardar capturas. Pode
         pechar a aplicación ou reiniciar o dispositivo. Si non permite acceder ao almacenamento pero que utilizar máis tarde a captura de pantalla, poderá permitir posteriormente o acceso na sección de permisos do dispositivo onde pode activar o \"permiso de acceso a almacenamento\" para dandelion*.</string>
-    <string name="permissions_image">Ten que permitir \"Permiso de acceso a almacenamento\" para gardar/subir imaxes. Despois de iso debería
+    <string name="image_permission_description__appspecific">Ten que permitir \"Permiso de acceso a almacenamento\" para gardar/subir imaxes. Despois de iso debería
         pechar a aplicación ou reiniciar o dispositivo. Se non permite acceder ao almacenamento, para poder gardar imaxes posteriormente, deberá abrir: preferencias do sistema - apps - dandelion* no dispositivo.
    Na sección de permisos pode activar o \"permiso de escritura no almacenamento\".</string>
     <string name="permission_denied">Permiso denegado.</string>
     <string name="permission_granted_try_again">Permiso concedido. Inténteo de novo.</string>
-    <string name="podselection__custom_pod">Nodo personalizado</string>
+    <string name="custom_pod">Nodo personalizado</string>
     <string name="pod_name">Nome do nodo</string>
-    <string name="http_protocol">Protocolo</string>
+    <string name="protocol">Protocolo</string>
     <string name="pod_address">Enderezo do nodo</string>
     <string name="missing_value">Faltan datos</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Ir a última paxina lida na conversa?</string>
-    <string name="pref_summary__is_statusbar_hidden">Agochar a barra de estado na vista principal</string>
-    <string name="pref_title__is_statusbar_hidden">Agochar barra de estado</string>
-    <string name="pref_summary__show_title">Mostrar título na vista principal</string>
-    <string name="pref_title__show_title">Mostrar título</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Ir a última paxina lida na conversa?</string>
+    <string name="hide_statusbar_in_mainview">Agochar a barra de estado na vista principal</string>
+    <string name="hide_statusbar">Agochar barra de estado</string>
+    <string name="show_title_in_main_view">Mostrar título na vista principal</string>
+    <string name="show_title">Mostrar título</string>
 	<string name="launcher_shortcut">Atallo do lanzador</string>
 
     <string name="about">Sobre</string>
@@ -125,29 +125,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">A barra superior carga a conversa</string>
-    <string name="pref_desc__topbar_stream_shortcut">Pulse nun espazo baldeiro na barra superior para abrir a conversa</string>
+    <string name="top_toolbar_loads_stream__appsp">A barra superior carga a conversa</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Pulse nun espazo baldeiro na barra superior para abrir a conversa</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Aparencia</string>
-    <string name="pref_cat__network">Rede</string>
-    <string name="pref_cat__pod_settings">Axustes do nodo</string>
-    <string name="pref_cat__operability">Operabilidade</string>
+    <string name="appearance">Aparencia</string>
+    <string name="network">Rede</string>
+    <string name="pod_settings__appspecfic">Axustes do nodo</string>
+    <string name="operability">Operabilidade</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Cadro de navegación</string>
-    <string name="pref_desc__sub_nav_slider">Controle a visibiidade das entradas no cadro de navegación</string>
-    <string name="pref_cat__visibility_nav_items__user">Usuaria</string>
-    <string name="pref_cat__visibility_nav_items__general">Xeral</string>
-    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
+    <string name="navigation_drawer">Cadro de navegación</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controle a visibiidade das entradas no cadro de navegación</string>
+    <string name="user">Usuaria</string>
+    <string name="general">Xeral</string>
+    <string name="admin">Admin</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Decorado e cores</string>
-    <string name="pref_desc__themes">Estableza qué cores se utilizan na aplicación</string>
-    <string name="pref_title__primary_color">Cor primaria</string>
-    <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="theme_and_colors">Decorado e cores</string>
+    <string name="control_which_colors_are_used_in_app">Estableza qué cores se utilizan na aplicación</string>
+    <string name="primary_colors">Cor primaria</string>
+    <string name="colors_of_toolbars">Cor das barras de ferramentas</string>
+    <string name="accent_color">Cor de énfase</string>
+    <string name="color_of_progressbar">Cor da barra de progreso</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4b974535..47d407fe 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -19,58 +19,58 @@
     <string name="changelog">Újdonságok</string>
     <string name="statistics">Statisztika</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Összes értesítés</string>
-    <string name="notifications__also_commented">Más hozzászólások</string>
-    <string name="notifications__comment_on_post">Közvetlen hozzászólások</string>
-    <string name="notifications__liked">Kedvelések</string>
-    <string name="notifications__mentioned">Megemlítések</string>
-    <string name="notifications__reshared">Megosztások</string>
-    <string name="notifications__started_sharing">Új kapcsolatok</string>
+    <string name="all_notifications">Összes értesítés</string>
+    <string name="also_commented">Más hozzászólások</string>
+    <string name="comment_on_post">Közvetlen hozzászólások</string>
+    <string name="deleteme_____1">Kedvelések</string>
+    <string name="mentioned">Megemlítések</string>
+    <string name="reshared">Megosztások</string>
+    <string name="started_sharing">Új kapcsolatok</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Hiba: Nem lehetett lekérni a podok listáját!</string>
-    <string name="no_internet">Bocsánat, csatlakoznod kell az internethez a folytatáshoz</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Hiba: Nem lehetett lekérni a podok listáját!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Bocsánat, csatlakoznod kell az internethez a folytatáshoz</string>
     <string name="confirmation">Jóváhagyás</string>
-    <string name="confirm_exit">Ki akarsz lépni?</string>
+    <string name="do_you_want_to_exit">Ki akarsz lépni?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Egyebek</string>
-    <string name="nav_help_license">Névjegy | Segítség</string>
-    <string name="nav_followed_tags">Követett címkék</string>
-    <string name="nav_public_activities">Nyilvános tevékenységek</string>
-    <string name="nav_reports">Jelentések</string>
-    <string name="share__share_link_as_text">Link megosztása szövegként</string>
-    <string name="share__share_screenshot">Weboldal képernyőképének megosztása</string>
-    <string name="share__take_screenshot">Képernyőkép készítése weboldalról</string>
-    <string name="share__toast_saved_image_to_location">Kép mentése a következő helyre</string>
-    <string name="share__toast_screenshot">Képernyőkép mentése mint:</string>
-    <string name="share__toast_link_address_copied">Másolt link címe&#8230;</string>
+    <string name="more">Egyebek</string>
+    <string name="help_license">Névjegy | Segítség</string>
+    <string name="followed_tags">Követett címkék</string>
+    <string name="public_activities">Nyilvános tevékenységek</string>
+    <string name="reports">Jelentések</string>
+    <string name="share_link_as_text">Link megosztása szövegként</string>
+    <string name="share_screenshot_of_webpage">Weboldal képernyőképének megosztása</string>
+    <string name="take_screenshot_of_webpage">Képernyőkép készítése weboldalról</string>
+    <string name="saving_image_to">Kép mentése a következő helyre</string>
+    <string name="saving_screenshot_as">Képernyőkép mentése mint:</string>
+    <string name="link_adress_copied">Másolt link címe&#8230;</string>
     <string name="new_post">Új bejegyzés</string>
-    <string name="action_go_to_top">Ugrás az oldal tetejére</string>
-    <string name="action_search_by_tags_or_persons">Címkék vagy emberek keresése</string>
-    <string name="action_exit_app">Kilépés az alkalmazásból</string>
-    <string name="action_toggle_desktop_page">Mobil-/asztali mód</string>
-    <string name="action_share_dotdotdot">Megosztás&#8230;</string>
-    <string name="search_alert_tag">címkékre</string>
-    <string name="search_alert_people">emberekre</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Kérlek, adj meg egy nevet</string>
-    <string name="context_menu_share_link">Link címének megosztása</string>
-    <string name="context_menu_save_image">Kép mentése</string>
-    <string name="context_menu_share_image">Kép megosztása</string>
-    <string name="context_menu_open_external_browser">Megnyitás külső böngészőben&#8230;</string>
-    <string name="copy_link_to_clipboard">Link címének másolása a vágólapra</string>
-    <string name="context_menu_copy_image_link">Kép címének másolása a vágólapra</string>
+    <string name="go_to_top">Ugrás az oldal tetejére</string>
+    <string name="search_by_tags_or_persons__appspecific">Címkék vagy emberek keresése</string>
+    <string name="exit_app">Kilépés az alkalmazásból</string>
+    <string name="toggle_mobile_desktop_view">Mobil-/asztali mód</string>
+    <string name="share_dotdotdot">Megosztás&#8230;</string>
+    <string name="by_tags">címkékre</string>
+    <string name="by_people">emberekre</string>
+    <string name="please_add_a_name">Kérlek, adj meg egy nevet</string>
+    <string name="share_link_address">Link címének megosztása</string>
+    <string name="save_image">Kép mentése</string>
+    <string name="share_image">Kép megosztása</string>
+    <string name="open_in_external_browser">Megnyitás külső böngészőben&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Link címének másolása a vágólapra</string>
+    <string name="copy_image_address_to_clipboard">Kép címének másolása a vágólapra</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Nem lehet betölteni a képet</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Engedélyezned kell a tárhely elérését a képernyőképek mentéséhez. Aztán teljesen be kell zárnod az alkalmazást vagy újra kell indítanod az eszközt. Ha most nem akarod engedélyezni a tárhely elérését, de később szeretnéd használni a képernyőkép-funkciót, kérlek, tedd meg az alábbi helyen: Rendszerbeállítások - Alkalmazások - dandelion*. Itt az engedélyeknél hozzáadhatod az a tárhelyre való írást.</string>
-    <string name="permissions_image">Engedélyezned kell a tárhely elérését a képek mentéséhez/feltöltéséhez. Aztán teljesen be kell zárnod az alkalmazást vagy újra kell indítanod az eszközt. Ha most nem akarod engedélyezni a tárhely elérését, de később szeretnéd használni a képernyőkép-funkciót, kérlek, tedd meg az alábbi helyen: Rendszerbeállítások - Alkalmazások - dandelion*. Itt az engedélyeknél hozzáadhatod az a tárhelyre való írást.</string>
+    <string name="screenshot_permission__appspecific">Engedélyezned kell a tárhely elérését a képernyőképek mentéséhez. Aztán teljesen be kell zárnod az alkalmazást vagy újra kell indítanod az eszközt. Ha most nem akarod engedélyezni a tárhely elérését, de később szeretnéd használni a képernyőkép-funkciót, kérlek, tedd meg az alábbi helyen: Rendszerbeállítások - Alkalmazások - dandelion*. Itt az engedélyeknél hozzáadhatod az a tárhelyre való írást.</string>
+    <string name="image_permission_description__appspecific">Engedélyezned kell a tárhely elérését a képek mentéséhez/feltöltéséhez. Aztán teljesen be kell zárnod az alkalmazást vagy újra kell indítanod az eszközt. Ha most nem akarod engedélyezni a tárhely elérését, de később szeretnéd használni a képernyőkép-funkciót, kérlek, tedd meg az alábbi helyen: Rendszerbeállítások - Alkalmazások - dandelion*. Itt az engedélyeknél hozzáadhatod az a tárhelyre való írást.</string>
     <string name="permission_denied">Hozzáférés megtagadva.</string>
     <string name="permission_granted_try_again">Hozzáférés megtagadva. Kérlek, próbáld újra!</string>
-    <string name="podselection__custom_pod">Egyéni pod</string>
+    <string name="custom_pod">Egyéni pod</string>
     <string name="pod_name">Pod neve</string>
-    <string name="http_protocol">Protokoll</string>
+    <string name="protocol">Protokoll</string>
     <string name="pod_address">Pod címe</string>
     <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="jump_to_last_visited_page_in_stream__appspecific">Ugorjunk a legutóbb meglátogatott oldalra a hírfolyamon belül?</string>
 
     <string name="about">Névjegy</string>
     <string name="license">Licensz</string>
@@ -115,29 +115,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">A fenti eszköztár betölti a hírfolyamot</string>
-    <string name="pref_desc__topbar_stream_shortcut">Kattints egy üres helyre a fenti eszköztáron a hírfolyam megnyitásához</string>
+    <string name="top_toolbar_loads_stream__appsp">A fenti eszköztár betölti a hírfolyamot</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Kattints egy üres helyre a fenti eszköztáron a hírfolyam megnyitásához</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Megjelenés</string>
-    <string name="pref_cat__network">Hálózat</string>
-    <string name="pref_cat__pod_settings">Podbeállítások</string>
-    <string name="pref_cat__operability">Működés</string>
+    <string name="appearance">Megjelenés</string>
+    <string name="network">Hálózat</string>
+    <string name="pod_settings__appspecfic">Podbeállítások</string>
+    <string name="operability">Működés</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigációs csúszka</string>
-    <string name="pref_desc__sub_nav_slider">Az oldalsó navigációs menü elemei láthatóságának megadása</string>
-    <string name="pref_cat__visibility_nav_items__user">Felhasználó</string>
-    <string name="pref_cat__visibility_nav_items__general">Általános</string>
-    <string name="pref_cat__visibility_nav_items__admin">Adminisztrátor</string>
+    <string name="navigation_drawer">Navigációs csúszka</string>
+    <string name="control_visibility_of_entries_nav_drawer">Az oldalsó navigációs menü elemei láthatóságának megadása</string>
+    <string name="user">Felhasználó</string>
+    <string name="general">Általános</string>
+    <string name="admin">Adminisztrátor</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Témák és színek</string>
-    <string name="pref_desc__themes">Az alkalmazás által használt színek megadása</string>
-    <string name="pref_title__primary_color">Elsődleges szín</string>
-    <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="theme_and_colors">Témák és színek</string>
+    <string name="control_which_colors_are_used_in_app">Az alkalmazás által használt színek megadása</string>
+    <string name="primary_colors">Elsődleges szín</string>
+    <string name="colors_of_toolbars">Az eszköztárak színe</string>
+    <string name="accent_color">Másodlagos szín</string>
+    <string name="color_of_progressbar">A folyamatsáv színe</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b7ec612a..d8ce0984 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,68 +19,68 @@
     <string name="changelog">Log delle modifiche</string>
     <string name="statistics">Statistiche</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Tutte le notifiche</string>
-    <string name="notifications__also_commented">Inoltre ha commentato</string>
-    <string name="notifications__comment_on_post">Commento sul post</string>
-    <string name="notifications__liked">Ha messo Mi piace</string>
-    <string name="notifications__mentioned">Ha menzionato</string>
-    <string name="notifications__reshared">Ha ricondiviso</string>
-    <string name="notifications__started_sharing">Ha iniziato a condividere con te</string>
+    <string name="all_notifications">Tutte le notifiche</string>
+    <string name="also_commented">Inoltre ha commentato</string>
+    <string name="comment_on_post">Commento sul post</string>
+    <string name="deleteme_____1">Ha messo Mi piace</string>
+    <string name="mentioned">Ha menzionato</string>
+    <string name="reshared">Ha ricondiviso</string>
+    <string name="started_sharing">Ha iniziato a condividere con te</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Errore: impossibile ottenere la lista dei pod!</string>
-    <string name="no_internet">Devi essere connesso ad internet per proseguire</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Errore: impossibile ottenere la lista dei pod!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Devi essere connesso ad internet per proseguire</string>
     <string name="confirmation">Conferma</string>
-    <string name="confirm_exit">Vuoi veramente uscire?</string>
+    <string name="do_you_want_to_exit">Vuoi veramente uscire?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Altro</string>
-    <string name="nav_help_license">Informazioni | Aiuto</string>
-    <string name="nav_followed_tags">Tag seguiti</string>
-    <string name="nav_public_activities">Attività pubbliche</string>
-    <string name="nav_reports">Segnalazioni</string>
-    <string name="share__share_link_as_text">Condividi link come testo</string>
-    <string name="share__share_screenshot">Condividi screenshot della pagina Web</string>
-    <string name="share__take_screenshot">Fai uno screenshot della pagina web</string>
-    <string name="share__toast_saved_image_to_location">Salvataggio dell\'immagine in</string>
-    <string name="share__toast_screenshot">Salvataggio dello screenshot come:</string>
-    <string name="share__toast_link_address_copied">Indirizzo copiato&#8230;</string>
+    <string name="more">Altro</string>
+    <string name="help_license">Informazioni | Aiuto</string>
+    <string name="followed_tags">Tag seguiti</string>
+    <string name="public_activities">Attività pubbliche</string>
+    <string name="reports">Segnalazioni</string>
+    <string name="share_link_as_text">Condividi link come testo</string>
+    <string name="share_screenshot_of_webpage">Condividi screenshot della pagina Web</string>
+    <string name="take_screenshot_of_webpage">Fai uno screenshot della pagina web</string>
+    <string name="saving_image_to">Salvataggio dell\'immagine in</string>
+    <string name="saving_screenshot_as">Salvataggio dello screenshot come:</string>
+    <string name="link_adress_copied">Indirizzo copiato&#8230;</string>
     <string name="new_post">Nuovo post</string>
-    <string name="action_go_to_top">Vai in cima</string>
-    <string name="action_search_by_tags_or_persons">Cerca tag o persone</string>
-    <string name="action_exit_app">Esci dall\'app</string>
-    <string name="action_toggle_desktop_page">Attiva visualizzazione mobile/desktop</string>
-    <string name="action_share_dotdotdot">Condividi&#8230;</string>
-    <string name="search_alert_tag">per tag</string>
-    <string name="search_alert_people">per persona</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Inserisci un nome</string>
-    <string name="context_menu_share_link">Condividi link</string>
-    <string name="context_menu_save_image">Salva immagine</string>
-    <string name="context_menu_share_image">Condividi immagine</string>
-    <string name="context_menu_open_external_browser">Apri nel browser&#8230;</string>
-    <string name="copy_link_to_clipboard">Copia link negli appunti</string>
-    <string name="context_menu_copy_image_link">Copia indirizzo dell\'immagine negli appunti</string>
+    <string name="go_to_top">Vai in cima</string>
+    <string name="search_by_tags_or_persons__appspecific">Cerca tag o persone</string>
+    <string name="exit_app">Esci dall\'app</string>
+    <string name="toggle_mobile_desktop_view">Attiva visualizzazione mobile/desktop</string>
+    <string name="share_dotdotdot">Condividi&#8230;</string>
+    <string name="by_tags">per tag</string>
+    <string name="by_people">per persona</string>
+    <string name="please_add_a_name">Inserisci un nome</string>
+    <string name="share_link_address">Condividi link</string>
+    <string name="save_image">Salva immagine</string>
+    <string name="share_image">Condividi immagine</string>
+    <string name="open_in_external_browser">Apri nel browser&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Copia link negli appunti</string>
+    <string name="copy_image_address_to_clipboard">Copia indirizzo dell\'immagine negli appunti</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Impossibile caricare immagine</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Devi garantire il permesso di accesso alla memoria per poter salvare gli screenshot. Dopodiché devi
+    <string name="screenshot_permission__appspecific">Devi garantire il permesso di accesso alla memoria per poter salvare gli screenshot. Dopodiché devi
         chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la 
         funzione degli screenshot più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App -
         dandelion*. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo.</string>
-    <string name="permissions_image">Devi concedere il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi
+    <string name="image_permission_description__appspecific">Devi concedere il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi
         chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi 
         salvare le immagini più avanti, puoi concedere il permesso successivamente. Vai su: Impostazioni - App -
         dandelion*. Nella sezione dei permessi puoi concedere il permesso per la scrittura sul dispositivo.</string>
     <string name="permission_denied">Permesso negato.</string>
     <string name="permission_granted_try_again">Permesso concesso. Si prega di riprovare.</string>
-    <string name="podselection__custom_pod">Pod personalizzato</string>
+    <string name="custom_pod">Pod personalizzato</string>
     <string name="pod_name">Nome del pod</string>
-    <string name="http_protocol">Protocollo</string>
+    <string name="protocol">Protocollo</string>
     <string name="pod_address">Indirizzo del pod</string>
     <string name="missing_value">Valore mancante</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Salta all\'ultima pagina visitata nello stream?</string>
-    <string name="pref_summary__is_statusbar_hidden">Nascondi barra di stato nella schermata principale</string>
-    <string name="pref_title__is_statusbar_hidden">Nascondi barra di stato</string>
-    <string name="pref_summary__show_title">Mostra titolo nella schermata principale</string>
-    <string name="pref_title__show_title">Mostra titolo</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Salta all\'ultima pagina visitata nello stream?</string>
+    <string name="hide_statusbar_in_mainview">Nascondi barra di stato nella schermata principale</string>
+    <string name="hide_statusbar">Nascondi barra di stato</string>
+    <string name="show_title_in_main_view">Mostra titolo nella schermata principale</string>
+    <string name="show_title">Mostra titolo</string>
 
     <string name="about">Informazioni</string>
     <string name="license">Licenza</string>
@@ -124,29 +124,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">La barra superiore apre lo stream</string>
-    <string name="pref_desc__topbar_stream_shortcut">Premi su uno spazio vuoto nella barra degli strumenti superiore per aprire lo stream</string>
+    <string name="top_toolbar_loads_stream__appsp">La barra superiore apre lo stream</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Premi su uno spazio vuoto nella barra degli strumenti superiore per aprire lo stream</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Aspetto</string>
-    <string name="pref_cat__network">Rete</string>
-    <string name="pref_cat__pod_settings">Impostazioni pod</string>
-    <string name="pref_cat__operability">Operabilità</string>
+    <string name="appearance">Aspetto</string>
+    <string name="network">Rete</string>
+    <string name="pod_settings__appspecfic">Impostazioni pod</string>
+    <string name="operability">Operabilità</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Menù di navigazione</string>
-    <string name="pref_desc__sub_nav_slider">Controlla la visibilità degli elementi nel menù di navigazione</string>
-    <string name="pref_cat__visibility_nav_items__user">Utente</string>
-    <string name="pref_cat__visibility_nav_items__general">Generali</string>
-    <string name="pref_cat__visibility_nav_items__admin">Amministrazione</string>
+    <string name="navigation_drawer">Menù di navigazione</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controlla la visibilità degli elementi nel menù di navigazione</string>
+    <string name="user">Utente</string>
+    <string name="general">Generali</string>
+    <string name="admin">Amministrazione</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema e colori</string>
-    <string name="pref_desc__themes">Scegli quali colori usare nell\'app</string>
-    <string name="pref_title__primary_color">Colore primario</string>
-    <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="theme_and_colors">Tema e colori</string>
+    <string name="control_which_colors_are_used_in_app">Scegli quali colori usare nell\'app</string>
+    <string name="primary_colors">Colore primario</string>
+    <string name="colors_of_toolbars">Colore della barra</string>
+    <string name="accent_color">Colore secondario</string>
+    <string name="color_of_progressbar">Colore della barra dei progressi</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c7fb916d..e6969344 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,62 +19,62 @@
     <string name="changelog">変更履歴</string>
     <string name="statistics">統計情報</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">すべての通知</string>
-    <string name="notifications__also_commented">コメントもしました</string>
-    <string name="notifications__comment_on_post">投稿にコメント</string>
-    <string name="notifications__liked">いいね！しました</string>
-    <string name="notifications__mentioned">メンションしました</string>
-    <string name="notifications__reshared">リシェアしました</string>
-    <string name="notifications__started_sharing">シェアを始めました</string>
+    <string name="all_notifications">すべての通知</string>
+    <string name="also_commented">コメントもしました</string>
+    <string name="comment_on_post">投稿にコメント</string>
+    <string name="deleteme_____1">いいね！しました</string>
+    <string name="mentioned">メンションしました</string>
+    <string name="reshared">リシェアしました</string>
+    <string name="started_sharing">シェアを始めました</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">エラー: ポッドのリストを取得できませんでした!</string>
-    <string name="no_internet">申し訳ありません。続行するにはインターネットに接続する必要があります</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">エラー: ポッドのリストを取得できませんでした!</string>
+    <string name="sorry_need_to_be_connected_to_internet">申し訳ありません。続行するにはインターネットに接続する必要があります</string>
     <string name="confirmation">確認</string>
-    <string name="confirm_exit">終了しますか?</string>
+    <string name="do_you_want_to_exit">終了しますか?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">さらに</string>
-    <string name="nav_help_license">概要 |ヘルプ</string>
-    <string name="nav_followed_tags">フォロー済タグ</string>
-    <string name="nav_public_activities">公開アクティビティ</string>
-    <string name="nav_reports">報告</string>
-    <string name="share__share_link_as_text">テキストとしてリンクをシェア</string>
-    <string name="share__share_screenshot">Web ページのスクリーン ショットをシェア</string>
-    <string name="share__take_screenshot">Web ページのスクリーン ショットを撮る</string>
-    <string name="share__toast_saved_image_to_location">画像を保存中</string>
-    <string name="share__toast_screenshot">スクリーンショットを保存中:</string>
-    <string name="share__toast_link_address_copied">リンク アドレスをコピーしました &#8230;</string>
+    <string name="more">さらに</string>
+    <string name="help_license">概要 |ヘルプ</string>
+    <string name="followed_tags">フォロー済タグ</string>
+    <string name="public_activities">公開アクティビティ</string>
+    <string name="reports">報告</string>
+    <string name="share_link_as_text">テキストとしてリンクをシェア</string>
+    <string name="share_screenshot_of_webpage">Web ページのスクリーン ショットをシェア</string>
+    <string name="take_screenshot_of_webpage">Web ページのスクリーン ショットを撮る</string>
+    <string name="saving_image_to">画像を保存中</string>
+    <string name="saving_screenshot_as">スクリーンショットを保存中:</string>
+    <string name="link_adress_copied">リンク アドレスをコピーしました &#8230;</string>
     <string name="new_post">新しい投稿</string>
-    <string name="action_go_to_top">先頭に移動</string>
-    <string name="action_search_by_tags_or_persons">タグまたは人で検索</string>
-    <string name="action_exit_app">アプリを終了</string>
-    <string name="action_toggle_desktop_page">モバイル/デスクトップ表示の切り替え</string>
-    <string name="action_share_dotdotdot">シェア&#8230;</string>
-    <string name="search_alert_tag">タグ別</string>
-    <string name="search_alert_people">人別</string>
-    <string name="search_alert_bypeople_validate_needsomedata">名前を追加してください</string>
-    <string name="context_menu_share_link">リンク アドレスをシェア</string>
-    <string name="context_menu_save_image">画像を保存</string>
-    <string name="context_menu_share_image">画像をシェア</string>
-    <string name="context_menu_open_external_browser">外部ブラウザーで開く&#8230;</string>
-    <string name="copy_link_to_clipboard">リンクアドレスをクリップボードへコピー</string>
-    <string name="context_menu_copy_image_link">画像のアドレスをクリップボードへコピー</string>
+    <string name="go_to_top">先頭に移動</string>
+    <string name="search_by_tags_or_persons__appspecific">タグまたは人で検索</string>
+    <string name="exit_app">アプリを終了</string>
+    <string name="toggle_mobile_desktop_view">モバイル/デスクトップ表示の切り替え</string>
+    <string name="share_dotdotdot">シェア&#8230;</string>
+    <string name="by_tags">タグ別</string>
+    <string name="by_people">人別</string>
+    <string name="please_add_a_name">名前を追加してください</string>
+    <string name="share_link_address">リンク アドレスをシェア</string>
+    <string name="save_image">画像を保存</string>
+    <string name="share_image">画像をシェア</string>
+    <string name="open_in_external_browser">外部ブラウザーで開く&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">リンクアドレスをクリップボードへコピー</string>
+    <string name="copy_image_address_to_clipboard">画像のアドレスをクリップボードへコピー</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">画像を読み込むことができません</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">スクリーン ショットを保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後でスクリーン ショット機能を使用する場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - dandelion* を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
-    <string name="permissions_image">画像を保存/アップロードするために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - dandelion* を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
+    <string name="screenshot_permission__appspecific">スクリーン ショットを保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後でスクリーン ショット機能を使用する場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - dandelion* を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
+    <string name="image_permission_description__appspecific">画像を保存/アップロードするために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - dandelion* を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
     <string name="permission_denied">アクセスが拒否されました。</string>
     <string name="permission_granted_try_again">アクセスを許可しました。もう一度やり直してください。</string>
-    <string name="podselection__custom_pod">カスタム ポッド</string>
+    <string name="custom_pod">カスタム ポッド</string>
     <string name="pod_name">ポッド名</string>
-    <string name="http_protocol">プロトコル</string>
+    <string name="protocol">プロトコル</string>
     <string name="pod_address">ポッドのアドレス</string>
     <string name="missing_value">値がありません</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">ストリームの最後に訪れたページに移動しますか?</string>
-    <string name="pref_summary__is_statusbar_hidden">メイン画面のステータスバーを非表示にします</string>
-    <string name="pref_title__is_statusbar_hidden">ステータスバーを非表示</string>
-    <string name="pref_summary__show_title">メインビューにタイトルを表示します</string>
-    <string name="pref_title__show_title">タイトルを表示</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">ストリームの最後に訪れたページに移動しますか?</string>
+    <string name="hide_statusbar_in_mainview">メイン画面のステータスバーを非表示にします</string>
+    <string name="hide_statusbar">ステータスバーを非表示</string>
+    <string name="show_title_in_main_view">メインビューにタイトルを表示します</string>
+    <string name="show_title">タイトルを表示</string>
 
     <string name="about">アプリについて</string>
     <string name="license">ライセンス</string>
@@ -118,29 +118,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">上部ツールバーでストリームを読み込み</string>
-    <string name="pref_desc__topbar_stream_shortcut">上部ツールバーの空白部分をクリックして、ストリームを開きます。</string>
+    <string name="top_toolbar_loads_stream__appsp">上部ツールバーでストリームを読み込み</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">上部ツールバーの空白部分をクリックして、ストリームを開きます。</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">外観</string>
-    <string name="pref_cat__network">ネットワーク</string>
-    <string name="pref_cat__pod_settings">ポッドの設定</string>
-    <string name="pref_cat__operability">操作性</string>
+    <string name="appearance">外観</string>
+    <string name="network">ネットワーク</string>
+    <string name="pod_settings__appspecfic">ポッドの設定</string>
+    <string name="operability">操作性</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">ナビゲーション スライダー</string>
-    <string name="pref_desc__sub_nav_slider">ナビゲーションドロワー内のエントリーの表示を制御します</string>
-    <string name="pref_cat__visibility_nav_items__user">ユーザー</string>
-    <string name="pref_cat__visibility_nav_items__general">一般</string>
-    <string name="pref_cat__visibility_nav_items__admin">管理</string>
+    <string name="navigation_drawer">ナビゲーション スライダー</string>
+    <string name="control_visibility_of_entries_nav_drawer">ナビゲーションドロワー内のエントリーの表示を制御します</string>
+    <string name="user">ユーザー</string>
+    <string name="general">一般</string>
+    <string name="admin">管理</string>
     <!-- Themes -->
-    <string name="pref_title__themes">テーマと色</string>
-    <string name="pref_desc__themes">アプリ全体で使用される色を制御します</string>
-    <string name="pref_title__primary_color">プライマリ色</string>
-    <string name="pref_desc__primary_color">ツールバーの色</string>
-    <string name="pref_title__accent_color">アクセント色</string>
-    <string name="pref_desc__accent_color">プログレスバーの色</string>
+    <string name="theme_and_colors">テーマと色</string>
+    <string name="control_which_colors_are_used_in_app">アプリ全体で使用される色を制御します</string>
+    <string name="primary_colors">プライマリ色</string>
+    <string name="colors_of_toolbars">ツールバーの色</string>
+    <string name="accent_color">アクセント色</string>
+    <string name="color_of_progressbar">プログレスバーの色</string>
     <string name="amoled_mode">AMOLED モード</string>
-    <string name="pref_desc__primary_color__amoled_mode">アプリの多くの部分を AMOLED フレンドリーな黒色の表示で上書きします。この設定を切り替えるには再起動する必要があります。ダイアスポラ* を暗く参照するには、ダイアスポラ* の個人アカウント設定にある、ダークテーマをアクティブにする必要があります。</string>
+    <string name="amoled_mode_description__app_specific">アプリの多くの部分を AMOLED フレンドリーな黒色の表示で上書きします。この設定を切り替えるには再起動する必要があります。ダイアスポラ* を暗く参照するには、ダイアスポラ* の個人アカウント設定にある、ダークテーマをアクティブにする必要があります。</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">拡張通知</string>
     <string name="extendend_notifications_bell_description__appspecific">通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index dc4fa061..a0be52a2 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -19,63 +19,63 @@
     <string name="changelog">Amaynut</string>
     <string name="statistics">Tidaddanin</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Meṛṛa ilɣa</string>
-    <string name="notifications__also_commented">Iwennet daɣen</string>
-    <string name="notifications__comment_on_post">Iwenniten ɣef yizen</string>
-    <string name="notifications__liked">Aḥemmel</string>
-    <string name="notifications__mentioned">Tummliwin</string>
-    <string name="notifications__reshared">Yules beṭṭu</string>
-    <string name="notifications__started_sharing">Yebda beṭṭu</string>
+    <string name="all_notifications">Meṛṛa ilɣa</string>
+    <string name="also_commented">Iwennet daɣen</string>
+    <string name="comment_on_post">Iwenniten ɣef yizen</string>
+    <string name="deleteme_____1">Aḥemmel</string>
+    <string name="mentioned">Tummliwin</string>
+    <string name="reshared">Yules beṭṭu</string>
+    <string name="started_sharing">Yebda beṭṭu</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Tuccḍa: Ur iemir ara ad d-yawi tabdart n ipoden!</string>
-    <string name="no_internet">Suref-aɣ, yessefk ad teqqneḍ ar Internet akken ad tkemmleḍ</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Tuccḍa: Ur iemir ara ad d-yawi tabdart n ipoden!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Suref-aɣ, yessefk ad teqqneḍ ar Internet akken ad tkemmleḍ</string>
     <string name="confirmation">Asentem</string>
-    <string name="confirm_exit">Tebɣiḍ ad teffɣeḍ?</string>
+    <string name="do_you_want_to_exit">Tebɣiḍ ad teffɣeḍ?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Ugar</string>
-    <string name="nav_help_license">Ɣef | Tallelt</string>
-    <string name="nav_followed_tags">Tibzimin yettwaḍefren</string>
-    <string name="nav_public_activities">Irmuden izuyaz</string>
-    <string name="nav_reports">Ineqqisen</string>
-    <string name="share__share_link_as_text">Bḍu aseɣwen am uḍris</string>
-    <string name="share__share_screenshot">Bḍu tuṭṭfa n ugdil n usmel web</string>
-    <string name="share__take_screenshot">Ṭṭef agdil n usmel web</string>
-    <string name="share__toast_saved_image_to_location">Asekles n tugna ar</string>
-    <string name="share__toast_screenshot">Asekles n tuṭṭfa s yisem:</string>
-    <string name="share__toast_link_address_copied">Aseɣwen yettwanɣel&#8230;</string>
+    <string name="more">Ugar</string>
+    <string name="help_license">Ɣef | Tallelt</string>
+    <string name="followed_tags">Tibzimin yettwaḍefren</string>
+    <string name="public_activities">Irmuden izuyaz</string>
+    <string name="reports">Ineqqisen</string>
+    <string name="share_link_as_text">Bḍu aseɣwen am uḍris</string>
+    <string name="share_screenshot_of_webpage">Bḍu tuṭṭfa n ugdil n usmel web</string>
+    <string name="take_screenshot_of_webpage">Ṭṭef agdil n usmel web</string>
+    <string name="saving_image_to">Asekles n tugna ar</string>
+    <string name="saving_screenshot_as">Asekles n tuṭṭfa s yisem:</string>
+    <string name="link_adress_copied">Aseɣwen yettwanɣel&#8230;</string>
     <string name="new_post">Izen n uɣrab amaynut</string>
-    <string name="action_go_to_top">Ddu ar usnas</string>
-    <string name="action_search_by_tags_or_persons">Anadi s tebqzimin neɣ s imdanen</string>
-    <string name="action_exit_app">Ffeɣ seg usnas</string>
-    <string name="action_toggle_desktop_page">Rmed/Sens timeẓri aselkim/aziraz</string>
-    <string name="action_share_dotdotdot">Bḍu&#8230;</string>
-    <string name="search_alert_tag">s tebzimin</string>
-    <string name="search_alert_people">s imdanen</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Rnu isem</string>
-    <string name="context_menu_share_link">Bḍu tansa n useɣwen</string>
-    <string name="context_menu_save_image">Sekles tugna</string>
-    <string name="context_menu_share_image">Bḍu tugna</string>
-    <string name="context_menu_open_external_browser">Ldi deg iminig azɣaray&#8230;</string>
-    <string name="copy_link_to_clipboard">Nɣel aseɣwen ɣef afus</string>
-    <string name="context_menu_copy_image_link">Nɣel tugna ɣef afus</string>
+    <string name="go_to_top">Ddu ar usnas</string>
+    <string name="search_by_tags_or_persons__appspecific">Anadi s tebqzimin neɣ s imdanen</string>
+    <string name="exit_app">Ffeɣ seg usnas</string>
+    <string name="toggle_mobile_desktop_view">Rmed/Sens timeẓri aselkim/aziraz</string>
+    <string name="share_dotdotdot">Bḍu&#8230;</string>
+    <string name="by_tags">s tebzimin</string>
+    <string name="by_people">s imdanen</string>
+    <string name="please_add_a_name">Rnu isem</string>
+    <string name="share_link_address">Bḍu tansa n useɣwen</string>
+    <string name="save_image">Sekles tugna</string>
+    <string name="share_image">Bḍu tugna</string>
+    <string name="open_in_external_browser">Ldi deg iminig azɣaray&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Nɣel aseɣwen ɣef afus</string>
+    <string name="copy_image_address_to_clipboard">Nɣel tugna ɣef afus</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Ur izmir ara ad d-isali tugna</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Yessefk ad tmuddeḍ tasiregt \"Snifel neɣ kkes agbur di tkarḍa Sd \" akken ad teskelseḍ tuṭṭfiwin n ugdil. Sakin, yessefk ad tmedleḍ asnas neɣ ad talseḍ tanekra n tiliɣri-ik. Ma yella ur tmuddeḍ ara tasiregt n unelcum ar umḍiq n usekles acu kan tebɣiḍ ad tesqedceḍ tamahilt n tuṭṭfa n ugdil ar zdat, yessefk ad tmuddeḍ tasiregt ticki. Ma ulac aṣili ldi: Iɣewwaren  - isnasen - dandelion*. Di tgezmi Tisirag, yessefk ad tmuddeḍ tasiregt \"Snifel neɣ kkes agbur n tkarḍa Sd\".</string>
-    <string name="permissions_image">Yessefk ad tmuddeḍ tasiregt \"Mudd tisirag n usekles \" akken ad teskelseḍ/ad tessaliḍ
+    <string name="screenshot_permission__appspecific">Yessefk ad tmuddeḍ tasiregt \"Snifel neɣ kkes agbur di tkarḍa Sd \" akken ad teskelseḍ tuṭṭfiwin n ugdil. Sakin, yessefk ad tmedleḍ asnas neɣ ad talseḍ tanekra n tiliɣri-ik. Ma yella ur tmuddeḍ ara tasiregt n unelcum ar umḍiq n usekles acu kan tebɣiḍ ad tesqedceḍ tamahilt n tuṭṭfa n ugdil ar zdat, yessefk ad tmuddeḍ tasiregt ticki. Ma ulac aṣili ldi: Iɣewwaren  - isnasen - dandelion*. Di tgezmi Tisirag, yessefk ad tmuddeḍ tasiregt \"Snifel neɣ kkes agbur n tkarḍa Sd\".</string>
+    <string name="image_permission_description__appspecific">Yessefk ad tmuddeḍ tasiregt \"Mudd tisirag n usekles \" akken ad teskelseḍ/ad tessaliḍ
         tiwlafin. Sakin, yessefk ad tmedleḍ asnas neɣ ad talseḍ tanekra n tiliɣri-ik. Ma yella ur tmuddeḍ ara tasiregt n unekcum 
         ar umḍiq n usekles acu kan tebɣiḍ ad tesqedceḍ tamahilt n tuṭṭfa n ugdil ar zdat, yessefk ad tmuddeḍ tasiregt ticki. Ma ulac aṣili ldi: Iɣewwaren  - isnasen - 
         dandelion*. Di tgezmi Tisirag, yessefk ad tmuddeḍ tasiregt \"Tisiragt n usekles n tira\".</string>
     <string name="permission_denied">Tasiregt tettwagi.</string>
     <string name="permission_granted_try_again">Tasiregt tettunefk. Ɛreḍ tikelt nniḍen.</string>
-    <string name="podselection__custom_pod">Apod udmawan</string>
+    <string name="custom_pod">Apod udmawan</string>
     <string name="pod_name">Isem n upod</string>
-    <string name="http_protocol">Aneggaf</string>
+    <string name="protocol">Aneggaf</string>
     <string name="pod_address">Tansa n upod</string>
     <string name="missing_value">Azal yettwazgel</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Ddu ar usebter aneggaru yettwarzan deg usuddem?</string>
-    <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="jump_to_last_visited_page_in_stream__appspecific">Ddu ar usebter aneggaru yettwarzan deg usuddem?</string>
+    <string name="hide_statusbar_in_mainview">Ffer afeggag n waddad di tmeẓri tagejdant</string>
+    <string name="hide_statusbar">Ffer afeggag n waddad</string>
 
     <string name="about">Γef</string>
     <string name="license">Turagt</string>
@@ -119,29 +119,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Afeggag n ufella yessalay-d asuddem</string>
-    <string name="pref_desc__topbar_stream_shortcut">Sit ɣef tallunt tilemt n ufella akken ad d-ldiḍ asuddem</string>
+    <string name="top_toolbar_loads_stream__appsp">Afeggag n ufella yessalay-d asuddem</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Sit ɣef tallunt tilemt n ufella akken ad d-ldiḍ asuddem</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Udem</string>
-    <string name="pref_cat__network">Aẓeṭṭa</string>
-    <string name="pref_cat__pod_settings">Iɣewwaṛen Pod</string>
-    <string name="pref_cat__operability">Tasnemhelt</string>
+    <string name="appearance">Udem</string>
+    <string name="network">Aẓeṭṭa</string>
+    <string name="pod_settings__appspecfic">Iɣewwaṛen Pod</string>
+    <string name="operability">Tasnemhelt</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Taḥnaccaḍt n iminig</string>
-    <string name="pref_desc__sub_nav_slider">Ad iqareɛ askan n inekcam deg ugalis n tunigin</string>
-    <string name="pref_cat__visibility_nav_items__user">Aseqdac</string>
-    <string name="pref_cat__visibility_nav_items__general">Amatu</string>
-    <string name="pref_cat__visibility_nav_items__admin">Anedbal</string>
+    <string name="navigation_drawer">Taḥnaccaḍt n iminig</string>
+    <string name="control_visibility_of_entries_nav_drawer">Ad iqareɛ askan n inekcam deg ugalis n tunigin</string>
+    <string name="user">Aseqdac</string>
+    <string name="general">Amatu</string>
+    <string name="admin">Anedbal</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Isental d yiniten</string>
-    <string name="pref_desc__themes">Ad iqareɛ initen yettwasqedcen i usnas</string>
-    <string name="pref_title__primary_color">Ini amezwaru</string>
-    <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="theme_and_colors">Isental d yiniten</string>
+    <string name="control_which_colors_are_used_in_app">Ad iqareɛ initen yettwasqedcen i usnas</string>
+    <string name="primary_colors">Ini amezwaru</string>
+    <string name="colors_of_toolbars">Ini n ufeggag n ifecka</string>
+    <string name="accent_color">Ini asnawan</string>
+    <string name="color_of_progressbar">Ini n ufeggag n usfari</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 01287926..a38bf313 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -19,58 +19,58 @@
     <string name="changelog">അടയാളപ്പെടുത്തിയ മാറ്റങ്ങൾ</string>
     <string name="statistics">സ്ഥിതിവിവരക്കണക്ക്</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">എല്ലാ അറിയിപ്പുകളും</string>
-    <string name="notifications__also_commented">അഭിപ്രായപ്പെട്ടു</string>
-    <string name="notifications__comment_on_post">പോസ്റ്റിൽ അഭിപ്രായപ്പെടുക</string>
-    <string name="notifications__liked">ലൈക്ക് ചെയ്തു</string>
-    <string name="notifications__mentioned">പ്രസ്താവിച്ചു</string>
-    <string name="notifications__reshared">വീണ്ടും ഷെയർ ചെയ്തു</string>
-    <string name="notifications__started_sharing">ഷെയർ ചെയ്യാൻ തുടങ്ങി</string>
+    <string name="all_notifications">എല്ലാ അറിയിപ്പുകളും</string>
+    <string name="also_commented">അഭിപ്രായപ്പെട്ടു</string>
+    <string name="comment_on_post">പോസ്റ്റിൽ അഭിപ്രായപ്പെടുക</string>
+    <string name="deleteme_____1">ലൈക്ക് ചെയ്തു</string>
+    <string name="mentioned">പ്രസ്താവിച്ചു</string>
+    <string name="reshared">വീണ്ടും ഷെയർ ചെയ്തു</string>
+    <string name="started_sharing">ഷെയർ ചെയ്യാൻ തുടങ്ങി</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">പിഴവ്: പോഡുകളുടെ പട്ടിക പുതുക്കുവാൻ കഴിയുന്നില്ല!</string>
-    <string name="no_internet">ക്ഷമിക്കുക, നിങ്ങൾക്ക് മുന്നോട്ട് പോകുവാൻ ഇന്റർനെറ്റ് ബന്ധം ആവശ്യമാണ്</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">പിഴവ്: പോഡുകളുടെ പട്ടിക പുതുക്കുവാൻ കഴിയുന്നില്ല!</string>
+    <string name="sorry_need_to_be_connected_to_internet">ക്ഷമിക്കുക, നിങ്ങൾക്ക് മുന്നോട്ട് പോകുവാൻ ഇന്റർനെറ്റ് ബന്ധം ആവശ്യമാണ്</string>
     <string name="confirmation">ഉറപ്പാക്കൽ</string>
-    <string name="confirm_exit">നിങ്ങൾക്ക് പുറത്തുകടക്കണോ?</string>
+    <string name="do_you_want_to_exit">നിങ്ങൾക്ക് പുറത്തുകടക്കണോ?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">കൂടുതൽ</string>
-    <string name="nav_help_license">അതേക്കുറിച്ചു | സഹായം</string>
-    <string name="nav_followed_tags">പിന്തുടർന്ന ടാഗുകൾ</string>
-    <string name="nav_public_activities">പൊതു പ്രവർത്തനങ്ങൾ</string>
-    <string name="nav_reports">റിപ്പോർട്ടുകൾ</string>
-    <string name="share__share_link_as_text">ലിങ്ക് ടെക്സ്റ്റായി പങ്കുവയ്ക്കുക</string>
-    <string name="share__share_screenshot">വെബ്‌പേജിന്റെ സ്ക്രീൻഷോട്ട് പങ്കുവയ്ക്കുക</string>
-    <string name="share__take_screenshot">വെബ്‌പേജിന്റെ സ്ക്രീൻഷോട്ട് എടുക്കുക</string>
-    <string name="share__toast_saved_image_to_location">ചിത്രം സംരക്ഷിക്കേണ്ട സ്ഥലം</string>
-    <string name="share__toast_screenshot">സ്ക്രീൻഷോട്ട് സംരക്ഷിക്കേണ്ട ഫോർമാറ്റ്:</string>
-    <string name="share__toast_link_address_copied">ലിങ്കിന്റെ വിലാസം പകർത്തി&#8230;</string>
+    <string name="more">കൂടുതൽ</string>
+    <string name="help_license">അതേക്കുറിച്ചു | സഹായം</string>
+    <string name="followed_tags">പിന്തുടർന്ന ടാഗുകൾ</string>
+    <string name="public_activities">പൊതു പ്രവർത്തനങ്ങൾ</string>
+    <string name="reports">റിപ്പോർട്ടുകൾ</string>
+    <string name="share_link_as_text">ലിങ്ക് ടെക്സ്റ്റായി പങ്കുവയ്ക്കുക</string>
+    <string name="share_screenshot_of_webpage">വെബ്‌പേജിന്റെ സ്ക്രീൻഷോട്ട് പങ്കുവയ്ക്കുക</string>
+    <string name="take_screenshot_of_webpage">വെബ്‌പേജിന്റെ സ്ക്രീൻഷോട്ട് എടുക്കുക</string>
+    <string name="saving_image_to">ചിത്രം സംരക്ഷിക്കേണ്ട സ്ഥലം</string>
+    <string name="saving_screenshot_as">സ്ക്രീൻഷോട്ട് സംരക്ഷിക്കേണ്ട ഫോർമാറ്റ്:</string>
+    <string name="link_adress_copied">ലിങ്കിന്റെ വിലാസം പകർത്തി&#8230;</string>
     <string name="new_post">പുതിയ പോസ്റ്റ്</string>
-    <string name="action_go_to_top">മുകളിലേക്ക് പോകുക</string>
-    <string name="action_search_by_tags_or_persons">ടാഗുകളെയോ വ്യക്തികളെയോ തിരയുക</string>
-    <string name="action_exit_app">ആപ്പിന് പുറത്തുകടക്കുക</string>
-    <string name="action_toggle_desktop_page">മൊബൈൽ/ഡെസ്ക്ടോപ്പ് വ്യൂവിലേക്ക് മാറുക</string>
-    <string name="action_share_dotdotdot">പങ്കുവയ്ക്കുക&#8230;</string>
-    <string name="search_alert_tag">ടാഗുകളെ</string>
-    <string name="search_alert_people">ആളുകളെ</string>
-    <string name="search_alert_bypeople_validate_needsomedata">പേര് ചേർക്കുക</string>
-    <string name="context_menu_share_link">ലിങ്ക് വിലാസം പങ്കുവയ്ക്കുക</string>
-    <string name="context_menu_save_image">ചിത്രം സംരക്ഷിക്കുക</string>
-    <string name="context_menu_share_image">ചിത്രം പങ്കുവയ്ക്കുക</string>
-    <string name="context_menu_open_external_browser">പുറമെയുള്ള ബ്രൗസറിൽ തുറക്കുക&#8230;</string>
-    <string name="copy_link_to_clipboard">ലിങ്ക് വിലാസം ക്ലിപ്ബോർഡിലേക്ക് പകർത്തുക</string>
-    <string name="context_menu_copy_image_link">ചിത്രത്തിന്റെ വിലാസം ക്ലിപ്ബോർഡിലേക്ക് പകർത്തുക</string>
+    <string name="go_to_top">മുകളിലേക്ക് പോകുക</string>
+    <string name="search_by_tags_or_persons__appspecific">ടാഗുകളെയോ വ്യക്തികളെയോ തിരയുക</string>
+    <string name="exit_app">ആപ്പിന് പുറത്തുകടക്കുക</string>
+    <string name="toggle_mobile_desktop_view">മൊബൈൽ/ഡെസ്ക്ടോപ്പ് വ്യൂവിലേക്ക് മാറുക</string>
+    <string name="share_dotdotdot">പങ്കുവയ്ക്കുക&#8230;</string>
+    <string name="by_tags">ടാഗുകളെ</string>
+    <string name="by_people">ആളുകളെ</string>
+    <string name="please_add_a_name">പേര് ചേർക്കുക</string>
+    <string name="share_link_address">ലിങ്ക് വിലാസം പങ്കുവയ്ക്കുക</string>
+    <string name="save_image">ചിത്രം സംരക്ഷിക്കുക</string>
+    <string name="share_image">ചിത്രം പങ്കുവയ്ക്കുക</string>
+    <string name="open_in_external_browser">പുറമെയുള്ള ബ്രൗസറിൽ തുറക്കുക&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">ലിങ്ക് വിലാസം ക്ലിപ്ബോർഡിലേക്ക് പകർത്തുക</string>
+    <string name="copy_image_address_to_clipboard">ചിത്രത്തിന്റെ വിലാസം ക്ലിപ്ബോർഡിലേക്ക് പകർത്തുക</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">ചിത്രം ലോഡ് ചെയ്യാൻ സാധിക്കുന്നില്ല</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">സ്ക്രീന്ഷോട്ടുകൾ സംരക്ഷിക്കാൻ \"സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുമതി\" നിങ്ങൾ നൽകണം. അതിനു ശേഷം ഈ ആപ്പ് പൂർണമായും അടയ്ക്കുകയോ ഉപകരണം വീണ്ടും തുടങ്ങുകയോ ചെയ്യുക. ഇനി നിങ്ങൾക്ക് സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുവാദം തരാൻ പറ്റാതിരിക്കുകയും  പക്ഷെ പിന്നീട് സ്ക്രീൻഷോട്ട്  ഉപയോഗിക്കുകയും ചെയ്യണമെങ്കിൽ, നിങ്ങൾക്ക് അനുവാദം പിന്നീട് നല്കാനാവും. അതിനായി സിസ്റ്റം ക്രമീകരണങ്ങൾ- ആപ്പുകൾ- ഡാൻഡേലിയൻ* തുറക്കുക. അതിൽ പെർമിഷൻ വിഭാഗത്തിൽ \"സ്റ്റോറേജിൽ എഴുതുവാനുള്ള അനുമതി\" നൽകുക.</string>
-    <string name="permissions_image">ചിത്രങ്ങൾ സംരക്ഷിക്കാൻ/അപ്ലോഡ് ചെയ്യാൻ \"സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുമതി\" നിങ്ങൾ നൽകണം. അതിനു ശേഷം ഈ ആപ്പ് പൂർണമായും അടയ്ക്കുകയോ ഉപകരണം വീണ്ടും തുടങ്ങുകയോ ചെയ്യുക. ഇനി നിങ്ങൾക്ക് സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുവാദം തരാൻ പറ്റാതിരിക്കുകയും  പക്ഷെ പിന്നീട് ചിത്രങ്ങൾ സംരക്ഷിക്കുകയും ചെയ്യണമെങ്കിൽ, നിങ്ങൾക്ക് അനുവാദം പിന്നീട് നല്കാനാവും. അതിനായി സിസ്റ്റം ക്രമീകരണങ്ങൾ- ആപ്പുകൾ- ഡാൻഡേലിയൻ* തുറക്കുക. അതിൽ പെർമിഷൻ വിഭാഗത്തിൽ \"സ്റ്റോറേജിൽ എഴുതുവാനുള്ള അനുമതി\" നൽകുക.</string>
+    <string name="screenshot_permission__appspecific">സ്ക്രീന്ഷോട്ടുകൾ സംരക്ഷിക്കാൻ \"സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുമതി\" നിങ്ങൾ നൽകണം. അതിനു ശേഷം ഈ ആപ്പ് പൂർണമായും അടയ്ക്കുകയോ ഉപകരണം വീണ്ടും തുടങ്ങുകയോ ചെയ്യുക. ഇനി നിങ്ങൾക്ക് സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുവാദം തരാൻ പറ്റാതിരിക്കുകയും  പക്ഷെ പിന്നീട് സ്ക്രീൻഷോട്ട്  ഉപയോഗിക്കുകയും ചെയ്യണമെങ്കിൽ, നിങ്ങൾക്ക് അനുവാദം പിന്നീട് നല്കാനാവും. അതിനായി സിസ്റ്റം ക്രമീകരണങ്ങൾ- ആപ്പുകൾ- ഡാൻഡേലിയൻ* തുറക്കുക. അതിൽ പെർമിഷൻ വിഭാഗത്തിൽ \"സ്റ്റോറേജിൽ എഴുതുവാനുള്ള അനുമതി\" നൽകുക.</string>
+    <string name="image_permission_description__appspecific">ചിത്രങ്ങൾ സംരക്ഷിക്കാൻ/അപ്ലോഡ് ചെയ്യാൻ \"സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുമതി\" നിങ്ങൾ നൽകണം. അതിനു ശേഷം ഈ ആപ്പ് പൂർണമായും അടയ്ക്കുകയോ ഉപകരണം വീണ്ടും തുടങ്ങുകയോ ചെയ്യുക. ഇനി നിങ്ങൾക്ക് സ്റ്റോറേജ് ഉപയോഗിക്കാനുള്ള അനുവാദം തരാൻ പറ്റാതിരിക്കുകയും  പക്ഷെ പിന്നീട് ചിത്രങ്ങൾ സംരക്ഷിക്കുകയും ചെയ്യണമെങ്കിൽ, നിങ്ങൾക്ക് അനുവാദം പിന്നീട് നല്കാനാവും. അതിനായി സിസ്റ്റം ക്രമീകരണങ്ങൾ- ആപ്പുകൾ- ഡാൻഡേലിയൻ* തുറക്കുക. അതിൽ പെർമിഷൻ വിഭാഗത്തിൽ \"സ്റ്റോറേജിൽ എഴുതുവാനുള്ള അനുമതി\" നൽകുക.</string>
     <string name="permission_denied">അനുമതി നിരസിച്ചിരിക്കുന്നു.</string>
     <string name="permission_granted_try_again">അനുമതി നൽകിയിരിക്കുന്നു. വീണ്ടും ശ്രമിക്കുക.</string>
-    <string name="podselection__custom_pod">കസ്റ്റം പോഡ്</string>
+    <string name="custom_pod">കസ്റ്റം പോഡ്</string>
     <string name="pod_name">പോഡിന്റെ പേര്</string>
-    <string name="http_protocol">പ്രോട്ടോകോൾ</string>
+    <string name="protocol">പ്രോട്ടോകോൾ</string>
     <string name="pod_address">പോഡ് വിലാസം</string>
     <string name="missing_value">കാണാതായ മൂല്യം</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">സ്ട്രീമിലെ അവസാനമായി സന്ദർശിച്ച പേജിലേക്ക് പോകുക?</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">സ്ട്രീമിലെ അവസാനമായി സന്ദർശിച്ച പേജിലേക്ക് പോകുക?</string>
 
     <string name="about">കുറിച്ച്</string>
     <string name="license">ലൈസൻസ്</string>
@@ -91,29 +91,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">മുകളിലെ ടൂൾബാർ സ്‌ട്രീം ലോഡ് ചെയ്യുന്നു</string>
-    <string name="pref_desc__topbar_stream_shortcut">ടൂൾബാറിലെ ഒഴിഞ്ഞ സ്ഥലത്തു ക്ലിക്ക് ചെയ്തു സ്‌ട്രീം തുറക്കുക</string>
+    <string name="top_toolbar_loads_stream__appsp">മുകളിലെ ടൂൾബാർ സ്‌ട്രീം ലോഡ് ചെയ്യുന്നു</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">ടൂൾബാറിലെ ഒഴിഞ്ഞ സ്ഥലത്തു ക്ലിക്ക് ചെയ്തു സ്‌ട്രീം തുറക്കുക</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">രൂപം</string>
-    <string name="pref_cat__network">ശൃംഖല</string>
-    <string name="pref_cat__pod_settings">പോഡ് ക്രമീകരണങ്ങൾ</string>
-    <string name="pref_cat__operability">പ്രവർത്തിക്കുവാൻ കഴിയുന്നത്</string>
+    <string name="appearance">രൂപം</string>
+    <string name="network">ശൃംഖല</string>
+    <string name="pod_settings__appspecfic">പോഡ് ക്രമീകരണങ്ങൾ</string>
+    <string name="operability">പ്രവർത്തിക്കുവാൻ കഴിയുന്നത്</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">നാവിഗേഷൻ സ്ലൈഡർ</string>
-    <string name="pref_desc__sub_nav_slider">നാവിഗേഷൻ വലിപ്പിലെ രേഖപ്പെടുത്തലുകളുടെ കാഴ്ച്ച നിയന്ത്രിക്കുക</string>
-    <string name="pref_cat__visibility_nav_items__user">ഉപയോക്താവ്</string>
-    <string name="pref_cat__visibility_nav_items__general">പൊതു</string>
-    <string name="pref_cat__visibility_nav_items__admin">അഡ്മിൻ</string>
+    <string name="navigation_drawer">നാവിഗേഷൻ സ്ലൈഡർ</string>
+    <string name="control_visibility_of_entries_nav_drawer">നാവിഗേഷൻ വലിപ്പിലെ രേഖപ്പെടുത്തലുകളുടെ കാഴ്ച്ച നിയന്ത്രിക്കുക</string>
+    <string name="user">ഉപയോക്താവ്</string>
+    <string name="general">പൊതു</string>
+    <string name="admin">അഡ്മിൻ</string>
     <!-- Themes -->
-    <string name="pref_title__themes">തീമും നിറവും</string>
-    <string name="pref_desc__themes">ആപ്പിൽ മൊത്തമായി ഉപയോഗിക്കുന്ന നിറങ്ങൾ ക്രമീകരിക്കുക</string>
-    <string name="pref_title__primary_color">പ്രധാന നിറം</string>
-    <string name="pref_desc__primary_color">ടൂൾബാറുകളുടെ നിറം</string>
-    <string name="pref_title__accent_color">എടുത്തുകാണിക്കുന്ന നിറം</string>
-    <string name="pref_desc__accent_color">പ്രോഗ്രസ് ബാറിന്റെ നിറം</string>
+    <string name="theme_and_colors">തീമും നിറവും</string>
+    <string name="control_which_colors_are_used_in_app">ആപ്പിൽ മൊത്തമായി ഉപയോഗിക്കുന്ന നിറങ്ങൾ ക്രമീകരിക്കുക</string>
+    <string name="primary_colors">പ്രധാന നിറം</string>
+    <string name="colors_of_toolbars">ടൂൾബാറുകളുടെ നിറം</string>
+    <string name="accent_color">എടുത്തുകാണിക്കുന്ന നിറം</string>
+    <string name="color_of_progressbar">പ്രോഗ്രസ് ബാറിന്റെ നിറം</string>
     <string name="amoled_mode">അമോൾഡ് മോഡ്</string>
-    <string name="pref_desc__primary_color__amoled_mode">അമോലെഡ് ഡിസ്പ്ലേ സൗഹൃദമായ കറുപ്പ് നിറം ആപ്പിന്റെ പല ഭാഗങ്ങളിലും മറ്റു നിറങ്ങളെ മറികടക്കും. ഈ ക്രമീകരണം മാറ്റുവാൻ ആപ്പ് വീണ്ടും തുറക്കേണ്ടി വരും. നിങ്ങളുടെ സ്വകാര്യ ഡയസ്പോറ* അകൗണ്ട് ക്രമീകരണങ്ങളിലെ ഇരുണ്ട തീം പ്രയോഗിച്ചാൽ ഡയസ്പോറ* നിങ്ങൾക്ക് ഇരുണ്ട പശ്ചാത്തലത്തിൽ ഉപയോഗിക്കാം.</string>
+    <string name="amoled_mode_description__app_specific">അമോലെഡ് ഡിസ്പ്ലേ സൗഹൃദമായ കറുപ്പ് നിറം ആപ്പിന്റെ പല ഭാഗങ്ങളിലും മറ്റു നിറങ്ങളെ മറികടക്കും. ഈ ക്രമീകരണം മാറ്റുവാൻ ആപ്പ് വീണ്ടും തുറക്കേണ്ടി വരും. നിങ്ങളുടെ സ്വകാര്യ ഡയസ്പോറ* അകൗണ്ട് ക്രമീകരണങ്ങളിലെ ഇരുണ്ട തീം പ്രയോഗിച്ചാൽ ഡയസ്പോറ* നിങ്ങൾക്ക് ഇരുണ്ട പശ്ചാത്തലത്തിൽ ഉപയോഗിക്കാം.</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">വ്യാപിപ്പിച്ച വിജ്ഞാപനങ്ങൾ</string>
     <string name="extendend_notifications_bell_description__appspecific">വിജ്ഞാപന വിഭാഗങ്ങൾ കാണിക്കുന്ന താഴേക്ക് വലിക്കാവുന്ന മെനുവിൽ വിജ്ഞാപന മണി വലുതാക്കുക</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1956c21f..dd618cc7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,58 +19,58 @@
     <string name="changelog">Logboekwijzigingen</string>
     <string name="statistics">Statistieken</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Alle meldingen</string>
-    <string name="notifications__also_commented">Heeft ook gereageerd</string>
-    <string name="notifications__comment_on_post">Reageer op het bericht</string>
-    <string name="notifications__liked">Leuk gevonden</string>
-    <string name="notifications__mentioned">Genoemd</string>
-    <string name="notifications__reshared">Opnieuw gedeeld</string>
-    <string name="notifications__started_sharing">Begonnen met delen</string>
+    <string name="all_notifications">Alle meldingen</string>
+    <string name="also_commented">Heeft ook gereageerd</string>
+    <string name="comment_on_post">Reageer op het bericht</string>
+    <string name="deleteme_____1">Leuk gevonden</string>
+    <string name="mentioned">Genoemd</string>
+    <string name="reshared">Opnieuw gedeeld</string>
+    <string name="started_sharing">Begonnen met delen</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Fout: Kan niet de podlijst ophalen!</string>
-    <string name="no_internet">Sorry, u moet verbinding met internet hebben om verder te gaan</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Fout: Kan niet de podlijst ophalen!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Sorry, u moet verbinding met internet hebben om verder te gaan</string>
     <string name="confirmation">Bevestiging</string>
-    <string name="confirm_exit">Wilt u afsluiten?</string>
+    <string name="do_you_want_to_exit">Wilt u afsluiten?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Meer</string>
-    <string name="nav_help_license">Over | Help</string>
-    <string name="nav_followed_tags">Gevolgde Tags</string>
-    <string name="nav_public_activities">Publieke activiteiten</string>
-    <string name="nav_reports">Rapporten</string>
-    <string name="share__share_link_as_text">Link delen als tekst</string>
-    <string name="share__share_screenshot">Screenshot van de webpagina delen</string>
-    <string name="share__take_screenshot">Neem screenshot van de webpagina</string>
-    <string name="share__toast_saved_image_to_location">Afbeelding opslaan</string>
-    <string name="share__toast_screenshot">Screenshot oplaan als:</string>
-    <string name="share__toast_link_address_copied">Link adres gekopieerd&#8230;</string>
+    <string name="more">Meer</string>
+    <string name="help_license">Over | Help</string>
+    <string name="followed_tags">Gevolgde Tags</string>
+    <string name="public_activities">Publieke activiteiten</string>
+    <string name="reports">Rapporten</string>
+    <string name="share_link_as_text">Link delen als tekst</string>
+    <string name="share_screenshot_of_webpage">Screenshot van de webpagina delen</string>
+    <string name="take_screenshot_of_webpage">Neem screenshot van de webpagina</string>
+    <string name="saving_image_to">Afbeelding opslaan</string>
+    <string name="saving_screenshot_as">Screenshot oplaan als:</string>
+    <string name="link_adress_copied">Link adres gekopieerd&#8230;</string>
     <string name="new_post">Nieuw Bericht</string>
-    <string name="action_go_to_top">Terug naar boven</string>
-    <string name="action_search_by_tags_or_persons">Zoeken op tags of personen</string>
-    <string name="action_exit_app">App afsluiten</string>
-    <string name="action_toggle_desktop_page">Desktop weergave in-/uitschakelen</string>
-    <string name="action_share_dotdotdot">Delen&#8230;</string>
-    <string name="search_alert_tag">viaTags</string>
-    <string name="search_alert_people">via mensen</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Voeg een naam toe</string>
-    <string name="context_menu_share_link">Deel adreslink</string>
-    <string name="context_menu_save_image">Afbeelding opslaan</string>
-    <string name="context_menu_share_image">Deel afbeelding</string>
-    <string name="context_menu_open_external_browser">Geopend in externe browser&#8230;</string>
-    <string name="copy_link_to_clipboard">Link-adres kopiëren naar Klembord</string>
-    <string name="context_menu_copy_image_link">Afbeelding kopiëren naar Klembord</string>
+    <string name="go_to_top">Terug naar boven</string>
+    <string name="search_by_tags_or_persons__appspecific">Zoeken op tags of personen</string>
+    <string name="exit_app">App afsluiten</string>
+    <string name="toggle_mobile_desktop_view">Desktop weergave in-/uitschakelen</string>
+    <string name="share_dotdotdot">Delen&#8230;</string>
+    <string name="by_tags">viaTags</string>
+    <string name="by_people">via mensen</string>
+    <string name="please_add_a_name">Voeg een naam toe</string>
+    <string name="share_link_address">Deel adreslink</string>
+    <string name="save_image">Afbeelding opslaan</string>
+    <string name="share_image">Deel afbeelding</string>
+    <string name="open_in_external_browser">Geopend in externe browser&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Link-adres kopiëren naar Klembord</string>
+    <string name="copy_image_address_to_clipboard">Afbeelding kopiëren naar Klembord</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - dandelion*. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\".</string>
-    <string name="permissions_image">U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - dandelion*. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\".</string>
+    <string name="screenshot_permission__appspecific">U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - dandelion*. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\".</string>
+    <string name="image_permission_description__appspecific">U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - dandelion*. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\".</string>
     <string name="permission_denied">Toestemming geweigerd.</string>
     <string name="permission_granted_try_again">Toestemming verleend. Probeer het opnieuw.</string>
-    <string name="podselection__custom_pod">Aangepaste Pod</string>
+    <string name="custom_pod">Aangepaste Pod</string>
     <string name="pod_name">Pod naam</string>
-    <string name="http_protocol">Protocol</string>
+    <string name="protocol">Protocol</string>
     <string name="pod_address">Pod adres</string>
     <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="jump_to_last_visited_page_in_stream__appspecific">Ga naar laatste bezochte pagina in de stream?</string>
 
     <string name="about">Over</string>
     <string name="license">Licentie</string>
@@ -114,29 +114,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Bovenste werkbalk laadt stream</string>
-    <string name="pref_desc__topbar_stream_shortcut">Klik op een lege ruimte in de bovenste werkbalk om de stream te openen</string>
+    <string name="top_toolbar_loads_stream__appsp">Bovenste werkbalk laadt stream</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Klik op een lege ruimte in de bovenste werkbalk om de stream te openen</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Vormgeving</string>
-    <string name="pref_cat__network">Netwerk</string>
-    <string name="pref_cat__pod_settings">Pod-instellingen</string>
-    <string name="pref_cat__operability">Bruikbaarheid</string>
+    <string name="appearance">Vormgeving</string>
+    <string name="network">Netwerk</string>
+    <string name="pod_settings__appspecfic">Pod-instellingen</string>
+    <string name="operability">Bruikbaarheid</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
-    <string name="pref_desc__sub_nav_slider">Configureer zichtbaarheid van vermeldingen in navigatie slider</string>
-    <string name="pref_cat__visibility_nav_items__user">Gebruiker</string>
-    <string name="pref_cat__visibility_nav_items__general">Algemeen</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
+    <string name="navigation_drawer">Navigatie Slider</string>
+    <string name="control_visibility_of_entries_nav_drawer">Configureer zichtbaarheid van vermeldingen in navigatie slider</string>
+    <string name="user">Gebruiker</string>
+    <string name="general">Algemeen</string>
+    <string name="admin">Administrator</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Themakleuren</string>
-    <string name="pref_desc__themes">Bepalen welke kleuren worden gebruikt in de app</string>
-    <string name="pref_title__primary_color">Hoofdkleur</string>
-    <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="theme_and_colors">Themakleuren</string>
+    <string name="control_which_colors_are_used_in_app">Bepalen welke kleuren worden gebruikt in de app</string>
+    <string name="primary_colors">Hoofdkleur</string>
+    <string name="colors_of_toolbars">Kleur van de werkbalken</string>
+    <string name="accent_color">Accentkleur</string>
+    <string name="color_of_progressbar">Kleur van de progresbalk</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>
+    <string name="amoled_mode_description__app_specific">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="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>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index d4e906e8..40dd0a60 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -2,27 +2,27 @@
 <resources>
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Den øvre verktøylinjen laster inn strømmen</string>
-    <string name="pref_desc__topbar_stream_shortcut">Klikk på en tom plass i den øvre verktøylinjen for å åpne strømmen</string>
+    <string name="top_toolbar_loads_stream__appsp">Den øvre verktøylinjen laster inn strømmen</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Klikk på en tom plass i den øvre verktøylinjen for å åpne strømmen</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Utseende</string>
-    <string name="pref_cat__network">Nettverk</string>
-    <string name="pref_cat__pod_settings">Pod-innstillinger</string>
-    <string name="pref_cat__operability">Brukbarhet</string>
+    <string name="appearance">Utseende</string>
+    <string name="network">Nettverk</string>
+    <string name="pod_settings__appspecfic">Pod-innstillinger</string>
+    <string name="operability">Brukbarhet</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigasjonsbryter</string>
-    <string name="pref_desc__sub_nav_slider">Kontrollér synligheten for innlegg i navigasjonsskuffen</string>
-    <string name="pref_cat__visibility_nav_items__user">Bruker</string>
-    <string name="pref_cat__visibility_nav_items__general">Generelt</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
+    <string name="navigation_drawer">Navigasjonsbryter</string>
+    <string name="control_visibility_of_entries_nav_drawer">Kontrollér synligheten for innlegg i navigasjonsskuffen</string>
+    <string name="user">Bruker</string>
+    <string name="general">Generelt</string>
+    <string name="admin">Administrator</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema og farger</string>
-    <string name="pref_desc__themes">Kontrollér hvilke farger som brukes i appen</string>
-    <string name="pref_title__primary_color">Primærfarge</string>
-    <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="theme_and_colors">Tema og farger</string>
+    <string name="control_which_colors_are_used_in_app">Kontrollér hvilke farger som brukes i appen</string>
+    <string name="primary_colors">Primærfarge</string>
+    <string name="colors_of_toolbars">Verktøylinjefarge</string>
+    <string name="accent_color">Aksentfarge</string>
+    <string name="color_of_progressbar">Fremgangslinjefarge</string>
     <string name="amoled_mode">AMOLED-modus</string>
     <!-- Notifications dropdown -->
     <!-- Font size -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 91e07834..92373216 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -19,60 +19,60 @@
     <string name="changelog">Lista zmian</string>
     <string name="statistics">Statystyki</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Wszystkie powiadomienia</string>
-    <string name="notifications__also_commented">Także skomentował/a</string>
-    <string name="notifications__comment_on_post">Skomentował/a Twój wpis</string>
-    <string name="notifications__liked">Polubienia</string>
-    <string name="notifications__mentioned">Wzmianki</string>
-    <string name="notifications__reshared">Powtórzenia</string>
-    <string name="notifications__started_sharing">Zaczęli się z Tobą dzielić</string>
+    <string name="all_notifications">Wszystkie powiadomienia</string>
+    <string name="also_commented">Także skomentował/a</string>
+    <string name="comment_on_post">Skomentował/a Twój wpis</string>
+    <string name="deleteme_____1">Polubienia</string>
+    <string name="mentioned">Wzmianki</string>
+    <string name="reshared">Powtórzenia</string>
+    <string name="started_sharing">Zaczęli się z Tobą dzielić</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Błąd: Nie udało się pobrać listy podów!</string>
-    <string name="no_internet">Przykro mi, lecz aby kontynuować, musisz mieć połączenie z Internetem</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Błąd: Nie udało się pobrać listy podów!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Przykro mi, lecz aby kontynuować, musisz mieć połączenie z Internetem</string>
     <string name="confirmation">Potwierdzenie</string>
-    <string name="confirm_exit">Czy chcesz wyjść?</string>
+    <string name="do_you_want_to_exit">Czy chcesz wyjść?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Więcej</string>
-    <string name="nav_help_license">Informacje | Pomoc</string>
-    <string name="nav_followed_tags">Obserwowane tagi</string>
-    <string name="nav_public_activities">Aktywność publiczna</string>
-    <string name="nav_reports">Zgłoszenia</string>
-    <string name="share__share_link_as_text">Udostępnij link jako tekst</string>
-    <string name="share__share_screenshot">Udostępnij zrzut ekranu strony internetowej</string>
-    <string name="share__take_screenshot">Wykonaj zrzut ekranu strony internetowej</string>
-    <string name="share__toast_saved_image_to_location">Zapisywanie obrazu do</string>
-    <string name="share__toast_screenshot">Zapisywanie zrzutu ekranu jako:</string>
-    <string name="share__toast_link_address_copied">Skopiowano adres linku&#8230;</string>
+    <string name="more">Więcej</string>
+    <string name="help_license">Informacje | Pomoc</string>
+    <string name="followed_tags">Obserwowane tagi</string>
+    <string name="public_activities">Aktywność publiczna</string>
+    <string name="reports">Zgłoszenia</string>
+    <string name="share_link_as_text">Udostępnij link jako tekst</string>
+    <string name="share_screenshot_of_webpage">Udostępnij zrzut ekranu strony internetowej</string>
+    <string name="take_screenshot_of_webpage">Wykonaj zrzut ekranu strony internetowej</string>
+    <string name="saving_image_to">Zapisywanie obrazu do</string>
+    <string name="saving_screenshot_as">Zapisywanie zrzutu ekranu jako:</string>
+    <string name="link_adress_copied">Skopiowano adres linku&#8230;</string>
     <string name="new_post">Nowy wpis</string>
-    <string name="action_go_to_top">Przejdź do góry</string>
-    <string name="action_search_by_tags_or_persons">Szukaj tagów lub osób</string>
-    <string name="action_exit_app">Zamknij aplikację</string>
-    <string name="action_toggle_desktop_page">Przełącz na widok mobilny/standardowy</string>
-    <string name="action_share_dotdotdot">Udostępnij&#8230;</string>
-    <string name="search_alert_tag">w tagach</string>
-    <string name="search_alert_people">w osobach</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Podaj nazwę użytkownika lub tagu</string>
-    <string name="context_menu_share_link">Udostępnij adres odnośnika</string>
-    <string name="context_menu_save_image">Zapisz obraz</string>
-    <string name="context_menu_share_image">Udostępnij obraz</string>
-    <string name="context_menu_open_external_browser">Otwórz w zewnętrznej przeglądarce&#8230;</string>
-    <string name="copy_link_to_clipboard">Skopiuj adres odnośnika do schowka</string>
-    <string name="context_menu_copy_image_link">Skopiuj adres obrazu do schowka</string>
+    <string name="go_to_top">Przejdź do góry</string>
+    <string name="search_by_tags_or_persons__appspecific">Szukaj tagów lub osób</string>
+    <string name="exit_app">Zamknij aplikację</string>
+    <string name="toggle_mobile_desktop_view">Przełącz na widok mobilny/standardowy</string>
+    <string name="share_dotdotdot">Udostępnij&#8230;</string>
+    <string name="by_tags">w tagach</string>
+    <string name="by_people">w osobach</string>
+    <string name="please_add_a_name">Podaj nazwę użytkownika lub tagu</string>
+    <string name="share_link_address">Udostępnij adres odnośnika</string>
+    <string name="save_image">Zapisz obraz</string>
+    <string name="share_image">Udostępnij obraz</string>
+    <string name="open_in_external_browser">Otwórz w zewnętrznej przeglądarce&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Skopiuj adres odnośnika do schowka</string>
+    <string name="copy_image_address_to_clipboard">Skopiuj adres obrazu do schowka</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Nie udało się wczytać obrazu</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Aby móc zapisywać zrzuty ekranu, musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz, powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - dandelion*. W sekcji uprawnień zaznacz \"Pamięć\".</string>
-    <string name="permissions_image">Aby móc zapisywać/wysyłać obrazy, musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz, powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - dandelion*. W sekcji uprawnień zaznacz \"Pamięć\".</string>
+    <string name="screenshot_permission__appspecific">Aby móc zapisywać zrzuty ekranu, musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz, powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - dandelion*. W sekcji uprawnień zaznacz \"Pamięć\".</string>
+    <string name="image_permission_description__appspecific">Aby móc zapisywać/wysyłać obrazy, musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz, powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - dandelion*. W sekcji uprawnień zaznacz \"Pamięć\".</string>
     <string name="permission_denied">Odmowa dostępu.</string>
     <string name="permission_granted_try_again">Dostęp przyznany. Spróbuj ponownie.</string>
-    <string name="podselection__custom_pod">Pod spoza listy</string>
+    <string name="custom_pod">Pod spoza listy</string>
     <string name="pod_name">Nazwa Poda</string>
-    <string name="http_protocol">Protokół</string>
+    <string name="protocol">Protokół</string>
     <string name="pod_address">Adres Poda</string>
     <string name="missing_value">Nie podano danych</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Przejść do ostatnio odwiedzonej strony w strumieniu?</string>
-    <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="jump_to_last_visited_page_in_stream__appspecific">Przejść do ostatnio odwiedzonej strony w strumieniu?</string>
+    <string name="hide_statusbar_in_mainview">Ukryj pasek stanu w głównym widoku</string>
+    <string name="hide_statusbar">Ukryj pasek stanu</string>
 
     <string name="about">O aplikacji</string>
     <string name="license">Licencja</string>
@@ -116,29 +116,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Górny pasek narzędzi wczytuje strumień</string>
-    <string name="pref_desc__topbar_stream_shortcut">Aby otworzyć strumień, kliknij na pustą przestrzeń w górnym pasku narzędziowym</string>
+    <string name="top_toolbar_loads_stream__appsp">Górny pasek narzędzi wczytuje strumień</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Aby otworzyć strumień, kliknij na pustą przestrzeń w górnym pasku narzędziowym</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Wygląd</string>
-    <string name="pref_cat__network">Sieć</string>
-    <string name="pref_cat__pod_settings">Ustawienia poda</string>
-    <string name="pref_cat__operability">Obsługa</string>
+    <string name="appearance">Wygląd</string>
+    <string name="network">Sieć</string>
+    <string name="pod_settings__appspecfic">Ustawienia poda</string>
+    <string name="operability">Obsługa</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Pasek nawigacji</string>
-    <string name="pref_desc__sub_nav_slider">Wybierz elementy widoczne w panelu nawigacyjnym</string>
-    <string name="pref_cat__visibility_nav_items__user">Użytkownik</string>
-    <string name="pref_cat__visibility_nav_items__general">Ogólne</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administracja</string>
+    <string name="navigation_drawer">Pasek nawigacji</string>
+    <string name="control_visibility_of_entries_nav_drawer">Wybierz elementy widoczne w panelu nawigacyjnym</string>
+    <string name="user">Użytkownik</string>
+    <string name="general">Ogólne</string>
+    <string name="admin">Administracja</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Motywy i kolory</string>
-    <string name="pref_desc__themes">Ustaw, jakich kolorów ma używać aplikacja</string>
-    <string name="pref_title__primary_color">Kolor podstawowy</string>
-    <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="theme_and_colors">Motywy i kolory</string>
+    <string name="control_which_colors_are_used_in_app">Ustaw, jakich kolorów ma używać aplikacja</string>
+    <string name="primary_colors">Kolor podstawowy</string>
+    <string name="colors_of_toolbars">Kolor pasków narzędzi</string>
+    <string name="accent_color">Kolor dodatkowy</string>
+    <string name="color_of_progressbar">Kolor paska postępu</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>
+    <string name="amoled_mode_description__app_specific">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="extended_notifications">Rozszerzone powiadomienia</string>
     <string name="extendend_notifications_bell_description__appspecific">Dodaj do ikony powiadomień menu wyboru kategorii powiadomień</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bcf8807c..83c6738f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
-    <string name="navigation_drawer_open">Abra o painel de navegação</string>
-    <string name="navigation_drawer_close">Fechar painel de navegação</string>
+    <string name="open_navdrawer">Abra o painel de navegação</string>
+    <string name="close_navdrawer">Fechar painel de navegação</string>
     <string name="reload">Atualizar</string>
     <!-- Common Words -->
     <string name="settings">Configurações</string>
@@ -21,58 +21,58 @@
     <string name="changelog">Histórico de mudanças</string>
     <string name="statistics">Estatísticas</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Todas as notificações</string>
-    <string name="notifications__also_commented">Também comentado</string>
-    <string name="notifications__comment_on_post">Comentar no post</string>
-    <string name="notifications__liked">Curtidas</string>
-    <string name="notifications__mentioned">Mencionado</string>
-    <string name="notifications__reshared">Recompartilhado</string>
-    <string name="notifications__started_sharing">Começou a compartilhar</string>
+    <string name="all_notifications">Todas as notificações</string>
+    <string name="also_commented">Também comentado</string>
+    <string name="comment_on_post">Comentar no post</string>
+    <string name="deleteme_____1">Curtidas</string>
+    <string name="mentioned">Mencionado</string>
+    <string name="reshared">Recompartilhado</string>
+    <string name="started_sharing">Começou a compartilhar</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Erro: Impossível recuperar as informações dos pods!</string>
-    <string name="no_internet">Você precisa conectar à Internet para prosseguir</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Erro: Impossível recuperar as informações dos pods!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Você precisa conectar à Internet para prosseguir</string>
     <string name="confirmation">Confirmação</string>
-    <string name="confirm_exit">Deseja sair?</string>
+    <string name="do_you_want_to_exit">Deseja sair?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Mais</string>
-    <string name="nav_help_license">Sobre | Ajuda</string>
-    <string name="nav_followed_tags">Tags seguidas</string>
-    <string name="nav_public_activities">Atividades públicas</string>
-    <string name="nav_reports">Relatórios</string>
-    <string name="share__share_link_as_text">Compartilhar link como texto</string>
-    <string name="share__share_screenshot">Compartilhar uma captura de tela da página</string>
-    <string name="share__take_screenshot">Tirar uma captura de tela da página</string>
-    <string name="share__toast_saved_image_to_location">Salvar imagem para</string>
-    <string name="share__toast_screenshot">Salvar captura de tela como:</string>
-    <string name="share__toast_link_address_copied">Link copiado&#8230;</string>
+    <string name="more">Mais</string>
+    <string name="help_license">Sobre | Ajuda</string>
+    <string name="followed_tags">Tags seguidas</string>
+    <string name="public_activities">Atividades públicas</string>
+    <string name="reports">Relatórios</string>
+    <string name="share_link_as_text">Compartilhar link como texto</string>
+    <string name="share_screenshot_of_webpage">Compartilhar uma captura de tela da página</string>
+    <string name="take_screenshot_of_webpage">Tirar uma captura de tela da página</string>
+    <string name="saving_image_to">Salvar imagem para</string>
+    <string name="saving_screenshot_as">Salvar captura de tela como:</string>
+    <string name="link_adress_copied">Link copiado&#8230;</string>
     <string name="new_post">Nova postagem</string>
-    <string name="action_go_to_top">Ir para o topo</string>
-    <string name="action_search_by_tags_or_persons">Procurar por tags ou pessoas</string>
-    <string name="action_exit_app">Sair do aplicativo</string>
-    <string name="action_toggle_desktop_page">Alternar a exibição telefone/área de trabalho</string>
-    <string name="action_share_dotdotdot">Compartilhar&#8230;</string>
-    <string name="search_alert_tag">por tags</string>
-    <string name="search_alert_people">por pessoas</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Por favor, adicione um nome</string>
-    <string name="context_menu_share_link">Compartilhar endereço</string>
-    <string name="context_menu_save_image">Salvar imagem</string>
-    <string name="context_menu_share_image">Compartilhar imagem</string>
-    <string name="context_menu_open_external_browser">Abrir em navegador externo&#8230;</string>
-    <string name="copy_link_to_clipboard">Copiar endereço à área de transferência</string>
-    <string name="context_menu_copy_image_link">Copiar endereço de imagem à área de transferência</string>
+    <string name="go_to_top">Ir para o topo</string>
+    <string name="search_by_tags_or_persons__appspecific">Procurar por tags ou pessoas</string>
+    <string name="exit_app">Sair do aplicativo</string>
+    <string name="toggle_mobile_desktop_view">Alternar a exibição telefone/área de trabalho</string>
+    <string name="share_dotdotdot">Compartilhar&#8230;</string>
+    <string name="by_tags">por tags</string>
+    <string name="by_people">por pessoas</string>
+    <string name="please_add_a_name">Por favor, adicione um nome</string>
+    <string name="share_link_address">Compartilhar endereço</string>
+    <string name="save_image">Salvar imagem</string>
+    <string name="share_image">Compartilhar imagem</string>
+    <string name="open_in_external_browser">Abrir em navegador externo&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Copiar endereço à área de transferência</string>
+    <string name="copy_image_address_to_clipboard">Copiar endereço de imagem à área de transferência</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Impossível carregar a imagem</string>
     <!-- Permissions -->
     <string name="permission_denied">Permissão negada.</string>
     <string name="permission_granted_try_again">Permissão concedida. Por favor, tente novamente.</string>
-    <string name="podselection__custom_pod">Pod personalizado</string>
+    <string name="custom_pod">Pod personalizado</string>
     <string name="pod_name">Nome do pod</string>
-    <string name="http_protocol">Protocolo</string>
+    <string name="protocol">Protocolo</string>
     <string name="pod_address">Endereço do pod</string>
     <string name="missing_value">Sem dado</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Voltar para a última página visitada no fluxo?</string>
-    <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="jump_to_last_visited_page_in_stream__appspecific">Voltar para a última página visitada no fluxo?</string>
+    <string name="hide_statusbar_in_mainview">Ocultar a barra de estado na janela principal</string>
+    <string name="hide_statusbar">Ocultar barra de status</string>
 
     <string name="about">Sobre</string>
     <string name="license">Licença</string>
@@ -90,27 +90,27 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Barra de ferramentas superior abre o fluxo</string>
-    <string name="pref_desc__topbar_stream_shortcut">Clique em um espaço vazio na barra de ferramentas superior para abrir o fluxo</string>
+    <string name="top_toolbar_loads_stream__appsp">Barra de ferramentas superior abre o fluxo</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Clique em um espaço vazio na barra de ferramentas superior para abrir o fluxo</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Aparência</string>
-    <string name="pref_cat__network">Rede</string>
-    <string name="pref_cat__pod_settings">Configurações do pod</string>
-    <string name="pref_cat__operability">Operabilidade</string>
+    <string name="appearance">Aparência</string>
+    <string name="network">Rede</string>
+    <string name="pod_settings__appspecfic">Configurações do pod</string>
+    <string name="operability">Operabilidade</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Controle deslizante de navegação</string>
-    <string name="pref_desc__sub_nav_slider">Visibilidade do controle de entradas na gaveta de navegação</string>
-    <string name="pref_cat__visibility_nav_items__user">Usuário</string>
-    <string name="pref_cat__visibility_nav_items__general">Geral</string>
-    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
+    <string name="navigation_drawer">Controle deslizante de navegação</string>
+    <string name="control_visibility_of_entries_nav_drawer">Visibilidade do controle de entradas na gaveta de navegação</string>
+    <string name="user">Usuário</string>
+    <string name="general">Geral</string>
+    <string name="admin">Admin</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema e cores</string>
-    <string name="pref_desc__themes">Controlar quais cores são usadas em todo o aplicativo</string>
-    <string name="pref_title__primary_color">Cor principal</string>
-    <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="theme_and_colors">Tema e cores</string>
+    <string name="control_which_colors_are_used_in_app">Controlar quais cores são usadas em todo o aplicativo</string>
+    <string name="primary_colors">Cor principal</string>
+    <string name="colors_of_toolbars">Cor das barras de ferramentas</string>
+    <string name="accent_color">Cor de destaque</string>
+    <string name="color_of_progressbar">Cor da barra de progresso</string>
     <string name="amoled_mode">Modo AMOLED</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Notificações estendidas</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index eea0cce5..7fe2aa0d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -19,42 +19,42 @@
     <string name="changelog">Jurnalul modificărilor</string>
     <string name="statistics">Statistici</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Toate notificările</string>
-    <string name="notifications__also_commented">Si comentate</string>
-    <string name="notifications__comment_on_post">Comentariu pe Post</string>
-    <string name="notifications__liked">Apreciate</string>
-    <string name="notifications__mentioned">Menţionate</string>
-    <string name="notifications__reshared">Repartajate</string>
-    <string name="notifications__started_sharing">Început Partajare</string>
+    <string name="all_notifications">Toate notificările</string>
+    <string name="also_commented">Si comentate</string>
+    <string name="comment_on_post">Comentariu pe Post</string>
+    <string name="deleteme_____1">Apreciate</string>
+    <string name="mentioned">Menţionate</string>
+    <string name="reshared">Repartajate</string>
+    <string name="started_sharing">Început Partajare</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Eroare: Lista de Pod-uri nu poate fi preluată!</string>
-    <string name="no_internet">Ne pare rău, trebuie să fi conectat la Internet pentru a continua</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Eroare: Lista de Pod-uri nu poate fi preluată!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Ne pare rău, trebuie să fi conectat la Internet pentru a continua</string>
     <string name="confirmation">Confirmare</string>
-    <string name="confirm_exit">Doriţi să ieşiţi?</string>
+    <string name="do_you_want_to_exit">Doriţi să ieşiţi?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Extra</string>
-    <string name="nav_help_license">Despre | Ajutor</string>
-    <string name="nav_followed_tags">Tag-uri urmarite</string>
-    <string name="nav_public_activities">Activităţi publice</string>
-    <string name="nav_reports">Rapoarte</string>
-    <string name="share__share_link_as_text">Partajează adresa ca text</string>
-    <string name="share__share_screenshot">Share screenshot a paginii web</string>
-    <string name="share__take_screenshot">Ia screenshot a paginii web</string>
-    <string name="share__toast_saved_image_to_location">Imagine salvată în</string>
-    <string name="share__toast_screenshot">Screenshot salvat ca:</string>
-    <string name="share__toast_link_address_copied">Adresa copiată &#8230;</string>
+    <string name="more">Extra</string>
+    <string name="help_license">Despre | Ajutor</string>
+    <string name="followed_tags">Tag-uri urmarite</string>
+    <string name="public_activities">Activităţi publice</string>
+    <string name="reports">Rapoarte</string>
+    <string name="share_link_as_text">Partajează adresa ca text</string>
+    <string name="share_screenshot_of_webpage">Share screenshot a paginii web</string>
+    <string name="take_screenshot_of_webpage">Ia screenshot a paginii web</string>
+    <string name="saving_image_to">Imagine salvată în</string>
+    <string name="saving_screenshot_as">Screenshot salvat ca:</string>
+    <string name="link_adress_copied">Adresa copiată &#8230;</string>
     <string name="new_post">Postare nouă</string>
-    <string name="action_go_to_top">Du-te la partea de sus</string>
-    <string name="action_search_by_tags_or_persons">Căutare după Tag-uri sau persoane</string>
-    <string name="action_exit_app">Ieșire din Aplicatie</string>
-    <string name="action_toggle_desktop_page">Comuta Vezi mobil/desktop</string>
-    <string name="action_share_dotdotdot">Distribuire&#8230;</string>
-    <string name="search_alert_tag">după etichete</string>
-    <string name="search_alert_people">dupa persoane</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Adauga nume</string>
-    <string name="context_menu_share_link">Partajează adresa</string>
-    <string name="context_menu_save_image">Salvează imaginea</string>
-    <string name="context_menu_share_image">Partajează imaginea</string>
+    <string name="go_to_top">Du-te la partea de sus</string>
+    <string name="search_by_tags_or_persons__appspecific">Căutare după Tag-uri sau persoane</string>
+    <string name="exit_app">Ieșire din Aplicatie</string>
+    <string name="toggle_mobile_desktop_view">Comuta Vezi mobil/desktop</string>
+    <string name="share_dotdotdot">Distribuire&#8230;</string>
+    <string name="by_tags">după etichete</string>
+    <string name="by_people">dupa persoane</string>
+    <string name="please_add_a_name">Adauga nume</string>
+    <string name="share_link_address">Partajează adresa</string>
+    <string name="save_image">Salvează imaginea</string>
+    <string name="share_image">Partajează imaginea</string>
     <!-- More from MainActivity -->
     <!-- Permissions -->
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 67757dd7..8d81bdc5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -19,62 +19,62 @@
     <string name="changelog">История изменений</string>
     <string name="statistics">Статистика</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Все уведомления</string>
-    <string name="notifications__also_commented">Также прокомментировали</string>
-    <string name="notifications__comment_on_post">Комментарий к записи</string>
-    <string name="notifications__liked">Понравилось</string>
-    <string name="notifications__mentioned">Упомянули</string>
-    <string name="notifications__reshared">Поделились</string>
-    <string name="notifications__started_sharing">Добавили вас</string>
+    <string name="all_notifications">Все уведомления</string>
+    <string name="also_commented">Также прокомментировали</string>
+    <string name="comment_on_post">Комментарий к записи</string>
+    <string name="deleteme_____1">Понравилось</string>
+    <string name="mentioned">Упомянули</string>
+    <string name="reshared">Поделились</string>
+    <string name="started_sharing">Добавили вас</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Ошибка: Не удалось получить список подов!</string>
-    <string name="no_internet">Извините, вы должны быть подключены к Интернету, чтобы продолжить</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Ошибка: Не удалось получить список подов!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Извините, вы должны быть подключены к Интернету, чтобы продолжить</string>
     <string name="confirmation">Подтверждение</string>
-    <string name="confirm_exit">Вы хотите выйти?</string>
+    <string name="do_you_want_to_exit">Вы хотите выйти?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Дополнительно</string>
-    <string name="nav_help_license">Информация | Помощь</string>
-    <string name="nav_followed_tags">Теги</string>
-    <string name="nav_public_activities">Публичное</string>
-    <string name="nav_reports">Отчёты</string>
-    <string name="share__share_link_as_text">Поделиться ссылкой как текстом</string>
-    <string name="share__share_screenshot">Поделиться скриншотом страницы</string>
-    <string name="share__take_screenshot">Сделать скриншот страницы</string>
-    <string name="share__toast_saved_image_to_location">Сохранение изображения в</string>
-    <string name="share__toast_screenshot">Сохранение скриншота как:</string>
-    <string name="share__toast_link_address_copied">Адрес ссылки скопирован&#8230;</string>
+    <string name="more">Дополнительно</string>
+    <string name="help_license">Информация | Помощь</string>
+    <string name="followed_tags">Теги</string>
+    <string name="public_activities">Публичное</string>
+    <string name="reports">Отчёты</string>
+    <string name="share_link_as_text">Поделиться ссылкой как текстом</string>
+    <string name="share_screenshot_of_webpage">Поделиться скриншотом страницы</string>
+    <string name="take_screenshot_of_webpage">Сделать скриншот страницы</string>
+    <string name="saving_image_to">Сохранение изображения в</string>
+    <string name="saving_screenshot_as">Сохранение скриншота как:</string>
+    <string name="link_adress_copied">Адрес ссылки скопирован&#8230;</string>
     <string name="new_post">Новый пост</string>
-    <string name="action_go_to_top">В начало</string>
-    <string name="action_search_by_tags_or_persons">Искать по тегам и людям</string>
-    <string name="action_exit_app">Выйти из приложения</string>
-    <string name="action_toggle_desktop_page">Переключить мобильный вид</string>
-    <string name="action_share_dotdotdot">Поделиться&#8230;</string>
-    <string name="search_alert_tag">по тегам</string>
-    <string name="search_alert_people">по людям</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Пожалуйста, добавьте имя</string>
-    <string name="context_menu_share_link">Поделиться адресом ссылки</string>
-    <string name="context_menu_save_image">Сохранить изображение</string>
-    <string name="context_menu_share_image">Поделиться изображением</string>
-    <string name="context_menu_open_external_browser">Открыть во внешнем браузере&#8230;</string>
-    <string name="copy_link_to_clipboard">Скопировать адрес ссылки в буфер обмена</string>
-    <string name="context_menu_copy_image_link">Скопировать адрес изображения в буфер обмена</string>
+    <string name="go_to_top">В начало</string>
+    <string name="search_by_tags_or_persons__appspecific">Искать по тегам и людям</string>
+    <string name="exit_app">Выйти из приложения</string>
+    <string name="toggle_mobile_desktop_view">Переключить мобильный вид</string>
+    <string name="share_dotdotdot">Поделиться&#8230;</string>
+    <string name="by_tags">по тегам</string>
+    <string name="by_people">по людям</string>
+    <string name="please_add_a_name">Пожалуйста, добавьте имя</string>
+    <string name="share_link_address">Поделиться адресом ссылки</string>
+    <string name="save_image">Сохранить изображение</string>
+    <string name="share_image">Поделиться изображением</string>
+    <string name="open_in_external_browser">Открыть во внешнем браузере&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Скопировать адрес ссылки в буфер обмена</string>
+    <string name="copy_image_address_to_clipboard">Скопировать адрес изображения в буфер обмена</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Не удаётся загрузить изображение</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения скриншотов. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите использовать функцию скриншотов позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки  - приложения - dandelion*. В разделе разрешения можно предоставить «разрешение на запись в хранилище».</string>
-    <string name="permissions_image">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения/выгрузки изображений. После этого вам необходимо полностью закрыть приложение или перезагрузить телефон. Если вы не разрешаете доступ к хранилищу, но хотите сохранять изображения позже, можно предоставить разрешение позднее. В таком случае откройте: Системные настройки  - приложения - dandelion*. В разделе разрешений можно будет предоставить «разрешение на запись в хранилище».</string>
+    <string name="screenshot_permission__appspecific">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения скриншотов. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите использовать функцию скриншотов позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки  - приложения - dandelion*. В разделе разрешения можно предоставить «разрешение на запись в хранилище».</string>
+    <string name="image_permission_description__appspecific">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения/выгрузки изображений. После этого вам необходимо полностью закрыть приложение или перезагрузить телефон. Если вы не разрешаете доступ к хранилищу, но хотите сохранять изображения позже, можно предоставить разрешение позднее. В таком случае откройте: Системные настройки  - приложения - dandelion*. В разделе разрешений можно будет предоставить «разрешение на запись в хранилище».</string>
     <string name="permission_denied">В разрешении отказано.</string>
     <string name="permission_granted_try_again">Разрешение получено. Пожалуйста, попытайтесь снова.</string>
-    <string name="podselection__custom_pod">Произвольный под</string>
+    <string name="custom_pod">Произвольный под</string>
     <string name="pod_name">Название пода</string>
-    <string name="http_protocol">Протокол</string>
+    <string name="protocol">Протокол</string>
     <string name="pod_address">Адрес пода</string>
     <string name="missing_value">Значение отсутствует</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Перейти к последней просмотренной странице в Потоке?</string>
-    <string name="pref_summary__is_statusbar_hidden">Скрыть строку состояния в главном окне</string>
-    <string name="pref_title__is_statusbar_hidden">Скрыть строку состояния</string>
-    <string name="pref_summary__show_title">Показывать заголовок на главном экране</string>
-    <string name="pref_title__show_title">Показывать заголовок</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Перейти к последней просмотренной странице в Потоке?</string>
+    <string name="hide_statusbar_in_mainview">Скрыть строку состояния в главном окне</string>
+    <string name="hide_statusbar">Скрыть строку состояния</string>
+    <string name="show_title_in_main_view">Показывать заголовок на главном экране</string>
+    <string name="show_title">Показывать заголовок</string>
 
     <string name="about">О приложении</string>
     <string name="license">Лицензия</string>
@@ -118,29 +118,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Верхняя панель инструментов загружает Поток</string>
-    <string name="pref_desc__topbar_stream_shortcut">Нажмите на пустое пространство на верхней панели инструментов, чтобы открыть Поток</string>
+    <string name="top_toolbar_loads_stream__appsp">Верхняя панель инструментов загружает Поток</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Нажмите на пустое пространство на верхней панели инструментов, чтобы открыть Поток</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Внешний вид</string>
-    <string name="pref_cat__network">Сеть</string>
-    <string name="pref_cat__pod_settings">Настройки пода</string>
-    <string name="pref_cat__operability">Работоспособность</string>
+    <string name="appearance">Внешний вид</string>
+    <string name="network">Сеть</string>
+    <string name="pod_settings__appspecfic">Настройки пода</string>
+    <string name="operability">Работоспособность</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Слайдер навигации</string>
-    <string name="pref_desc__sub_nav_slider">Управление видимостью записей в ящике навигации</string>
-    <string name="pref_cat__visibility_nav_items__user">Пользовательские</string>
-    <string name="pref_cat__visibility_nav_items__general">Общие</string>
-    <string name="pref_cat__visibility_nav_items__admin">Для администраторов</string>
+    <string name="navigation_drawer">Слайдер навигации</string>
+    <string name="control_visibility_of_entries_nav_drawer">Управление видимостью записей в ящике навигации</string>
+    <string name="user">Пользовательские</string>
+    <string name="general">Общие</string>
+    <string name="admin">Для администраторов</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Тема и цвета</string>
-    <string name="pref_desc__themes">Выбор цветов используемых в приложении</string>
-    <string name="pref_title__primary_color">Основной цвет</string>
-    <string name="pref_desc__primary_color">Цвет панелей инструментов</string>
-    <string name="pref_title__accent_color">Акцентирующий цвет</string>
-    <string name="pref_desc__accent_color">Цвет индикатора загрузки</string>
+    <string name="theme_and_colors">Тема и цвета</string>
+    <string name="control_which_colors_are_used_in_app">Выбор цветов используемых в приложении</string>
+    <string name="primary_colors">Основной цвет</string>
+    <string name="colors_of_toolbars">Цвет панелей инструментов</string>
+    <string name="accent_color">Акцентирующий цвет</string>
+    <string name="color_of_progressbar">Цвет индикатора загрузки</string>
     <string name="amoled_mode">Режим AMOLED</string>
-    <string name="pref_desc__primary_color__amoled_mode">Переопределить цвета на благоприятный для AMOLED чёрный во многих частях приложения. Вам нужно перезапустить приложение, чтобы включить эту опцию. Для просмотра диаспоры* в тёмных тонах, вам также необходимо активировать тёмную тему в настройках аккаунта.</string>
+    <string name="amoled_mode_description__app_specific">Переопределить цвета на благоприятный для AMOLED чёрный во многих частях приложения. Вам нужно перезапустить приложение, чтобы включить эту опцию. Для просмотра диаспоры* в тёмных тонах, вам также необходимо активировать тёмную тему в настройках аккаунта.</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Расширенные уведомления</string>
     <string name="extendend_notifications_bell_description__appspecific">Показывать выпадающее меню с категориями уведомлений при нажатии на иконку уведомлений</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index f4cc7020..52cbce59 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
-    <string name="navigation_drawer_open">Aberi su pannellu de nàvigu</string>
-    <string name="navigation_drawer_close">Serra su pannellu de nàvigu</string>
+    <string name="open_navdrawer">Aberi su pannellu de nàvigu</string>
+    <string name="close_navdrawer">Serra su pannellu de nàvigu</string>
     <string name="reload">Torra a carrigare</string>
 
     <!-- Common Words -->
@@ -23,76 +23,76 @@
     <string name="statistics">Istatìsticas</string>
 
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Totu sas notìficas</string>
-    <string name="notifications__also_commented">Àteros cummentos</string>
-    <string name="notifications__comment_on_post">Cummentu in una publicatzione</string>
-    <string name="notifications__liked">Agradèssidas</string>
-    <string name="notifications__mentioned">Numenada</string>
-    <string name="notifications__reshared">Torrada a cumparzire</string>
-    <string name="notifications__started_sharing">At incumintzadu a cumpartzire</string>
+    <string name="all_notifications">Totu sas notìficas</string>
+    <string name="also_commented">Àteros cummentos</string>
+    <string name="comment_on_post">Cummentu in una publicatzione</string>
+    <string name="deleteme_____1">Agradèssidas</string>
+    <string name="mentioned">Numenada</string>
+    <string name="reshared">Torrada a cumparzire</string>
+    <string name="started_sharing">At incumintzadu a cumpartzire</string>
 
 
     <!-- Pod Activity -->
-    <string name="podlist_error">Errore: Impossìbile recuperare sa lista de sos pods!</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Errore: Impossìbile recuperare sa lista de sos pods!</string>
 
-    <string name="no_internet">Depes èssere connessu a ìnternet pro sighire</string>
+    <string name="sorry_need_to_be_connected_to_internet">Depes èssere connessu a ìnternet pro sighire</string>
     <string name="confirmation">Cunfirma</string>
-    <string name="confirm_exit">Cheres essire?</string>
+    <string name="do_you_want_to_exit">Cheres essire?</string>
 
 
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Àteru</string>
-    <string name="nav_help_license">Informatziones |Agiudu</string>
-    <string name="nav_followed_tags">Etichetas sighidas</string>
-    <string name="nav_public_activities">Atividades pùblicas</string>
-    <string name="nav_reports">Sinnalatziones</string>
+    <string name="more">Àteru</string>
+    <string name="help_license">Informatziones |Agiudu</string>
+    <string name="followed_tags">Etichetas sighidas</string>
+    <string name="public_activities">Atividades pùblicas</string>
+    <string name="reports">Sinnalatziones</string>
 
-    <string name="share__share_link_as_text">Cumpartzi unu ligàmene comente testu</string>
-    <string name="share__share_screenshot">Cumpartzi s\'ischermada de sa pàgina web</string>
-    <string name="share__take_screenshot">Faghe un\'ischermada de sa pàgina web</string>
-    <string name="share__toast_saved_image_to_location">Sarbende s\'immàgine in</string>
-    <string name="share__toast_screenshot">Sarbende s\'ischermada in:</string>
-    <string name="share__toast_link_address_copied">Ligàmene copiadu…</string>
+    <string name="share_link_as_text">Cumpartzi unu ligàmene comente testu</string>
+    <string name="share_screenshot_of_webpage">Cumpartzi s\'ischermada de sa pàgina web</string>
+    <string name="take_screenshot_of_webpage">Faghe un\'ischermada de sa pàgina web</string>
+    <string name="saving_image_to">Sarbende s\'immàgine in</string>
+    <string name="saving_screenshot_as">Sarbende s\'ischermada in:</string>
+    <string name="link_adress_copied">Ligàmene copiadu…</string>
 
 
     <string name="new_post">Publicatzione noa</string>
-    <string name="action_go_to_top">Torra a s\'incumintzu</string>
-    <string name="action_search_by_tags_or_persons">Chirca etichetas o persones</string>
-    <string name="action_exit_app">Essi dae s\'aplicatzione</string>
-    <string name="action_toggle_desktop_page">Allughe/istuda sa versione mòbile</string>
-    <string name="action_share_dotdotdot">Cumpartzi…</string>
+    <string name="go_to_top">Torra a s\'incumintzu</string>
+    <string name="search_by_tags_or_persons__appspecific">Chirca etichetas o persones</string>
+    <string name="exit_app">Essi dae s\'aplicatzione</string>
+    <string name="toggle_mobile_desktop_view">Allughe/istuda sa versione mòbile</string>
+    <string name="share_dotdotdot">Cumpartzi…</string>
 
 
-    <string name="search_alert_tag">pro eticheta</string>
-    <string name="search_alert_people">pro persone</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Pro praghere annanghe unu nùmene</string>
+    <string name="by_tags">pro eticheta</string>
+    <string name="by_people">pro persone</string>
+    <string name="please_add_a_name">Pro praghere annanghe unu nùmene</string>
 
-    <string name="context_menu_share_link">Cumpartzi ligàmene</string>
-    <string name="context_menu_save_image">Sarva s\'immàgine</string>
-    <string name="context_menu_share_image">Cumpartzi s\'immàgine</string>
-    <string name="context_menu_open_external_browser">Aberi in un\'esploradore (browser) esternu…</string>
-    <string name="copy_link_to_clipboard">Còpia su ligàmenes in sos apuntos</string>
-    <string name="context_menu_copy_image_link">Còpia s\'indiritzu de s\'immàgine in sos apuntos</string>
+    <string name="share_link_address">Cumpartzi ligàmene</string>
+    <string name="save_image">Sarva s\'immàgine</string>
+    <string name="share_image">Cumpartzi s\'immàgine</string>
+    <string name="open_in_external_browser">Aberi in un\'esploradore (browser) esternu…</string>
+    <string name="copy_link_adress_to_clipboard">Còpia su ligàmenes in sos apuntos</string>
+    <string name="copy_image_address_to_clipboard">Còpia s\'indiritzu de s\'immàgine in sos apuntos</string>
 
 
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Impossìbile carrigare s\'immàgine</string>
 
     <!-- Permissions -->
-    <string name="permissions_screenshot">Depes frunire \"Permissu de atzessu a sa memòria\" pro sarvare sas ischermadas. A pustis dias dèpere         serrare de su totu s\'aplicatzione o torrare a allùghere su dispositivu. Si no as a frunire su permissu a sa memòria ma cheres impreare sa         funtzionalidade de ischermada, prus a tardu, l\'as a pòdere fàghere tando. Pro praghere aberi: systemsettings - apps -         dandelion*. In sa setzione pro sos permissosas a pòdere frunire su \"permissu de atzessu a sa memòria\".</string>
-    <string name="permissions_image">Depes frunire \"Permissu de atzessu a sa memòria\" pro sarvare e carrigare sas immàgines. A pustis dias dèpere         serrare de su totu s\'aplicatzione o torrare a allùghere su dispositivu. Si no as a frunire su permissu a sa memòria ma cheres impreare sa         funtzionalidade de ischermada, prus a tardu, l\'as a pòdere fàghere tando. Pro praghere aberi: systemsettings - apps -         dandelion*. In sa setzione pro sos permissosas a pòdere frunire su \"permissu de atzessu a sa memòria\".</string>
+    <string name="screenshot_permission__appspecific">Depes frunire \"Permissu de atzessu a sa memòria\" pro sarvare sas ischermadas. A pustis dias dèpere         serrare de su totu s\'aplicatzione o torrare a allùghere su dispositivu. Si no as a frunire su permissu a sa memòria ma cheres impreare sa         funtzionalidade de ischermada, prus a tardu, l\'as a pòdere fàghere tando. Pro praghere aberi: systemsettings - apps -         dandelion*. In sa setzione pro sos permissosas a pòdere frunire su \"permissu de atzessu a sa memòria\".</string>
+    <string name="image_permission_description__appspecific">Depes frunire \"Permissu de atzessu a sa memòria\" pro sarvare e carrigare sas immàgines. A pustis dias dèpere         serrare de su totu s\'aplicatzione o torrare a allùghere su dispositivu. Si no as a frunire su permissu a sa memòria ma cheres impreare sa         funtzionalidade de ischermada, prus a tardu, l\'as a pòdere fàghere tando. Pro praghere aberi: systemsettings - apps -         dandelion*. In sa setzione pro sos permissosas a pòdere frunire su \"permissu de atzessu a sa memòria\".</string>
     <string name="permission_denied">Permissu dennegadu.</string>
     <string name="permission_granted_try_again">Permissu cuntzessu. Pro praghere torra a proare.</string>
-    <string name="podselection__custom_pod">Pod personalizadu</string>
+    <string name="custom_pod">Pod personalizadu</string>
     <string name="pod_name">Nùmene de su pod</string>
-    <string name="http_protocol">Protocollu</string>
+    <string name="protocol">Protocollu</string>
     <string name="pod_address">Indiritzu de su pod</string>
     <string name="missing_value">Valore fartante</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Brincare a s\'ùrtima pàgina visitada in su flussu?</string>
-    <string name="pref_summary__is_statusbar_hidden">Istichi sa barra de s\'istadu in sa vista printzipale</string>
-    <string name="pref_title__is_statusbar_hidden">Istichi sa barra de s\'istadu</string>
-    <string name="pref_summary__show_title">Ammustra su tìtulu in sa vista printzipale</string>
-    <string name="pref_title__show_title">Ammustra tìtulu</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Brincare a s\'ùrtima pàgina visitada in su flussu?</string>
+    <string name="hide_statusbar_in_mainview">Istichi sa barra de s\'istadu in sa vista printzipale</string>
+    <string name="hide_statusbar">Istichi sa barra de s\'istadu</string>
+    <string name="show_title_in_main_view">Ammustra su tìtulu in sa vista printzipale</string>
+    <string name="show_title">Ammustra tìtulu</string>
     <string name="launcher_shortcut">Incurtzada de s\'allughidore</string>
 
 
@@ -146,33 +146,33 @@
     <!-- Key Names (Untranslatable) -->
 
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Sa barra superiore aberit su flussu</string>
-    <string name="pref_desc__topbar_stream_shortcut">Incarca in unu tretu bòidu in sa barra superiore de sas ainas pro abèrrere su flussu</string>
+    <string name="top_toolbar_loads_stream__appsp">Sa barra superiore aberit su flussu</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Incarca in unu tretu bòidu in sa barra superiore de sas ainas pro abèrrere su flussu</string>
 
 
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Aparèntzia</string>
-    <string name="pref_cat__network">Retza</string>
-    <string name="pref_cat__pod_settings">Impostatziones de su pod</string>
-    <string name="pref_cat__operability">Operabilidade</string>
+    <string name="appearance">Aparèntzia</string>
+    <string name="network">Retza</string>
+    <string name="pod_settings__appspecfic">Impostatziones de su pod</string>
+    <string name="operability">Operabilidade</string>
 
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Menù de nàvigu</string>
-    <string name="pref_desc__sub_nav_slider">Controlla sa visibilidade de sos elementos in su menù de nàvigu</string>
-    <string name="pref_cat__visibility_nav_items__user">Impreadore</string>
-    <string name="pref_cat__visibility_nav_items__general">Generales</string>
-    <string name="pref_cat__visibility_nav_items__admin">Amministratzione</string>
+    <string name="navigation_drawer">Menù de nàvigu</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controlla sa visibilidade de sos elementos in su menù de nàvigu</string>
+    <string name="user">Impreadore</string>
+    <string name="general">Generales</string>
+    <string name="admin">Amministratzione</string>
 
     <!-- Themes -->
-    <string name="pref_title__themes">Temas e colores</string>
-    <string name="pref_desc__themes">Controlla cales colores sunt impreados in s\'aplicatzione</string>
-    <string name="pref_title__primary_color">Colore primàriu</string>
-    <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="theme_and_colors">Temas e colores</string>
+    <string name="control_which_colors_are_used_in_app">Controlla cales colores sunt impreados in s\'aplicatzione</string>
+    <string name="primary_colors">Colore primàriu</string>
+    <string name="colors_of_toolbars">Colore de sas barras de sas ainas</string>
+    <string name="accent_color">Colore secondàriu</string>
+    <string name="color_of_progressbar">Colore de sa barra de progressu</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>
+    <string name="amoled_mode_description__app_specific">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="extended_notifications">Notìficas ismanniadas</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6cf0e5ca..79576339 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,64 +19,64 @@
     <string name="changelog">Ändringar</string>
     <string name="statistics">Statistik</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Alla Notiser</string>
-    <string name="notifications__also_commented">Kommenterade Även</string>
-    <string name="notifications__comment_on_post">Kommentar till tillägg</string>
-    <string name="notifications__liked">Gillade</string>
-    <string name="notifications__mentioned">Omnämnd</string>
-    <string name="notifications__reshared">Vidaredelad</string>
-    <string name="notifications__started_sharing">Började Dela</string>
+    <string name="all_notifications">Alla Notiser</string>
+    <string name="also_commented">Kommenterade Även</string>
+    <string name="comment_on_post">Kommentar till tillägg</string>
+    <string name="deleteme_____1">Gillade</string>
+    <string name="mentioned">Omnämnd</string>
+    <string name="reshared">Vidaredelad</string>
+    <string name="started_sharing">Började Dela</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Fel: Kunde inte hämta podlista!</string>
-    <string name="no_internet">Ursäkta, du måste ansluta till Internet för att fortsätta</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Fel: Kunde inte hämta podlista!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Ursäkta, du måste ansluta till Internet för att fortsätta</string>
     <string name="confirmation">Bekräftelse</string>
-    <string name="confirm_exit">Vill du avsluta?</string>
+    <string name="do_you_want_to_exit">Vill du avsluta?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Mer</string>
-    <string name="nav_help_license">Om | Hjälp</string>
-    <string name="nav_followed_tags">Följda Taggar</string>
-    <string name="nav_public_activities">Offentliga aktiviteter</string>
-    <string name="nav_reports">Rapporter</string>
-    <string name="share__share_link_as_text">Dela länk som text</string>
-    <string name="share__share_screenshot">Dela skämdump av en webbsida</string>
-    <string name="share__take_screenshot">Ta skärmdump av en webbsida</string>
-    <string name="share__toast_saved_image_to_location">Sparar bild som</string>
-    <string name="share__toast_screenshot">Sparar skärmdump som:</string>
-    <string name="share__toast_link_address_copied">Länkadress kopierad&#8230;</string>
+    <string name="more">Mer</string>
+    <string name="help_license">Om | Hjälp</string>
+    <string name="followed_tags">Följda Taggar</string>
+    <string name="public_activities">Offentliga aktiviteter</string>
+    <string name="reports">Rapporter</string>
+    <string name="share_link_as_text">Dela länk som text</string>
+    <string name="share_screenshot_of_webpage">Dela skämdump av en webbsida</string>
+    <string name="take_screenshot_of_webpage">Ta skärmdump av en webbsida</string>
+    <string name="saving_image_to">Sparar bild som</string>
+    <string name="saving_screenshot_as">Sparar skärmdump som:</string>
+    <string name="link_adress_copied">Länkadress kopierad&#8230;</string>
     <string name="new_post">Nytt inlägg</string>
-    <string name="action_go_to_top">Till toppen</string>
-    <string name="action_search_by_tags_or_persons">Sök på taggar eller personer</string>
-    <string name="action_exit_app">Avsluta appen</string>
-    <string name="action_toggle_desktop_page">Växla mellan telefon- och skrivbordsvy</string>
-    <string name="action_share_dotdotdot">Dela&#8230;</string>
-    <string name="search_alert_tag">efter taggar</string>
-    <string name="search_alert_people">efter människor</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Var god ange namn</string>
-    <string name="context_menu_share_link">Dela länkadress</string>
-    <string name="context_menu_save_image">Spara bild</string>
-    <string name="context_menu_share_image">Dela bild</string>
-    <string name="context_menu_open_external_browser">Öppna i en extern webbläsare&#8230;</string>
-    <string name="copy_link_to_clipboard">Kopiera länkadress</string>
-    <string name="context_menu_copy_image_link">Kopiera bildadressen</string>
+    <string name="go_to_top">Till toppen</string>
+    <string name="search_by_tags_or_persons__appspecific">Sök på taggar eller personer</string>
+    <string name="exit_app">Avsluta appen</string>
+    <string name="toggle_mobile_desktop_view">Växla mellan telefon- och skrivbordsvy</string>
+    <string name="share_dotdotdot">Dela&#8230;</string>
+    <string name="by_tags">efter taggar</string>
+    <string name="by_people">efter människor</string>
+    <string name="please_add_a_name">Var god ange namn</string>
+    <string name="share_link_address">Dela länkadress</string>
+    <string name="save_image">Spara bild</string>
+    <string name="share_image">Dela bild</string>
+    <string name="open_in_external_browser">Öppna i en extern webbläsare&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Kopiera länkadress</string>
+    <string name="copy_image_address_to_clipboard">Kopiera bildadressen</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Kunde inte ladda bilden</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Du måste bevilja lagringsbehörighet för att spara skärmdumpar. När du gjort det, bör du
+    <string name="screenshot_permission__appspecific">Du måste bevilja lagringsbehörighet för att spara skärmdumpar. När du gjort det, bör du
         stänga ned appen eller starta om din enhet. Om du inte vill bevilja lagringsbehörighet men ändå vill använda
         skärmdumpsfunktionen senare, kan du bevilja behörighet senare. Öppna då systeminställningarna, appar,
         dandelion*. Bland behörigheterna väljer du att bevilja den att skriva data.</string>
-    <string name="permissions_image">Du måste bevilja lagringsbehörighet för att spara och ladda upp bilder. När du gjort det, bör du
+    <string name="image_permission_description__appspecific">Du måste bevilja lagringsbehörighet för att spara och ladda upp bilder. När du gjort det, bör du
         stänga ned appen eller starta om din enhet. Om du inte vill bevilja lagringsbehörighet men ändå vill spara bilder
          senare, kan du bevilja behörighet senare. Öppna då systeminställningarna, appar,
         dandelion*. Bland behörigheterna väljer du att bevilja den att skriva data.</string>
     <string name="permission_denied">Åtkomst nekad.</string>
     <string name="permission_granted_try_again">Åtkomst beviljad. Var god försök igen.</string>
-    <string name="podselection__custom_pod">Anpassad pod</string>
+    <string name="custom_pod">Anpassad pod</string>
     <string name="pod_name">Podnamn</string>
-    <string name="http_protocol">Protokoll</string>
+    <string name="protocol">Protokoll</string>
     <string name="pod_address">Podadress</string>
     <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="jump_to_last_visited_page_in_stream__appspecific">Vill du hoppa senast besökta sida i strömmen?</string>
 
     <string name="about">Om</string>
     <string name="license">Licens</string>
@@ -120,29 +120,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Den övre verktygspanelen laddar stöm</string>
-    <string name="pref_desc__topbar_stream_shortcut">Tryck på en tom yta i övre verktygsfältet för att öppna strömmen</string>
+    <string name="top_toolbar_loads_stream__appsp">Den övre verktygspanelen laddar stöm</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Tryck på en tom yta i övre verktygsfältet för att öppna strömmen</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Utseende</string>
-    <string name="pref_cat__network">Nätverk</string>
-    <string name="pref_cat__pod_settings">Pod-inställningar</string>
-    <string name="pref_cat__operability">Funktionsdugligheten</string>
+    <string name="appearance">Utseende</string>
+    <string name="network">Nätverk</string>
+    <string name="pod_settings__appspecfic">Pod-inställningar</string>
+    <string name="operability">Funktionsdugligheten</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigeringsreglage</string>
-    <string name="pref_desc__sub_nav_slider">Kontrollera synligheten för inlägg i den utdragbara panelen</string>
-    <string name="pref_cat__visibility_nav_items__user">Användare</string>
-    <string name="pref_cat__visibility_nav_items__general">Generella</string>
-    <string name="pref_cat__visibility_nav_items__admin">Administratör</string>
+    <string name="navigation_drawer">Navigeringsreglage</string>
+    <string name="control_visibility_of_entries_nav_drawer">Kontrollera synligheten för inlägg i den utdragbara panelen</string>
+    <string name="user">Användare</string>
+    <string name="general">Generella</string>
+    <string name="admin">Administratör</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema och färger</string>
-    <string name="pref_desc__themes">Styr vilka färger som ska används i programmet</string>
-    <string name="pref_title__primary_color">Primär färg</string>
-    <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="theme_and_colors">Tema och färger</string>
+    <string name="control_which_colors_are_used_in_app">Styr vilka färger som ska används i programmet</string>
+    <string name="primary_colors">Primär färg</string>
+    <string name="colors_of_toolbars">Färgen på verktygspanelerna</string>
+    <string name="accent_color">Accentfärg</string>
+    <string name="color_of_progressbar">Färg på förloppsindikatorn</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>
+    <string name="amoled_mode_description__app_specific">Ö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="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>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 77%
rename from app/src/main/res/values-tr-rTR/strings.xml
rename to app/src/main/res/values-tr/strings.xml
index 709cc91d..e38e96a9 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,10 +19,10 @@
     <string name="changelog">Değişme Günlüğü</string>
     <string name="statistics">İstatistikler</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Tüm Bildimler</string>
-    <string name="notifications__also_commented">Ayrıca Yorumlar</string>
-    <string name="notifications__comment_on_post">Gönderine Yorumlar</string>
-    <string name="notifications__liked">Beğeniler</string>
+    <string name="all_notifications">Tüm Bildimler</string>
+    <string name="also_commented">Ayrıca Yorumlar</string>
+    <string name="comment_on_post">Gönderine Yorumlar</string>
+    <string name="deleteme_____1">Beğeniler</string>
     <!-- Pod Activity -->
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
     <!-- More from MainActivity -->
@@ -64,26 +64,26 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Üst araç çubuğu akışı yükler</string>
-    <string name="pref_desc__topbar_stream_shortcut">Üst araç çubuğunda boş bir yere tıklayarak akışı başlatabilirsiniz</string>
+    <string name="top_toolbar_loads_stream__appsp">Üst araç çubuğu akışı yükler</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Üst araç çubuğunda boş bir yere tıklayarak akışı başlatabilirsiniz</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Görünüş</string>
-    <string name="pref_cat__network">Ağ</string>
-    <string name="pref_cat__pod_settings">Pod Ayarları</string>
-    <string name="pref_cat__operability">Çalışabilirlik</string>
+    <string name="appearance">Görünüş</string>
+    <string name="network">Ağ</string>
+    <string name="pod_settings__appspecfic">Pod Ayarları</string>
+    <string name="operability">Çalışabilirlik</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Menü Kaydırıcı</string>
-    <string name="pref_cat__visibility_nav_items__user">Kullanıcı</string>
-    <string name="pref_cat__visibility_nav_items__general">Genel</string>
-    <string name="pref_cat__visibility_nav_items__admin">Yönetici</string>
+    <string name="navigation_drawer">Menü Kaydırıcı</string>
+    <string name="user">Kullanıcı</string>
+    <string name="general">Genel</string>
+    <string name="admin">Yönetici</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Tema ve Renkler</string>
-    <string name="pref_desc__themes">Uygulamada hangi renklerin kullanılacağını kontrol edin</string>
-    <string name="pref_title__primary_color">Birincil Renk</string>
-    <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="theme_and_colors">Tema ve Renkler</string>
+    <string name="control_which_colors_are_used_in_app">Uygulamada hangi renklerin kullanılacağını kontrol edin</string>
+    <string name="primary_colors">Birincil Renk</string>
+    <string name="colors_of_toolbars">Araç çubuğu rengi</string>
+    <string name="accent_color">Vurgu rengi</string>
+    <string name="color_of_progressbar">İlerleme çubuğunun rengi</string>
     <string name="amoled_mode">AMOLED Modu</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Genişletilmiş Bildirimler</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk/strings.xml
similarity index 72%
rename from app/src/main/res/values-uk-rUA/strings.xml
rename to app/src/main/res/values-uk/strings.xml
index 47ab10f7..8494c969 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -19,64 +19,64 @@
     <string name="changelog">Журнал змін</string>
     <string name="statistics">Статистика</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">Усі сповіщення</string>
-    <string name="notifications__also_commented">Також прокоментували</string>
-    <string name="notifications__comment_on_post">Коментар до допису</string>
-    <string name="notifications__liked">Вподобано</string>
-    <string name="notifications__mentioned">Згадано</string>
-    <string name="notifications__reshared">Поширено</string>
-    <string name="notifications__started_sharing">Додано</string>
+    <string name="all_notifications">Усі сповіщення</string>
+    <string name="also_commented">Також прокоментували</string>
+    <string name="comment_on_post">Коментар до допису</string>
+    <string name="deleteme_____1">Вподобано</string>
+    <string name="mentioned">Згадано</string>
+    <string name="reshared">Поширено</string>
+    <string name="started_sharing">Додано</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">Помилка: Не вдалося отримати список подів</string>
-    <string name="no_internet">На жаль, для продовження потрібне з\'єднання з інтернетом</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Помилка: Не вдалося отримати список подів</string>
+    <string name="sorry_need_to_be_connected_to_internet">На жаль, для продовження потрібне з\'єднання з інтернетом</string>
     <string name="confirmation">Підтвердження</string>
-    <string name="confirm_exit">Ви дійсно бажаєте вийти?</string>
+    <string name="do_you_want_to_exit">Ви дійсно бажаєте вийти?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">Ще</string>
-    <string name="nav_help_license">Про | Допомога</string>
-    <string name="nav_followed_tags">Відстежувані мітки</string>
-    <string name="nav_public_activities">Публічна діяльність</string>
-    <string name="nav_reports">Звіти</string>
-    <string name="share__share_link_as_text">Поширити посилання як текст</string>
-    <string name="share__share_screenshot">Поширити знімок екрану веб-сторінки</string>
-    <string name="share__take_screenshot">Зробити знімок екрану веб-сторінки</string>
-    <string name="share__toast_saved_image_to_location">Збереження зображення в</string>
-    <string name="share__toast_screenshot">Збереження знімка екрану як:</string>
-    <string name="share__toast_link_address_copied">Адресу посилання скопійовано&#8230;</string>
+    <string name="more">Ще</string>
+    <string name="help_license">Про | Допомога</string>
+    <string name="followed_tags">Відстежувані мітки</string>
+    <string name="public_activities">Публічна діяльність</string>
+    <string name="reports">Звіти</string>
+    <string name="share_link_as_text">Поширити посилання як текст</string>
+    <string name="share_screenshot_of_webpage">Поширити знімок екрану веб-сторінки</string>
+    <string name="take_screenshot_of_webpage">Зробити знімок екрану веб-сторінки</string>
+    <string name="saving_image_to">Збереження зображення в</string>
+    <string name="saving_screenshot_as">Збереження знімка екрану як:</string>
+    <string name="link_adress_copied">Адресу посилання скопійовано&#8230;</string>
     <string name="new_post">Новий допис</string>
-    <string name="action_go_to_top">Перейти нагору</string>
-    <string name="action_search_by_tags_or_persons">Шукати мітки чи людей</string>
-    <string name="action_exit_app">Вийти</string>
-    <string name="action_toggle_desktop_page">Перемкнути мобільний/стаціонарний вигляд</string>
-    <string name="action_share_dotdotdot">Поширити&#8230;</string>
-    <string name="search_alert_tag">за мітками</string>
-    <string name="search_alert_people">за людьми</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Будь ласка, додайте ім\'я</string>
-    <string name="context_menu_share_link">Поширити посилання</string>
-    <string name="context_menu_save_image">Зберегти зображення</string>
-    <string name="context_menu_share_image">Поділитися зображенням</string>
-    <string name="context_menu_open_external_browser">Відкрити у зовнішньому браузері&#8230;</string>
-    <string name="copy_link_to_clipboard">Копіювати адресу посилання у буфер обміну</string>
-    <string name="context_menu_copy_image_link">Копіювати зображення у буфер обміну</string>
+    <string name="go_to_top">Перейти нагору</string>
+    <string name="search_by_tags_or_persons__appspecific">Шукати мітки чи людей</string>
+    <string name="exit_app">Вийти</string>
+    <string name="toggle_mobile_desktop_view">Перемкнути мобільний/стаціонарний вигляд</string>
+    <string name="share_dotdotdot">Поширити&#8230;</string>
+    <string name="by_tags">за мітками</string>
+    <string name="by_people">за людьми</string>
+    <string name="please_add_a_name">Будь ласка, додайте ім\'я</string>
+    <string name="share_link_address">Поширити посилання</string>
+    <string name="save_image">Зберегти зображення</string>
+    <string name="share_image">Поділитися зображенням</string>
+    <string name="open_in_external_browser">Відкрити у зовнішньому браузері&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">Копіювати адресу посилання у буфер обміну</string>
+    <string name="copy_image_address_to_clipboard">Копіювати зображення у буфер обміну</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Не вдалося завантажити зображення</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">Ви маєте надати право доступу до внутрішньої пам\'яті, щоб зберігати знімки екрану. Після цього треба
+    <string name="screenshot_permission__appspecific">Ви маєте надати право доступу до внутрішньої пам\'яті, щоб зберігати знімки екрану. Після цього треба
         повністю закрити застосунок або перезапустити пристрій. Якщо ви не дозволяєте доступ до пам\'яті, але хочете використовувати 
         функцію знімків екрана пізніше, ви можете надати доступ пізніше. Будь ласка, відкрийте тоді Налаштування — Програми — 
         dandelion*. У розділі дозволів ви можете надати право «доступу до запису у пам\'ять».</string>
-    <string name="permissions_image">Ви маєте надати право доступу до внутрішньої пам\'яті, щоб зберігати/вивантажувати зображення. Після цього треба
+    <string name="image_permission_description__appspecific">Ви маєте надати право доступу до внутрішньої пам\'яті, щоб зберігати/вивантажувати зображення. Після цього треба
         повністю закрити застосунок або перезапустити пристрій. Якщо ви не дозволяєте доступ до пам\'яті, але хочете зберігати зображення
         пізніше, ви можете надати доступ пізніше. Будь ласка, відкрийте тоді Налаштування — Програми — 
         dandelion*. У розділі дозволів ви можете надати право «доступу до запису у пам\'ять».</string>
     <string name="permission_denied">Доступ заборонено.</string>
     <string name="permission_granted_try_again">Доступ надано. Будь ласка, спробуйте ще раз.</string>
-    <string name="podselection__custom_pod">Власний под</string>
+    <string name="custom_pod">Власний под</string>
     <string name="pod_name">Назва поду</string>
-    <string name="http_protocol">Протокол</string>
+    <string name="protocol">Протокол</string>
     <string name="pod_address">Адреса поду</string>
     <string name="missing_value">Відсутнє значення</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Перейти на останню відвідану сторінку в потоці?</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Перейти на останню відвідану сторінку в потоці?</string>
 
     <string name="about">Про нас</string>
     <string name="license">Ліцензія</string>
@@ -120,29 +120,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Верхня панель завантажує потік</string>
-    <string name="pref_desc__topbar_stream_shortcut">Натисніть на вільному місці верхньої панелі, щоб відкрити потік</string>
+    <string name="top_toolbar_loads_stream__appsp">Верхня панель завантажує потік</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Натисніть на вільному місці верхньої панелі, щоб відкрити потік</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Вигляд</string>
-    <string name="pref_cat__network">Мережа</string>
-    <string name="pref_cat__pod_settings">Налаштування поду</string>
-    <string name="pref_cat__operability">Працездатність</string>
+    <string name="appearance">Вигляд</string>
+    <string name="network">Мережа</string>
+    <string name="pod_settings__appspecfic">Налаштування поду</string>
+    <string name="operability">Працездатність</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Повзунок навігації</string>
-    <string name="pref_desc__sub_nav_slider">Налаштування видимості дописів у меню навігації</string>
-    <string name="pref_cat__visibility_nav_items__user">Користувач</string>
-    <string name="pref_cat__visibility_nav_items__general">Загальне</string>
-    <string name="pref_cat__visibility_nav_items__admin">Адмін</string>
+    <string name="navigation_drawer">Повзунок навігації</string>
+    <string name="control_visibility_of_entries_nav_drawer">Налаштування видимості дописів у меню навігації</string>
+    <string name="user">Користувач</string>
+    <string name="general">Загальне</string>
+    <string name="admin">Адмін</string>
     <!-- Themes -->
-    <string name="pref_title__themes">Теми і кольори</string>
-    <string name="pref_desc__themes">Налаштування кольорів, які використовуються у програмці</string>
-    <string name="pref_title__primary_color">Основний колір</string>
-    <string name="pref_desc__primary_color">Колір панелей</string>
-    <string name="pref_title__accent_color">Контрастний колір</string>
-    <string name="pref_desc__accent_color">Колір панелі прогресу</string>
+    <string name="theme_and_colors">Теми і кольори</string>
+    <string name="control_which_colors_are_used_in_app">Налаштування кольорів, які використовуються у програмці</string>
+    <string name="primary_colors">Основний колір</string>
+    <string name="colors_of_toolbars">Колір панелей</string>
+    <string name="accent_color">Контрастний колір</string>
+    <string name="color_of_progressbar">Колір панелі прогресу</string>
     <string name="amoled_mode">Режим AMOLED</string>
-    <string name="pref_desc__primary_color__amoled_mode">Замінити кольори у багатьох частинах програмки на чорний, сприядливий для AMOLED-дисплеїв. Вам треба здійснити перезавантаження, щоб це налаштування запрацювало. Щоб перекладати Діаспору* в темних тонах, Вам також треба активувати темну тему у своїх налаштуваннях обліковки Діаспори*.</string>
+    <string name="amoled_mode_description__app_specific">Замінити кольори у багатьох частинах програмки на чорний, сприядливий для AMOLED-дисплеїв. Вам треба здійснити перезавантаження, щоб це налаштування запрацювало. Щоб перекладати Діаспору* в темних тонах, Вам також треба активувати темну тему у своїх налаштуваннях обліковки Діаспори*.</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Розширені сповіщення</string>
     <string name="extendend_notifications_bell_description__appspecific">Додати до дзвоника сповіщень випадне меню з категоріями сповіщень</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 30c8a78e..fdbdc7ad 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,62 +19,62 @@
     <string name="changelog">更新紀錄</string>
     <string name="statistics">統計資料</string>
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">全部的通知</string>
-    <string name="notifications__also_commented">其他留言</string>
-    <string name="notifications__comment_on_post">貼文被留言</string>
-    <string name="notifications__liked">被按讚</string>
-    <string name="notifications__mentioned">被指指點點</string>
-    <string name="notifications__reshared">被分享</string>
-    <string name="notifications__started_sharing">開始分享</string>
+    <string name="all_notifications">全部的通知</string>
+    <string name="also_commented">其他留言</string>
+    <string name="comment_on_post">貼文被留言</string>
+    <string name="deleteme_____1">被按讚</string>
+    <string name="mentioned">被指指點點</string>
+    <string name="reshared">被分享</string>
+    <string name="started_sharing">開始分享</string>
     <!-- Pod Activity -->
-    <string name="podlist_error">錯誤: 無法取得豆莢列表！</string>
-    <string name="no_internet">抱歉，要有網路連線才能繼續</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">錯誤: 無法取得豆莢列表！</string>
+    <string name="sorry_need_to_be_connected_to_internet">抱歉，要有網路連線才能繼續</string>
     <string name="confirmation">確認</string>
-    <string name="confirm_exit">確定要退出嗎？</string>
+    <string name="do_you_want_to_exit">確定要退出嗎？</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">再來</string>
-    <string name="nav_help_license">說明 | 幫助</string>
-    <string name="nav_followed_tags">追蹤中的標籤</string>
-    <string name="nav_public_activities">公開活動</string>
-    <string name="nav_reports">回報</string>
-    <string name="share__share_link_as_text">分享連結文字</string>
-    <string name="share__share_screenshot">分享網頁截圖</string>
-    <string name="share__take_screenshot">產生網路截圖</string>
-    <string name="share__toast_saved_image_to_location">圖片儲存為</string>
-    <string name="share__toast_screenshot">截圖儲存為:</string>
-    <string name="share__toast_link_address_copied">已經複製了連結網址&#8230;</string>
+    <string name="more">再來</string>
+    <string name="help_license">說明 | 幫助</string>
+    <string name="followed_tags">追蹤中的標籤</string>
+    <string name="public_activities">公開活動</string>
+    <string name="reports">回報</string>
+    <string name="share_link_as_text">分享連結文字</string>
+    <string name="share_screenshot_of_webpage">分享網頁截圖</string>
+    <string name="take_screenshot_of_webpage">產生網路截圖</string>
+    <string name="saving_image_to">圖片儲存為</string>
+    <string name="saving_screenshot_as">截圖儲存為:</string>
+    <string name="link_adress_copied">已經複製了連結網址&#8230;</string>
     <string name="new_post">新增貼文</string>
-    <string name="action_go_to_top">回到最上面</string>
-    <string name="action_search_by_tags_or_persons">找人或標籤</string>
-    <string name="action_exit_app">退出應用程式</string>
-    <string name="action_toggle_desktop_page">切換行動/桌上型版面</string>
-    <string name="action_share_dotdotdot">分享&#8230;</string>
-    <string name="search_alert_tag">找標籤</string>
-    <string name="search_alert_people">找人</string>
-    <string name="search_alert_bypeople_validate_needsomedata">請輸入名稱</string>
-    <string name="context_menu_share_link">分享連結網址</string>
-    <string name="context_menu_save_image">儲存圖片</string>
-    <string name="context_menu_share_image">分享圖片</string>
-    <string name="context_menu_open_external_browser">用外部瀏覽器開啟&#8230;</string>
-    <string name="copy_link_to_clipboard">將連結網址複製到剪貼簿</string>
-    <string name="context_menu_copy_image_link">將圖片網址複製到剪貼簿</string>
+    <string name="go_to_top">回到最上面</string>
+    <string name="search_by_tags_or_persons__appspecific">找人或標籤</string>
+    <string name="exit_app">退出應用程式</string>
+    <string name="toggle_mobile_desktop_view">切換行動/桌上型版面</string>
+    <string name="share_dotdotdot">分享&#8230;</string>
+    <string name="by_tags">找標籤</string>
+    <string name="by_people">找人</string>
+    <string name="please_add_a_name">請輸入名稱</string>
+    <string name="share_link_address">分享連結網址</string>
+    <string name="save_image">儲存圖片</string>
+    <string name="share_image">分享圖片</string>
+    <string name="open_in_external_browser">用外部瀏覽器開啟&#8230;</string>
+    <string name="copy_link_adress_to_clipboard">將連結網址複製到剪貼簿</string>
+    <string name="copy_image_address_to_clipboard">將圖片網址複製到剪貼簿</string>
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">無法載入圖片</string>
     <!-- Permissions -->
-    <string name="permissions_screenshot">必須要給予應用程式「儲存空間」的權限，才能儲存畫面截圖。給予後應該要將應用程式完全結束，或是將裝置重新啟動。如果你現在沒給權限，之後才想要使用截圖功能，還是可以重給權限。作法是：先打開「設定」—應用程式—dandelion*，在「權限」的地方切換是否給予「儲存空間」權限。</string>
-    <string name="permissions_image">必須要給予應用程式「儲存空間」的權限，才能儲存或上傳圖片。給予後應該要將應用程式完全結束，或是將裝置重新啟動。如果你現在沒給權限，之後才想要儲存圖片，還是可以重給權限。作法是：先打開「設定」—應用程式—dandelion*，在「權限」的地方切換是否給予「儲存空間」權限。</string>
+    <string name="screenshot_permission__appspecific">必須要給予應用程式「儲存空間」的權限，才能儲存畫面截圖。給予後應該要將應用程式完全結束，或是將裝置重新啟動。如果你現在沒給權限，之後才想要使用截圖功能，還是可以重給權限。作法是：先打開「設定」—應用程式—dandelion*，在「權限」的地方切換是否給予「儲存空間」權限。</string>
+    <string name="image_permission_description__appspecific">必須要給予應用程式「儲存空間」的權限，才能儲存或上傳圖片。給予後應該要將應用程式完全結束，或是將裝置重新啟動。如果你現在沒給權限，之後才想要儲存圖片，還是可以重給權限。作法是：先打開「設定」—應用程式—dandelion*，在「權限」的地方切換是否給予「儲存空間」權限。</string>
     <string name="permission_denied">權限被拒絕了。</string>
     <string name="permission_granted_try_again">取得權限了。請再重試一次。</string>
-    <string name="podselection__custom_pod">自選豆莢</string>
+    <string name="custom_pod">自選豆莢</string>
     <string name="pod_name">豆莢名稱</string>
-    <string name="http_protocol">網路協定</string>
+    <string name="protocol">網路協定</string>
     <string name="pod_address">豆莢網址</string>
     <string name="missing_value">沒有填值</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">回到最近瀏覽的流水帳頁面嗎？</string>
-    <string name="pref_summary__is_statusbar_hidden">隱藏主畫面中的狀態列</string>
-    <string name="pref_title__is_statusbar_hidden">隱藏狀態列</string>
-    <string name="pref_summary__show_title">在主畫面中顯示標題列</string>
-    <string name="pref_title__show_title">顯示標題列</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">回到最近瀏覽的流水帳頁面嗎？</string>
+    <string name="hide_statusbar_in_mainview">隱藏主畫面中的狀態列</string>
+    <string name="hide_statusbar">隱藏狀態列</string>
+    <string name="show_title_in_main_view">在主畫面中顯示標題列</string>
+    <string name="show_title">顯示標題列</string>
 
     <string name="about">說明</string>
     <string name="license">授權條款</string>
@@ -118,29 +118,29 @@
 
     <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">上方工具列可載入流水帳</string>
-    <string name="pref_desc__topbar_stream_shortcut">可以點上方工具列的空白區域來進入流水帳</string>
+    <string name="top_toolbar_loads_stream__appsp">上方工具列可載入流水帳</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">可以點上方工具列的空白區域來進入流水帳</string>
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">外觀</string>
-    <string name="pref_cat__network">網路</string>
-    <string name="pref_cat__pod_settings">豆莢設定</string>
-    <string name="pref_cat__operability">操作</string>
+    <string name="appearance">外觀</string>
+    <string name="network">網路</string>
+    <string name="pod_settings__appspecfic">豆莢設定</string>
+    <string name="operability">操作</string>
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">側邊導覽選單</string>
-    <string name="pref_desc__sub_nav_slider">控制側邊導覽選單中顯示的項目</string>
-    <string name="pref_cat__visibility_nav_items__user">使用者</string>
-    <string name="pref_cat__visibility_nav_items__general">平常</string>
-    <string name="pref_cat__visibility_nav_items__admin">管理員</string>
+    <string name="navigation_drawer">側邊導覽選單</string>
+    <string name="control_visibility_of_entries_nav_drawer">控制側邊導覽選單中顯示的項目</string>
+    <string name="user">使用者</string>
+    <string name="general">平常</string>
+    <string name="admin">管理員</string>
     <!-- Themes -->
-    <string name="pref_title__themes">佈景主題和色彩</string>
-    <string name="pref_desc__themes">控制應用程式使用的顏色</string>
-    <string name="pref_title__primary_color">主要顏色</string>
-    <string name="pref_desc__primary_color">工具列使用的顏色</string>
-    <string name="pref_title__accent_color">強調顏色</string>
-    <string name="pref_desc__accent_color">進度條使用的顏色</string>
+    <string name="theme_and_colors">佈景主題和色彩</string>
+    <string name="control_which_colors_are_used_in_app">控制應用程式使用的顏色</string>
+    <string name="primary_colors">主要顏色</string>
+    <string name="colors_of_toolbars">工具列使用的顏色</string>
+    <string name="accent_color">強調顏色</string>
+    <string name="color_of_progressbar">進度條使用的顏色</string>
     <string name="amoled_mode">AMOLED 顯示模式</string>
-    <string name="pref_desc__primary_color__amoled_mode">在應用程式中使用適合 AMOLED 螢幕的黑色來顯示。改變這項設定後需要重開應用程式。另外你還需要使用色彩主題 Dark 才會有深色的版面，請到你的 diaspora* 帳號設定頁面修改。</string>
+    <string name="amoled_mode_description__app_specific">在應用程式中使用適合 AMOLED 螢幕的黑色來顯示。改變這項設定後需要重開應用程式。另外你還需要使用色彩主題 Dark 才會有深色的版面，請到你的 diaspora* 帳號設定頁面修改。</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">延伸型通知</string>
     <string name="extendend_notifications_bell_description__appspecific">將通知鈴伸展成為顯示通知類別的下拉式選單</string>
diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
index b63ea92c..aaa5137a 100644
--- a/app/src/main/res/values/strings-not_translatable.xml
+++ b/app/src/main/res/values/strings-not_translatable.xml
@@ -70,7 +70,7 @@
     <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>
+    <string name="pref_cat__more" translatable="false">@string/more</string>
 
     <!--
     Pref keys
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1fb98512..d61d659c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="open_navdrawer">Open navigation drawer</string>
+    <string name="close_navdrawer">Close navigation drawer</string>
     <string name="reload">Reload</string>
 
     <!-- Common Words -->
@@ -23,112 +23,112 @@
     <string name="statistics">Statistics</string>
 
     <!-- Notifications dropdown menu -->
-    <string name="notifications__all">All Notifications</string>
-    <string name="notifications__also_commented">Also Commented</string>
-    <string name="notifications__comment_on_post">Comment on Post</string>
-    <string name="notifications__liked">Liked</string>
-    <string name="notifications__mentioned">Mentioned</string>
-    <string name="notifications__reshared">Reshared</string>
-    <string name="notifications__started_sharing">Started Sharing</string>
+    <string name="all_notifications">All Notifications</string>
+    <string name="also_commented">Also Commented</string>
+    <string name="comment_on_post">Comment on Post</string>
+    <string name="deleteme_____1">Liked</string>
+    <string name="mentioned">Mentioned</string>
+    <string name="reshared">Reshared</string>
+    <string name="started_sharing">Started Sharing</string>
 
 
     <!-- Pod Activity -->
-    <string name="podlist_error">Error: Could not retrieve list of pods!</string>
+    <string name="could_not_retrieve_list_of_pods__appspecific">Error: Could not retrieve list of pods!</string>
 
-    <string name="no_internet">Sorry, you must be connected to the Internet to proceed</string>
+    <string name="sorry_need_to_be_connected_to_internet">Sorry, you must be connected to the Internet to proceed</string>
     <string name="confirmation">Confirmation</string>
-    <string name="confirm_exit">Do you want to exit?</string>
+    <string name="do_you_want_to_exit">Do you want to exit?</string>
 
 
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
-    <string name="nav_menu_more">More</string>
-    <string name="nav_help_license">About | Help</string>
-    <string name="nav_followed_tags">Followed Tags</string>
-    <string name="nav_public_activities">Public activities</string>
-    <string name="nav_reports">Reports</string>
+    <string name="more">More</string>
+    <string name="help_license">About | Help</string>
+    <string name="followed_tags">Followed Tags</string>
+    <string name="public_activities">Public activities</string>
+    <string name="reports">Reports</string>
 
-    <string name="share__share_link_as_text">Share link as text</string>
-    <string name="share__share_screenshot">Share screenshot of webpage</string>
-    <string name="share__take_screenshot">Take screenshot of webpage</string>
-    <string name="share__toast_saved_image_to_location">Saving image to</string>
-    <string name="share__toast_screenshot">Saving screenshot as:</string>
-    <string name="share__toast_link_address_copied">Link address copied …</string>
+    <string name="share_link_as_text">Share link as text</string>
+    <string name="share_screenshot_of_webpage">Share screenshot of webpage</string>
+    <string name="take_screenshot_of_webpage">Take screenshot of webpage</string>
+    <string name="saving_image_to">Saving image to</string>
+    <string name="saving_screenshot_as">Saving screenshot as:</string>
+    <string name="link_adress_copied">Link address copied …</string>
 
 
     <string name="new_post">New post</string>
-    <string name="action_go_to_top">Go to top</string>
-    <string name="action_search_by_tags_or_persons">Search by tags or persons</string>
-    <string name="action_exit_app">Exit app</string>
-    <string name="action_toggle_desktop_page">Toggle mobile/desktop view</string>
-    <string name="action_share_dotdotdot">Share…</string>
+    <string name="go_to_top">Go to top</string>
+    <string name="search_by_tags_or_persons__appspecific">Search by tags or persons</string>
+    <string name="exit_app">Exit app</string>
+    <string name="toggle_mobile_desktop_view">Toggle mobile/desktop view</string>
+    <string name="share_dotdotdot">Share…</string>
 
 
-    <string name="search_alert_tag">by tags</string>
-    <string name="search_alert_people">by people</string>
-    <string name="search_alert_bypeople_validate_needsomedata">Please add a name</string>
+    <string name="by_tags">by tags</string>
+    <string name="by_people">by people</string>
+    <string name="please_add_a_name">Please add a name</string>
 
-    <string name="context_menu_share_link">Share link address</string>
-    <string name="context_menu_save_image">Save image</string>
-    <string name="context_menu_share_image">Share image</string>
-    <string name="context_menu_open_external_browser">Open in external browser…</string>
-    <string name="copy_link_to_clipboard">Copy link address to clipboard</string>
-    <string name="context_menu_copy_image_link">Copy image address to clipboard</string>
+    <string name="share_link_address">Share link address</string>
+    <string name="save_image">Save image</string>
+    <string name="share_image">Share image</string>
+    <string name="open_in_external_browser">Open in external browser…</string>
+    <string name="copy_link_adress_to_clipboard">Copy link address to clipboard</string>
+    <string name="copy_image_address_to_clipboard">Copy image address to clipboard</string>
 
 
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Unable to load image</string>
 
     <!-- Permissions -->
-    <string name="permissions_screenshot">You must grant \"Access Storage Permission\" to save screenshots. After that you should
+    <string name="screenshot_permission__appspecific">You must grant \"Access Storage Permission\" to save screenshots. After that you should
         completely close the app or restart the device. If you don\'t permit the storage access but want to use the
         screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps -
         dandelion*. In the permissions section you can grant the \"write storage permission\".</string>
-    <string name="permissions_image">You must grant \"Access Storage Permission\" to save/upload images. After that you should
+    <string name="image_permission_description__appspecific">You must grant \"Access Storage Permission\" to save/upload images. After that you should
         completely close the app or restart the device. If you don\'t permit the storage access but want to save images
         at a later time, you can grant the permission later. Please open then: systemsettings - apps -
         dandelion*. In the permissions section you can grant the \"write storage permission\".</string>
     <string name="permission_denied">Permission denied.</string>
     <string name="permission_granted_try_again">Permission granted. Please try again.</string>
-    <string name="podselection__custom_pod">Custom Pod</string>
+    <string name="custom_pod">Custom Pod</string>
     <string name="pod_name">Pod name</string>
-    <string name="http_protocol">Protocol</string>
+    <string name="protocol">Protocol</string>
     <string name="pod_address">Pod address</string>
     <string name="missing_value">Missing value</string>
-    <string name="jump_to_last_visited_timestamp_in_stream">Jump to last visited page in stream?</string>
-    <string name="pref_summary__is_statusbar_hidden">Hide statusbar at main view</string>
-    <string name="pref_title__is_statusbar_hidden">Hide statusbar</string>
-    <string name="pref_summary__show_title">Show title in the main view</string>
-    <string name="pref_title__show_title">Show title</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Jump to last visited page in stream?</string>
+    <string name="hide_statusbar_in_mainview">Hide statusbar at main view</string>
+    <string name="hide_statusbar">Hide statusbar</string>
+    <string name="show_title_in_main_view">Show title in the main view</string>
+    <string name="show_title">Show title</string>
     <string name="launcher_shortcut">Launcher shortcut</string>
 
 
     <!-- Operability -->
-    <string name="pref_title__topbar_stream_shortcut">Top toolbar loads stream</string>
-    <string name="pref_desc__topbar_stream_shortcut">Click an empty space in the top toolbar to open the stream</string>
+    <string name="top_toolbar_loads_stream__appsp">Top toolbar loads stream</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Click an empty space in the top toolbar to open the stream</string>
 
     <!-- Category Titles -->
-    <string name="pref_cat__visuals">Appearance</string>
-    <string name="pref_cat__network">Network</string>
-    <string name="pref_cat__pod_settings">Pod settings</string>
-    <string name="pref_cat__operability">Operability</string>
+    <string name="appearance">Appearance</string>
+    <string name="network">Network</string>
+    <string name="pod_settings__appspecfic">Pod settings</string>
+    <string name="operability">Operability</string>
 
     <!-- Visuals -->
     <!-- Navigiation Slider -->
-    <string name="pref_title__sub_nav_slider">Navigation Slider</string>
-    <string name="pref_desc__sub_nav_slider">Control visibility of entries in the navigation drawer</string>
-    <string name="pref_cat__visibility_nav_items__user">User</string>
-    <string name="pref_cat__visibility_nav_items__general">General</string>
-    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
+    <string name="navigation_drawer">Navigation Slider</string>
+    <string name="control_visibility_of_entries_nav_drawer">Control visibility of entries in the navigation drawer</string>
+    <string name="user">User</string>
+    <string name="general">General</string>
+    <string name="admin">Admin</string>
 
     <!-- Themes -->
-    <string name="pref_title__themes">Theme and Colors</string>
-    <string name="pref_desc__themes">Control which colors are used throughout the app</string>
-    <string name="pref_title__primary_color">Primary Color</string>
-    <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="theme_and_colors">Theme and Colors</string>
+    <string name="control_which_colors_are_used_in_app">Control which colors are used throughout the app</string>
+    <string name="primary_colors">Primary Color</string>
+    <string name="colors_of_toolbars">Color of the toolbars</string>
+    <string name="accent_color">Accent Color</string>
+    <string name="color_of_progressbar">Color of the progressbar</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>
+    <string name="amoled_mode_description__app_specific">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="extended_notifications">Extended Notifications</string>
diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml
index bd04c9f6..7bb330f9 100644
--- a/app/src/main/res/xml/preferences__master.xml
+++ b/app/src/main/res/xml/preferences__master.xml
@@ -3,19 +3,19 @@
     <!-- Appearance -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
         android:key="@string/pref_key__title__appearance"
-        android:title="@string/pref_cat__visuals">
+        android:title="@string/appearance">
 
         <Preference
             android:icon="@drawable/ic_color_lens_black_24px"
             android:key="@string/pref_key__cat_themes"
-            android:summary="@string/pref_desc__themes"
-            android:title="@string/pref_title__themes"/>
+            android:summary="@string/control_which_colors_are_used_in_app"
+            android:title="@string/theme_and_colors"/>
 
         <Preference
             android:icon="@drawable/ic_visibility_on_black_24px"
             android:key="@string/pref_key__cat_nav_slider"
-            android:summary="@string/pref_desc__sub_nav_slider"
-            android:title="@string/pref_title__sub_nav_slider"/>
+            android:summary="@string/control_visibility_of_entries_nav_drawer"
+            android:title="@string/navigation_drawer"/>
 
         <net.gsantner.opoc.preference.nonsupport.LanguagePreference
             android:icon="@drawable/ic_language_black_48px"
@@ -36,7 +36,7 @@
 
     <!-- Operability -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-        android:title="@string/pref_cat__operability">
+        android:title="@string/operability">
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
@@ -49,8 +49,8 @@
             android:icon="@drawable/ic_visibility_black_24dp"
             android:defaultValue="false"
             android:key="@string/pref_key__is_overview_statusbar_hidden"
-            android:summary="@string/pref_summary__is_statusbar_hidden"
-            android:title="@string/pref_title__is_statusbar_hidden"/>
+            android:summary="@string/hide_statusbar_in_mainview"
+            android:title="@string/hide_statusbar"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
@@ -77,15 +77,15 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_touch_app_black_24px"
             android:key="@string/pref_key__topbar_stream_shortcut"
-            android:summary="@string/pref_desc__topbar_stream_shortcut"
-            android:title="@string/pref_title__topbar_stream_shortcut"/>
+            android:summary="@string/click_empty_space_top_toolbar_load_stream__appspecific"
+            android:title="@string/top_toolbar_loads_stream__appsp"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:icon="@drawable/ic_visibility_black_24dp"
             android:key="@string/pref_key__show_title"
-            android:summary="@string/pref_summary__show_title"
-            android:title="@string/pref_title__show_title"/>
+            android:summary="@string/show_title_in_main_view"
+            android:title="@string/show_title"/>
 
         <ListPreference
             android:defaultValue="@string/rotation_val_system"
@@ -101,7 +101,7 @@
     <!-- Diaspora Pod Settings -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
         android:key="@string/pref_key__title__pod_settings"
-        android:title="@string/pref_cat__pod_settings">
+        android:title="@string/pod_settings__appspecfic">
         <Preference
             android:icon="@drawable/ic_person_black_24px"
             android:key="@string/pref_key__personal_settings"
@@ -130,7 +130,7 @@
     <!-- Networking -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
         android:key="@string/pref_key__title__network"
-        android:title="@string/pref_cat__network">
+        android:title="@string/network">
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_file_download_black_24px"
diff --git a/app/src/main/res/xml/preferences__sub_navslider_vis.xml b/app/src/main/res/xml/preferences__sub_navslider_vis.xml
index 83908c26..037102aa 100644
--- a/app/src/main/res/xml/preferences__sub_navslider_vis.xml
+++ b/app/src/main/res/xml/preferences__sub_navslider_vis.xml
@@ -3,7 +3,7 @@
 
     <!-- User -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-        android:title="@string/pref_cat__visibility_nav_items__user">
+        android:title="@string/user">
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="true"
             android:key="@string/pref_key__visibility_nav__profile"
@@ -11,7 +11,7 @@
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="true"
             android:key="@string/pref_key__visibility_nav__followed_tags"
-            android:title="@string/nav_followed_tags"/>
+            android:title="@string/followed_tags"/>
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="true"
             android:key="@string/pref_key__visibility_nav__aspects"
@@ -39,7 +39,7 @@
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="false"
             android:key="@string/pref_key__visibility_nav__public_activities"
-            android:title="@string/nav_public_activities"/>
+            android:title="@string/public_activities"/>
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="false"
             android:key="@string/pref_key__visibility_nav__gsantner_account"
@@ -50,32 +50,32 @@
 
     <!-- General -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-        android:title="@string/pref_cat__visibility_nav_items__general">
+        android:title="@string/general">
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="true"
             android:key="@string/pref_key__visibility_nav__exit"
-            android:title="@string/action_exit_app"/>
+            android:title="@string/exit_app"/>
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="false"
             android:key="@string/pref_key__visibility_nav__toggle_mobile_desktop"
-            android:title="@string/action_toggle_desktop_page"/>
+            android:title="@string/toggle_mobile_desktop_view"/>
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="true"
             android:key="@string/pref_key__visibility_nav__help_license"
-            android:title="@string/nav_help_license"/>
+            android:title="@string/help_license"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
 
     <!-- Admin -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-        android:title="@string/pref_cat__visibility_nav_items__admin">
+        android:title="@string/admin">
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="false"
             android:key="@string/pref_key__visibility_nav__reports"
-            android:title="@string/nav_reports"/>
+            android:title="@string/reports"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
             android:defaultValue="false"
diff --git a/app/src/main/res/xml/preferences__sub_themes.xml b/app/src/main/res/xml/preferences__sub_themes.xml
index bfcc6685..ec5a5e00 100644
--- a/app/src/main/res/xml/preferences__sub_themes.xml
+++ b/app/src/main/res/xml/preferences__sub_themes.xml
@@ -2,23 +2,23 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
         android:key="@string/pref_key__title__themes"
-        android:title="@string/pref_title__themes">
+        android:title="@string/theme_and_colors">
     <com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
         android:key="@string/pref_key__primary_color__preference_click"
-        android:summary="@string/pref_desc__primary_color"
-        android:title="@string/pref_title__primary_color"
+        android:summary="@string/colors_of_toolbars"
+        android:title="@string/primary_colors"
         android:icon="@drawable/circle" />
 
     <com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
         android:key="@string/pref_key__accent_color__preference_click"
-        android:summary="@string/pref_desc__accent_color"
-        android:title="@string/pref_title__accent_color"
+        android:summary="@string/color_of_progressbar"
+        android:title="@string/accent_color"
         android:icon="@drawable/circle" />
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:key="@string/pref_key__primary_color__amoled_mode"
-            android:summary="@string/pref_desc__primary_color__amoled_mode"
+            android:summary="@string/amoled_mode_description__app_specific"
             android:title="@string/amoled_mode"
             android:icon="@drawable/ic_color_lens_black_24px" />
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>