diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index afecfe1a..5ac91667 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -21,7 +21,4 @@
   Description:
   What this is about, what happens and what is expected to happen. What needs to be done for it to happen.
   If a crash is happening a log is needed. Screenshots or demonstration videos are always helpful too.
-
-  About logging:
-  https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion#logcat
 -->
diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml
new file mode 100644
index 00000000..07923101
--- /dev/null
+++ b/.github/workflows/build-android-project.yml
@@ -0,0 +1,68 @@
+##############################################################################################################################
+# # Cleanup:
+#const sleep = ms => () => new Promise((resolve, reject) => window.setTimeout(resolve, ms));
+#Promise.resolve()
+#.then(() => {  document.getElementsByClassName("details-overlay details-reset position-relative d-inline-block ")[3].children[0].click();  })
+#.then(sleep(500))
+#.then(() => {  document.getElementsByClassName("dropdown-item btn-link menu-item-danger")[0].click();  })
+#.then(sleep(1000))
+#.then(() => {  document.getElementsByClassName("btn btn-block btn-danger")[0].click();});
+#
+# while [ 1 ] ; do sleep 4; xdotool key Up; sleep 0.1; xdotool key Return; done
+##############################################################################################################################
+
+name: "CI"
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, 'ci skip') && (!contains(github.event_name, 'pull_request') || (contains(github.event_name, 'pull_request') && github.event.pull_request.head.repo.full_name != github.repository))"
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: "Checkout: Code"
+      uses: actions/checkout@v2
+
+
+    - name: "Checkout: Code (PR)"
+      uses: actions/checkout@v2
+      if: "contains(github.event_name, 'pull_request')"
+      with:
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: "Setup: Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: "Cache: Gradle"
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.gradle
+          .gradle
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.*') }}
+
+    - name: "Build: Project with make"
+      run: make clean all
+
+    - name: "Build: List dist files"
+      if: always()
+      run: find dist -type f -maxdepth 2
+
+    - name: "Artifacts: All"
+      if: always()
+      uses: actions/upload-artifact@v2.2.1
+      with:
+        name: "all"
+        path: dist
+        retention-days: 5
+
+    - name: "Artifacts: Android APK"
+      uses: actions/upload-artifact@v2.2.1
+      with:
+        name: "android-apk"
+        path: |
+          dist/*.apk
diff --git a/.gitignore b/.gitignore
index 6aa6839b..59057232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ tmp/
 ### Gradle ###
 .gradle
 build/
+dist/
 gradle-app.setting
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b4204f72..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: android
-jdk: oraclejdk8
-
-before_cache:
-  # Do not cache a few Gradle files/directories (see https://docs.travis-ci.com/user/languages/java/#Caching)
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-cache:
-  directories:
-    # Android SDK
-    - $HOME/android-sdk-dl
-    - $HOME/android-sdk
-
-    # Gradle dependencies
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-    # Android build cache (see http://tools.android.com/tech-docs/build-cache)
-    - $HOME/.android/build-cache
-
-install:
-  # Download and unzip the Android SDK tools (if not already there thanks to the cache mechanism)
-  # Latest version available here: https://developer.android.com/studio/index.html#downloads
-  - if test ! -e $HOME/android-sdk-dl/sdk-tools.zip ; then curl https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip > $HOME/android-sdk-dl/sdk-tools.zip ; fi
-  - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk
-
-  # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'tools' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;26.0.2' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-27' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'extras;google;m2repository' > /dev/null
-
-branches:
-  except:
-    - gh-pages
-    - l10n_master
-    - crowdin
-
-env:
-  global:
-    - ANDROID_HOME=$HOME/android-sdk
-  matrix:
-    - TASK="clean lintFlavorDefaultDebug --stacktrace"
-    - TASK="clean build check -x lint --stacktrace"
-
-script: "./gradlew --no-daemon --parallel $TASK"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4950a5c..a5861d19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+### Recent changes
+- See [Discussions](https://github.com/gsantner/dandelion/discussions), [Issues](https://github.com/gsantner/dandelion/issues) and [Project page](https://github.com/gsantner/dandelion#readme) to see what is going on.
+
+### v1.4.0
+- Add seconds to 'save picture' date format
+- Updated translations
+- Added german F-Droid description translation
+- Update to Android SDK 29
+
+### v1.3.0
+- Add option to open youtube links external/in YouTube app (optional)  
+- Pull to refresh  
+
+### v1.2.3
+**Improved:**  
+- More supported languages, more complete translations!  
+
 ### v1.2.1
 **App release: dandelior**
 - Added an (rebranded) flavor of dandelion: dandelior
@@ -6,7 +23,6 @@
 
 **New features:**  
 - All new Aspects and Tags, using a searchable dialog
-- A new home - project blog/page: <https://gsantner.net/project/dandelion.html>
 
 **Fixed:**  
 - Sometimes the Stream went white, which is due an still (>3 years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7969e4cd..16e6a136 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,6 +1,5 @@
 <!--
 This file contains references to people who contributed to the app.
-You can also send a mail to [gsantner AT mailbox DOT org](http://gsantner.net#contact) to get included.
 
 Schema:  **[Name](Reference)**<br/>~° Text
 
@@ -9,11 +8,11 @@ Where:
   * Reference: E-Mail, Webpage
   * Text: Information about / kind of contribution
 
-  
+
 
 ## LIST OF CONTRIBUTORS
 -->
-* **[Gregor Santner](http://gsantner.net)**<br/>~° Current developer of dandelion
+* **[Gregor Santner](http://github.com/gsantner)**<br/>~° Development of dandelion
 * **[Paul Schaub](https://github.com/vanitasvitae)**<br/>~° Development of dandelion
 * **[Martín Vukovic](martinvukovic AT protonmail DOT com)**<br/>~° Diaspora Native WebApp
 * **[Gaukler Faun](https://github.com/scoute-dich)**<br/>~° Diaspora Native WebApp additions
@@ -30,3 +29,4 @@ Where:
 * **[Jean Lucas](jean AT 4ray DOT co)**<br/>~° Spanish translation
 * **[asereze](https://github.com/asereze)**<br/>~° Sardinian translation
 * **[Xosé M. Lamas](http://xmgz.eu)**<br />~° Galician translation
+* **[massimiliano](https://framagit.org/massimiliano)**<br />~° Contributor
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..09b21c00
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,99 @@
+# License of Makefile: Public Domain / CC0
+.PHONY: $(shell sed -n -e '/^$$/ { n ; /^[^ .\#][^ ]*:/ { s/:.*$$// ; p ; } ; }' $(MAKEFILE_LIST))
+.NOTPARALLEL: clean
+.DEFAULT_GOAL := all
+
+env-%:
+	@: $(if ${${*}},,$(error Environment variable $* not set))
+####################################################################################
+
+DIST_DIR = dist
+MOVE = mv
+
+all: $(DIST_DIR) spellcheck lint deptree test build aapt_dump_badging
+
+####################################################################################
+
+$(DIST_DIR):
+	mkdir -p ${DIST_DIR}
+
+ANDROID_BUILD_TOOLS := $(shell test -n "$ANDROID_SDK_ROOT" && find "${ANDROID_SDK_ROOT}/build-tools" -iname "aapt" | sort -r | head -n1 | xargs dirname)
+TOOL_SPELLCHECKING_ISPELL := $(shell command -v ispell 2> /dev/null)
+
+FLAVOR := $(or ${FLAVOR},${FLAVOR},Atest)
+
+.NOTPARALLEL: gradle gradle-analyze-log
+gradle: env-ANDROID_SDK_ROOT
+	mkdir -p $(DIST_DIR)/log/
+	chmod +x gradlew
+	./gradlew --no-daemon --parallel --stacktrace $A  2>&1 | tee "$(DIST_DIR)/log/gradle.log"
+	@echo "-----------------------------------------------------------------------------------"
+
+gradle-analyze-log:
+	mv  "$(DIST_DIR)/log/gradle.log" "$(DIST_DIR)/log/gradle$A.log"
+	cat "$(DIST_DIR)/log/gradle$A.log" | grep "BUILD " | tail -n1 | grep -q "BUILD SUCCESSFUL in"
+
+adb: env-ANDROID_SDK_ROOT
+	"${ANDROID_SDK_ROOT}/platform-tools/adb" $A 2>&1 | tee "$(DIST_DIR)/log/adb-$L.log"
+
+aapt: env-ANDROID_SDK_ROOT
+	"${ANDROID_BUILD_TOOLS}/aapt" $A 2>&1 | grep -v 'application-label-' | tee "$(DIST_DIR)/log/aapt$L.log"
+
+build:
+	rm -f $(DIST_DIR)/*.apk
+	$(MAKE) A="clean assembleFlavor$(FLAVOR) -x lint" gradle
+	find app -type f -newermt '-300 seconds' -iname '*.apk' -not -iname '*unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
+	$(MAKE) A="-build" gradle-analyze-log
+
+lint:
+	rm -Rf $(DIST_DIR)/lint
+	mkdir -p $(DIST_DIR)/lint/
+	$(MAKE) A="lintFlavorDefaultDebug" gradle
+	find app -type f -iname 'lint-results-*' | grep -v 'intermediates' | xargs cp -R -t $(DIST_DIR)/lint
+	$(MAKE) A="-lint" gradle-analyze-log
+
+test:
+	rm -Rf $(DIST_DIR)/tests
+	$(MAKE) A="testFlavorDefaultDebugUnitTest -x lint" gradle
+	mkdir -p app/build/test-results/testFlavorDefaultDebugUnitTest && echo 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHRlc3RzdWl0ZSBuYW1lPSJkdW1teSIgdGVzdHM9IjEiIHNraXBwZWQ9IjAiIGZhaWx1cmVzPSIwIiBlcnJvcnM9IjAiIHRpbWVzdGFtcD0iMjAyMC0xMi0wOFQwMDowMDowMCIgaG9zdG5hbWU9ImxvY2FsaG9zdCIgdGltZT0iMC4wMSI+CiAgPHByb3BlcnRpZXMvPgogIDx0ZXN0Y2FzZSBuYW1lPSJkdW1teSIgY2xhc3NuYW1lPSJkdW1teSIgdGltZT0iMC4wMSIvPgogIDxzeXN0ZW0tb3V0PjwhW0NEQVRBW11dPjwvc3lzdGVtLW91dD4KICA8c3lzdGVtLWVycj48IVtDREFUQVtdXT48L3N5c3RlbS1lcnI+CjwvdGVzdHN1aXRlPgo=' | base64 -d > 'app/build/test-results/testFlavorDefaultDebugUnitTest/TEST-dummy.xml'
+	find app -type d -iname 'testFlavorDefaultDebugUnitTest' | xargs cp -R -t $(DIST_DIR)/
+	mv ${DIST_DIR}/testFlavorDefaultDebugUnitTest $(DIST_DIR)/tests
+	$(MAKE) A="-test" gradle-analyze-log
+
+deptree:
+	$(MAKE) A="app:dependencies --configuration flavor$(FLAVOR)DebugRuntimeClasspath" gradle
+	$(MAKE) A="-dependency-tree" gradle-analyze-log
+
+clean:
+	$(MAKE) A="clean" gradle
+	rm -Rf $(DIST_DIR) app/build app/flavor* .idea dist
+	find . -type f -iname "*.iml" -delete
+	$(MAKE) $(DIST_DIR)
+	@echo "-----------------------------------------------------------------------------------"
+
+install:
+	$(MAKE) A="install -r $(DIST_DIR)/*.apk" L="install" adb
+
+run:
+	$(MAKE) A="shell monkey -p $$(aapt dump badging $(DIST_DIR)/*.apk | grep package: | sed 's@.* name=@@' | sed 's@ .*@@' | xargs | head -n1) -c android.intent.category.LAUNCHER 1" L="run" adb
+
+aapt_dump_badging:
+	$(MAKE) A="dump badging $(DIST_DIR)/*.apk" aapt
+	@echo "-----------------------------------------------------------------------------------"
+
+spellcheck:
+	mkdir -p "$(DIST_DIR)/lint/"
+ifndef TOOL_SPELLCHECKING_ISPELL
+	@echo "Tool ispell (spellcheck) not found in PATH. Spellcheck skipped." > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+else
+	@echo "Use ispell for spellchecking the original values/strings.xml"
+	find . -iname "strings.xml" -path "*/main*/values/*" | head -n1 | xargs cat \
+	   | grep "<string name=" | sed 's@.*">@@' | sed 's@</string>@@' | sed 's@\\n@  @g' | sed 's@\\@@g'  \
+	   | ispell -W3 -a | grep ^\& | sed 's@[0-9]@@g' | sort | uniq | cut -d, -f1-4 \
+	   | sed 's@^..@- @' | column -t -s: \
+	   > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "\nPotential words with bad spelling:"
+endif
+	@cat "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "-----------------------------------------------------------------------------------"
+
diff --git a/NEWS.md b/NEWS.md
new file mode 100644
index 00000000..6139d132
--- /dev/null
+++ b/NEWS.md
@@ -0,0 +1,96 @@
+# dandelion - News
+
+## General
+
+### Installation
+You can install and update from [F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android) or [GitHub](https://github.com/gsantner/dandelion/releases/latest).
+
+F-Droid is a store for free & open source apps.
+The *.apk's available for download are signed by the F-Droid team and guaranteed to correspond to the (open source) source code of dandelion.
+Generally this is the recommended way to install dandelion & keep it updated.
+
+
+### Get informed
+* Check the [project readme](https://github.com/gsantner/dandelion/tree/news#readme) for general project information.
+* Check the [project news](https://github.com/gsantner/dandelion/blob/master/NEWS.md#readme) for more details on what is going on.
+* Check the [project git history](https://github.com/gsantner/dandelion/commits/master) for most recent code changes.
+
+### The right place to ask
+If you have questions or found an issue please head to the [dandelion project](https://github.com/gsantner/dandelion/issues/new/choose) and ask there. 
+[Search](https://github.com/gsantner/dandelion/issues?q=#js-issues-search) for same/similar and related issues/questions before, it might be already answered or resolved.   
+
+
+### Navigation
+* [dandelion v1.2 - Add dandelior - Searchable Tags and Aspects](#dandelion-v12---add-dandelior---searchable-tags-and-aspects)
+* [dandelion v0.1.2 - Aspekte, Pod wechseln](#dandelion-v012---aspekte-pod-wechseln)
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion\* v1.2 - Add dandelior\* - Searchable Tags and Aspects
+_12. August 2018_
+
+## dandelior\* is a rebranded version of dandelion\*
+dandelior\* is based 100% on the same code and resources as dandelion\*. Its from the same code repository, just a different build flavor. 
+The main purpose of dandelior\* is the most requested feature till date - to support multiple accounts / another account at dandelion\*.
+
+- Added an (rebranded) flavor of dandelion: dandelior
+- Only differenties in use are other (black) icon and AMOLED colors by default enabled
+- Already available on F-Droid
+
+**New features:**  
+- All new Aspects and Tags, using a searchable dialog
+
+**Fixed:**  
+- Sometimes the Stream went white, which is due an still (3+ years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.
+
+**Improved:**
+- Various small tweaks
+- Updated translation files
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion v0.1.2 - Aspekte, Pod wechseln
+_05. Juni 2016_
+
+In den letzten Tagen hat @gsantner viel Zeit in die inoffizielle diaspora\* Android App ([dandelion\*](https://github.com/gsantner/dandelion)) investiert.
+
+Dabei wurden unter anderem folgende Änderungen beigesteuert:
+
+- Allgemeines zur Usability
+- Animationen für den Activity-Wechsel und Startup, WebView-Scroll-Top
+- Podliste caching
+- Aspekt-Liste und Aspekte hinzugefügt
+- Verbessertes Sharing aus der App
+- Material Progressbar
+- Suche verbessert
+- Collapsing top menu
+- toolbar/actions/menu geändert, fab entfernt
+- Refactoring layout & menu files, dialogs
+- Überarbeitete Main,Splash,PodSelectionActivity
+- Pod wechseln
diff --git a/README.md b/README.md
index 57ba4cc3..a061ee60 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-[![GitHub release](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
-[![Build Status](https://travis-ci.org/gsantner/dandelion.svg?branch=master)](https://travis-ci.org/gsantner/dandelion)
-[![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg)
-[![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org) [![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20irc-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=dandelion-anon|?##dandelion)
-[![Donate](https://img.shields.io/badge/donate-appreciation-orange.svg)](https://gsantner.net/supportme/?project=dandelion&source=readme)
-[![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/gsantner/donate)
+[![GitHub releases](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
+[![GitHub downloads](https://img.shields.io/github/downloads/gsantner/dandelion/total.svg?logo=github&logoColor=lime)](https://github.com/gsantner/dandelion/releases)
+[![Translate on Crowdin](https://img.shields.io/badge/translate-crowdin-green.svg)](https://crowdin.com/project/diaspora-for-android/invite)
+[![Chat on Matrix](https://img.shields.io/badge/chat-matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)
+[![GitHub CI](https://github.com/gsantner/dandelion/workflows/CI/badge.svg)](https://github.com/gsantner/dandelion/actions)
+[![Codacy code quality](https://img.shields.io/codacy/grade/aff869c440bc48b7bd64680e97cbc453)](https://www.codacy.com/app/gsantner/dandelion)
 
 # dandelion\*
 <img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
@@ -39,12 +39,11 @@ dandelion\* requires access to the Internet and to external storage to be able t
 
 ## Contributions
 The project is always open for contributions and accepts pull requests.
-The project uses [AOSP Java Code Style](https://source.android.com/source/code-style#follow-field-naming-conventions), with one exception: private members are `_camelCase` instead of `mBigCamel`. You may use Android Studios _auto reformat feature_ before sending a PR. See [gsantner's android contribution guide](https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=readme#logcat) for more information.
+The project uses [AOSP Java Code Style](https://source.android.com/source/code-style#follow-field-naming-conventions), with one exception: private members are `_camelCase` instead of `mBigCamel`. You may use Android Studios _auto reformat feature_ before sending a PR.
 
-Translations can be contributed on GitHub or via [E-Mail](https://gsantner.net/#contact). You can use Stringlate ([![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git)) to translate the project directly on your Android phone. It allows you to export as E-Mail attachement and to post on GitHub.
-
-Join our IRC or Matrix channel (bridged) and say hello! Don't be afraid to start talking. [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org) [![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20irc-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=dandelion-anon|?##dandelion)
+Translations can be contributed on GitHub. You can use Stringlate ([![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git)) to translate the project directly on your Android phone. It allows you to export as E-Mail attachement and to post on GitHub.
 
+Join our Matrix channel and say hello! Don't be afraid to start talking. [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)  
 Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
 
 
@@ -62,23 +61,21 @@ For more licensing informations, see [`3rd party licenses`](/app/src/main/res/ra
 
 ## Screenshots
 <div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/01.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/01.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
 </div>
 
 <div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/06.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/06.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
 </div>
 
 ### Notice
 #### Maintainers
-- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.net/supportme/?project=dandelion&source=readme), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
-  - Bitcoin: [1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5](https://gsantner.net/supportme/?project=dandelion&source=readme)
+- gsantner ([GitHub](https://github.com/gsantner), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
 - vanitasvitae ([GitHub](https://github.com/vanitasvitae), [diaspora*](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
-  - Bitcoin: 1Ao3W6NaQv3xKppviB7RSFKjHo6PGd8RTy
diff --git a/SCREENSHOTS.md b/SCREENSHOTS.md
deleted file mode 100644
index 9403120d..00000000
--- a/SCREENSHOTS.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Screenshots
-
-<div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/01.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
-</div>
-
-<div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/06.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
-</div>
diff --git a/app/build.gradle b/app/build.gradle
index 540277f5..09c8527f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,44 +6,27 @@ if (enable_plugin_kotlin) {
 }
 
 android {
-    compileSdkVersion version_setup_compileSdk
-    flavorDimensions "default"
+    buildToolsVersion rootProject.ext.version_buildTools
+    compileSdkVersion rootProject.ext.version_compileSdk
 
     defaultConfig {
-        minSdkVersion version_setup_minSdk
-        targetSdkVersion version_setup_targetSdk
+        resValue "string", "manifest_package_id", "com.github.dfa.diaspora_android"
+        applicationId "com.github.dfa.diaspora_android"
+        versionName "1.3.5"
+        versionCode 46
+        vectorDrawables.useSupportLibrary = true
+
+        minSdkVersion rootProject.ext.version_minSdk
+        targetSdkVersion rootProject.ext.version_compileSdk
         buildConfigField "boolean", "IS_TEST_BUILD", "false"
         buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
         buildConfigField "String[]", "DETECTED_ANDROID_LOCALES", "${findUsedAndroidLocales()}"
+        buildConfigField "String", "BUILD_DATE", "\"${getBuildDate()}\""
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
-        resValue "string", "manifest_package_id", "com.github.dfa.diaspora_android"
-
-        applicationId "com.github.dfa.diaspora_android"
-        versionName "1.2.2"
-        versionCode 35
-
-
-        vectorDrawables.useSupportLibrary = true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        if (enable_plugin_kotlin) {
-            main.java.srcDirs += 'src/main/kotlin'
-        }
+        setProperty("archivesBaseName", applicationId + "-v" + versionCode + "-" + versionName)
     }
 
+    flavorDimensions "default"
     productFlavors {
         flavorDefault {
         }
@@ -57,15 +40,58 @@ android {
             applicationId "net.gsantner.dandelior"
         }
 
-        flavorTest {
+        flavorAtest {
             applicationId "net.gsantner.secondlion"
             versionCode = Integer.parseInt(new Date().format('yyMMdd'))
             versionName = new Date().format('yyMMdd')
             buildConfigField "boolean", "IS_TEST_BUILD", "true"
         }
     }
+
+    sourceSets {
+        main { assets.srcDirs = ['src/main/assets'] }
+        if (enable_plugin_kotlin) {
+            main.java.srcDirs += 'src/main/kotlin'
+        }
+        main.java.srcDirs +=  'thirdparty/java'
+        main.res.srcDirs +=  'thirdparty/res'
+        main.assets.srcDirs +=  'thirdparty/assets'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            eachDependency { details ->
+                if (details.requested.group == 'com.android.support') {
+                    if (details.requested.name != 'multidex' && details.requested.name != 'multidex-instrumentation') {
+                        details.useVersion "${rootProject.ext.version_library_appcompat}"
+                    }
+                }
+            }
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE-LGPL-2.1.txt'
+        exclude 'META-INF/LICENSE-LGPL-3.txt'
+        exclude 'META-INF/LICENSE-W3C-TEST'
+    }
+
+    compileOptions {
+        encoding = 'UTF-8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
-        disable 'MissingTranslation'
+        disable 'MissingTranslation', 'InvalidPackage', 'ObsoleteLintCustomCheck', 'DefaultLocale', 'UnusedAttribute', 'VectorRaster', 'InflateParams', 'IconLocation', 'UnusedResources', 'TypographyEllipsis'
+        abortOnError false
     }
 }
 
@@ -75,7 +101,7 @@ dependencies {
 
     // Jars
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 
     // Android standard libs
     implementation "com.android.support:appcompat-v7:${version_library_appcompat}"
@@ -83,16 +109,19 @@ dependencies {
     implementation "com.android.support:support-v4:${version_library_appcompat}"
     implementation "com.android.support:customtabs:${version_library_appcompat}"
     implementation "com.android.support:cardview-v7:${version_library_appcompat}"
+    implementation "com.android.support:preference-v7:${version_library_appcompat}"
 
     // UI libraries
     implementation "com.github.DASAR:ShiftColorPicker:v0.5"
 
     // Tool libraries
+    implementation 'commons-io:commons-io:2.6'
     implementation "info.guardianproject.netcipher:netcipher:${version_library_netcipher}"
     implementation "info.guardianproject.netcipher:netcipher-webkit:${version_library_netcipher}"
+    //noinspection AnnotationProcessorOnCompilePath
     implementation "com.jakewharton:butterknife:${version_library_butterknife}"
     if (enable_plugin_kotlin) {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$version_plugin_kotlin"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version_plugin_kotlin}"
     }
 
     // Processors
diff --git a/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml
rename to app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher.xml
diff --git a/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml b/app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml
rename to app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/flavorTest/res/drawable-hdpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-hdpi/ic_launcher.png
rename to app/src/flavorAtest/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/flavorTest/res/drawable-hdpi/ic_launcher_round.png b/app/src/flavorAtest/res/drawable-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-hdpi/ic_launcher_round.png
rename to app/src/flavorAtest/res/drawable-hdpi/ic_launcher_round.png
diff --git a/app/src/flavorAtest/res/drawable-ldpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 00000000..b85b0c40
Binary files /dev/null and b/app/src/flavorAtest/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/flavorTest/res/drawable-mdpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-mdpi/ic_launcher.png
rename to app/src/flavorAtest/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/flavorTest/res/drawable-mdpi/ic_launcher_round.png b/app/src/flavorAtest/res/drawable-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-mdpi/ic_launcher_round.png
rename to app/src/flavorAtest/res/drawable-mdpi/ic_launcher_round.png
diff --git a/app/src/flavorTest/res/drawable-xhdpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xhdpi/ic_launcher.png
rename to app/src/flavorAtest/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/flavorTest/res/drawable-xhdpi/ic_launcher_round.png b/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xhdpi/ic_launcher_round.png
rename to app/src/flavorAtest/res/drawable-xhdpi/ic_launcher_round.png
diff --git a/app/src/flavorTest/res/drawable-xxhdpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xxhdpi/ic_launcher.png
rename to app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/flavorTest/res/drawable-xxhdpi/ic_launcher_round.png b/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xxhdpi/ic_launcher_round.png
rename to app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher_round.png
diff --git a/app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher.png b/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher.png
rename to app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher_round.png b/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher_round.png
rename to app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/flavorTest/res/drawable/ic_launcher_background.xml b/app/src/flavorAtest/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/flavorTest/res/drawable/ic_launcher_background.xml
rename to app/src/flavorAtest/res/drawable/ic_launcher_background.xml
diff --git a/app/src/flavorTest/res/drawable/ic_launcher_foreground.xml b/app/src/flavorAtest/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/flavorTest/res/drawable/ic_launcher_foreground.xml
rename to app/src/flavorAtest/res/drawable/ic_launcher_foreground.xml
diff --git a/app/src/flavorTest/res/ic_launcher-web.png b/app/src/flavorAtest/res/ic_launcher-web.png
similarity index 100%
rename from app/src/flavorTest/res/ic_launcher-web.png
rename to app/src/flavorAtest/res/ic_launcher-web.png
diff --git a/app/src/flavorTest/res/values/strings-flavor.xml b/app/src/flavorAtest/res/values/strings-flavor.xml
similarity index 100%
rename from app/src/flavorTest/res/values/strings-flavor.xml
rename to app/src/flavorAtest/res/values/strings-flavor.xml
diff --git a/app/src/flavorDandelior/ic_launcher-web.png b/app/src/flavorDandelior/ic_launcher-web.png
index 91d4f752..39789cb4 100644
Binary files a/app/src/flavorDandelior/ic_launcher-web.png and b/app/src/flavorDandelior/ic_launcher-web.png differ
diff --git a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png
index 63a719ac..07dad0c9 100644
Binary files a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png
index c64eb6a6..07dad0c9 100644
Binary files a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png differ
diff --git a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png
index 5ccf4981..66c10bba 100644
Binary files a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png
index c0ff8a34..66c10bba 100644
Binary files a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png differ
diff --git a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png
index 162c8910..1288f555 100644
Binary files a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png
index 062b3c81..70ce8fb1 100644
Binary files a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png
index 776b6491..37e164bc 100644
Binary files a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png
index 948fdea3..d9040fa3 100644
Binary files a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png
index 16a0c5e3..56e46378 100644
Binary files a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png
index f0f4e870..56e46378 100644
Binary files a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png
index 2e04f097..9fe1d567 100644
Binary files a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png and b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png
index abb14898..9fe1d567 100644
Binary files a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png and b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/flavorTest/res/drawable-ldpi/ic_launcher.png b/app/src/flavorTest/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index a4c4ac0b..00000000
Binary files a/app/src/flavorTest/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba46503f..2e1a7bd1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/DiasporaLight">
 
         <provider
@@ -59,7 +60,8 @@
             android:theme="@style/DiasporaLight.NoActionBar"
             android:windowSoftInputMode="adjustResize">
 
-            <meta-data android:name="android.app.shortcuts"
+            <meta-data
+                android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
 
             <intent-filter>
@@ -68,6 +70,7 @@
                 <action android:name="sc_aspects" />
                 <action android:name="sc_activities" />
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/App.java b/app/src/main/java/com/github/dfa/diaspora_android/App.java
index 841730e2..150cb378 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/App.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/App.java
@@ -36,6 +36,7 @@ import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 
 import net.gsantner.opoc.util.AdBlock;
 import net.gsantner.opoc.util.ContextUtils;
+import net.gsantner.opoc.util.ShareUtil;
 
 public class App extends Application {
     private volatile static App app;
@@ -51,6 +52,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        ShareUtil.setFileProviderAuthority(BuildConfig.APPLICATION_ID);
         app = this;
         final Context c = getApplicationContext();
         appSettings = AppSettings.get();
@@ -58,7 +60,7 @@ public class App extends Application {
         String a = new ContextUtils(this).bcstr("FLAVOR", "");
         a += "__";
 
-        if (appSettings.isAppFirstStart() && "flavorDandelior".equals(new ContextUtils(this).bcstr("FLAVOR", ""))){
+        if (appSettings.isAppFirstStart() && "flavorDandelior".equals(new ContextUtils(this).bcstr("FLAVOR", ""))) {
             appSettings.setAmoledColorMode(true);
         }
 
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 b583fffe..03517332 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
@@ -128,7 +128,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         AppLog.d(this, "StreamFragment.onOptionsItemSelected()");
-        ShareUtil shu = new ShareUtil(getContext()).setFileProviderAuthority(BuildConfig.APPLICATION_ID);
+        ShareUtil shu = new ShareUtil(getContext());
         PermissionChecker permc = new PermissionChecker(getActivity());
         switch (item.getItemId()) {
             case R.id.action_reload: {
@@ -185,7 +185,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                     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);
+                        _cu.writeImageToFile(new File(fileSaveDirectory, filename), bmp);
                         Snackbar.make(webView, getString(R.string.saving_screenshot_as)
                                 + " " + filename, Snackbar.LENGTH_LONG).show();
                     }
@@ -195,7 +195,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
 
             case R.id.action_share_screenshot: {
                 if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
-                    shu.shareImage(ShareUtil.getBitmapFromWebView(webView), Bitmap.CompressFormat.JPEG);
+                    shu.shareImage(ShareUtil.getBitmapFromWebView(webView));
                 }
                 return true;
             }
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 9eb6045a..ba8af918 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
@@ -565,12 +565,10 @@ public class MainActivity extends ThemedActivity
         } else if ("sc_activities".equals(action)) {
             openDiasporaUrl(urls.getActivityUrl());
             return;
-        }
-        else if ("sc_contacts".equals(action)) {
+        } else if ("sc_contacts".equals(action)) {
             onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_aspects));
             return;
-        }
-        else if ("sc_tags".equals(action)) {
+        } else if ("sc_tags".equals(action)) {
             onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_followed_tags));
             return;
         }
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 acda2b0d..0a38744e 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
@@ -271,6 +271,8 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
 
         @Override
         public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+            AppSettings settings = ((App) getActivity().getApplication()).getSettings();
+            DiasporaUrlHelper diasporaUrlHelper = new DiasporaUrlHelper(settings);
             if (isAdded() && preference.hasKey()) {
                 String key = preference.getKey();
                 if (key.equals(getString(R.string.pref_key__primary_color__preference_click))) {
@@ -279,6 +281,13 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                 } else if (key.equals(getString(R.string.pref_key__accent_color__preference_click))) {
                     showColorPickerDialog(2);
                     return true;
+                } else if (key.equals(getString(R.string.pref_key__manage_theme))) {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    intent.setAction(MainActivity.ACTION_OPEN_URL);
+                    intent.putExtra(MainActivity.URL_MESSAGE, diasporaUrlHelper.getThemeUrl());
+                    startActivity(intent);
+                    getActivity().finish();
+                    return true;
                 }
             }
             return super.onPreferenceTreeClick(screen, preference);
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
index e0fa9955..3052ea77 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 
 /**
- * Created by gsantner (https://gsantner.net/ on 30.09.16.
+ * Created by gsantner (gsantner AT mailbox DOT org on 30.09.16.
  * DiasporaPodList  - List container for DiasporaPod's, with methods to merge with other DiasporaPodLists
  * DiasporaPod      - Data container for a Pod, can include N DiasporaPodUrl's
  * DiasporaPodUrl   - A Url of an DiasporaPod
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java
index e54b351a..22efea59 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java
@@ -32,7 +32,7 @@ import org.json.JSONObject;
 
 /**
  * User profile
- * Created by gsantner (https://gsantner.net/) on 24.03.16.  Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 24.03.16.  Part of dandelion*.
  */
 public class DiasporaUserProfile {
     private static final int MINIMUM_USERPROFILE_LOAD_TIMEDIFF = 5000;
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java
index 644612c4..dc1b67dc 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java
@@ -21,7 +21,7 @@ package com.github.dfa.diaspora_android.listener;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
 
 /**
- * Created by gsantner (https://gsantner.net/) on 26.03.16.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 26.03.16.
  * Interface that needs to be implemented by classes that listen for Profile related changes
  */
 public interface DiasporaUserProfileChangedListener {
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
index aa885038..abb31703 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
@@ -37,7 +37,7 @@ import butterknife.OnItemSelected;
 
 /**
  * Dialog that helps the user configure a pod
- * Created by gsantner (http://gsantner.net) on 06.10.16.
+ * Created by gsantner on 06.10.16.
  */
 public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
     public static final String TAG = "com.github.dfa.diaspora_android.ui.PodSelectionDialog";
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
index 8d3bb655..1ced82bb 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * Settings
- * Created by gsantner (https://gsantner.net/) on 20.03.16. Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 20.03.16. Part of dandelion*.
  */
 @SuppressWarnings("ConstantConditions")
 public class AppSettings extends SharedPreferencesPropertyBackend {
@@ -359,6 +359,14 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
         return getBool(R.string.pref_key__topbar_stream_shortcut, false);
     }
 
+    public boolean isOpenYoutubeExternalEnabled() {
+        return getBool(R.string.pref_key__open_youtube_external_enabled, true);
+    }
+
+    public boolean isSwipeRefreshEnabled() {
+        return getBool(R.string.pref_key__swipe_refresh_enabled, true);
+    }
+
     public String getScreenRotation() {
         return getString(R.string.pref_key__screen_rotation, R.string.rotation_val_system);
     }
@@ -443,6 +451,7 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
     public boolean isAmoledColorMode() {
         return getBool(R.string.pref_key__primary_color__amoled_mode, false);
     }
+
     public void setAmoledColorMode(boolean enable) {
         setBool(R.string.pref_key__primary_color__amoled_mode, enable);
     }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
index a283540b..b272dac0 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
@@ -62,6 +62,7 @@ public class DiasporaUrlHelper {
     public static final String SUBURL_NOTIFICATIONS_MENTIONED = "/notifications?type=mentioned";
     public static final String SUBURL_NOTIFICATIONS_RESHARED = "/notifications?type=reshared";
     public static final String SUBURL_NOTIFICATIONS_STARTED_SHARING = "/notifications?type=started_sharing";
+    public static final String SUBURL_THEME = "/user/edit";
 
     public DiasporaUrlHelper(AppSettings settings) {
         this.settings = settings;
@@ -353,4 +354,13 @@ public class DiasporaUrlHelper {
         }
         return app.getString(R.string.aspects);
     }
+
+    /**
+     * Return a url that points to the settings of the pod.
+     *
+     * @return https://(pod-domain.tld)/user/edit
+     */
+    public String getThemeUrl() {
+        return getPodUrl() + SUBURL_THEME;
+    }
 }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
index 28db279b..bfc53fd9 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
@@ -21,6 +21,7 @@ package com.github.dfa.diaspora_android.web;
 import android.content.Context;
 import android.content.MutableContextWrapper;
 import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
@@ -50,6 +51,7 @@ public class BrowserFragment extends ThemedFragment {
     protected WebSettings webSettings;
 
     protected String pendingUrl;
+    protected SwipeRefreshLayout swipe;//pull to refresh
 
     @Override
     protected int getLayoutResId() {
@@ -90,6 +92,18 @@ public class BrowserFragment extends ThemedFragment {
         webView.setParentActivity(getActivity());
 
         this.setRetainInstance(true);
+
+        //pull to refresh
+        swipe = view.findViewById(R.id.swipe);
+        swipe.setDistanceToTriggerSync(2000);
+        swipe.setOnRefreshListener(() -> reloadUrl());
+        if (appSettings.isSwipeRefreshEnabled()) {
+            swipe.setEnabled(true);
+        } else {
+            swipe.setRefreshing(false);
+            swipe.setEnabled(false);
+            return;
+        }
     }
 
     @Override
@@ -192,6 +206,7 @@ public class BrowserFragment extends ThemedFragment {
                 @Override
                 public void run() {
                     getWebView().reload();
+                    swipe.setRefreshing(false);//pull to refresh
                 }
             });
 
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 277b2caa..e1194c9e 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
@@ -78,7 +78,7 @@ public class ContextMenuWebView extends NestedWebView {
             public boolean onMenuItemClick(MenuItem item) {
                 HitTestResult result = getHitTestResult();
                 String url = result.getExtra();
-                final ShareUtil shu = new ShareUtil(context).setFileProviderAuthority(BuildConfig.APPLICATION_ID);
+                final ShareUtil shu = new ShareUtil(context);
                 final PermissionChecker permc = new PermissionChecker(parentActivity);
                 final AppSettings appSettings = new AppSettings(context);
 
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
index c6af6f85..5e0011d8 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
@@ -20,6 +20,7 @@ package com.github.dfa.diaspora_android.web;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.LocalBroadcastManager;
 import android.webkit.CookieManager;
@@ -38,6 +39,7 @@ public class CustomWebViewClient extends WebViewClient {
     private final App app;
     private String lastLoadUrl = "";
     private boolean isAdBlockEnabled = false;
+    AppSettings appSettings = AppSettings.get();
 
     public CustomWebViewClient(App app, WebView webView) {
         this.app = app;
@@ -56,6 +58,11 @@ public class CustomWebViewClient extends WebViewClient {
                 || (host != null && (url.startsWith("https://" + host)
                 || url.startsWith("http://" + host)))) {
             return false;
+        }//make youtube links open external-->never customtab
+        else if (appSettings.isOpenYoutubeExternalEnabled() && (url.startsWith("https://youtube.com/") || url.startsWith("https://www.youtube.com/") || url.startsWith("https://m.youtube.com/") || url.startsWith("https://youtu.be/"))) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            view.getContext().startActivity(intent);
+            return true;
         } else {
             Intent i = new Intent(MainActivity.ACTION_OPEN_EXTERNAL_URL);
             i.putExtra(MainActivity.EXTRA_URL, url);
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java
index 44cf8ad3..49d10340 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java
@@ -32,7 +32,6 @@ import com.github.dfa.diaspora_android.activity.MainActivity;
 
 /**
  * Created by Gregor Santner on 07.08.16.
- * http://gsantner.net
  */
 public class WebHelper {
 
diff --git a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java b/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
index cab23816..479551d9 100644
--- a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
+++ b/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -16,10 +15,15 @@ import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import net.gsantner.opoc.android.dummy.MenuItemDummy;
 import net.gsantner.opoc.util.ContextUtils;
 
 import butterknife.ButterKnife;
@@ -33,6 +37,7 @@ public abstract class GsFragmentBase extends Fragment {
 
     protected ContextUtils _cu;
     protected Bundle _savedInstanceState = null;
+    protected Menu _fragmentMenu = new MenuItemDummy.Menu();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -51,6 +56,9 @@ public abstract class GsFragmentBase extends Fragment {
         _cu = new ContextUtils(inflater.getContext());
         _cu.setAppLanguage(getAppLanguage());
         _savedInstanceState = savedInstanceState;
+        if (getLayoutResId() == 0) {
+            Log.e(getClass().getCanonicalName(), "Error: GsFragmentbase.onCreateview: Returned 0 for getLayoutResId");
+        }
         View view = inflater.inflate(getLayoutResId(), container, false);
         ButterKnife.bind(this, view);
         return view;
@@ -126,4 +134,27 @@ public abstract class GsFragmentBase extends Fragment {
             }
         }
     }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        _fragmentMenu = menu;
+    }
+
+    public Menu getFragmentMenu() {
+        return _fragmentMenu;
+    }
+
+    /**
+     * Get the toolbar from activity
+     * Requires id to be set to @+id/toolbar
+     */
+    @SuppressWarnings("ConstantConditions")
+    protected Toolbar getToolbar() {
+        try {
+            return (Toolbar) getActivity().findViewById(new ContextUtils(getActivity()).getResId(ContextUtils.ResType.ID, "toolbar"));
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java b/app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java
new file mode 100644
index 00000000..5d3b5f97
--- /dev/null
+++ b/app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java
@@ -0,0 +1,351 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+public class MenuItemDummy implements MenuItem {
+    private final int _itemId;
+
+    public MenuItemDummy(final int itemId) {
+        _itemId = itemId;
+    }
+
+    @Override
+    public int getItemId() {
+        return _itemId;
+    }
+
+    @Override
+    public int getGroupId() {
+        return 0;
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setTitle(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitle(int title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitleCondensed(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitleCondensed() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(Drawable icon) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(int iconRes) {
+        return null;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIntent(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public Intent getIntent() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setShortcut(char numericChar, char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setNumericShortcut(char numericChar) {
+        return null;
+    }
+
+    @Override
+    public char getNumericShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setAlphabeticShortcut(char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public char getAlphabeticShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setCheckable(boolean checkable) {
+        return null;
+    }
+
+    @Override
+    public boolean isCheckable() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setChecked(boolean checked) {
+        return null;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setVisible(boolean visible) {
+        return null;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean hasSubMenu() {
+        return false;
+    }
+
+    @Override
+    public SubMenu getSubMenu() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener menuItemClickListener) {
+        return null;
+    }
+
+    @Override
+    public ContextMenu.ContextMenuInfo getMenuInfo() {
+        return null;
+    }
+
+    @Override
+    public void setShowAsAction(int actionEnum) {
+    }
+
+    @Override
+    public MenuItem setShowAsActionFlags(int actionEnum) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(View view) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(int resId) {
+        return null;
+    }
+
+    @Override
+    public View getActionView() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionProvider(ActionProvider actionProvider) {
+        return null;
+    }
+
+    @Override
+    public ActionProvider getActionProvider() {
+        return null;
+    }
+
+    @Override
+    public boolean expandActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean collapseActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean isActionViewExpanded() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setOnActionExpandListener(OnActionExpandListener listener) {
+        return null;
+    }
+
+
+    public static class Menu implements android.view.Menu {
+        @Override
+        public MenuItem add(CharSequence title) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
+            return new MenuItemDummy(itemId);
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public SubMenu addSubMenu(CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int titleRes) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
+            return null;
+        }
+
+        @Override
+        public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
+            return 0;
+        }
+
+        @Override
+        public void removeItem(int id) {
+        }
+
+        @Override
+        public void removeGroup(int groupId) {
+        }
+
+        @Override
+        public void clear() {
+        }
+
+        @Override
+        public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
+        }
+
+        @Override
+        public void setGroupVisible(int group, boolean visible) {
+        }
+
+        @Override
+        public void setGroupEnabled(int group, boolean enabled) {
+        }
+
+        @Override
+        public boolean hasVisibleItems() {
+            return false;
+        }
+
+        @Override
+        public MenuItem findItem(int id) {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+        @Override
+        public MenuItem getItem(int index) {
+            return null;
+        }
+
+        @Override
+        public void close() {
+        }
+
+        @Override
+        public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
+            return false;
+        }
+
+        @Override
+        public boolean isShortcutKey(int keyCode, KeyEvent event) {
+            return false;
+        }
+
+        @Override
+        public boolean performIdentifierAction(int id, int flags) {
+            return false;
+        }
+
+        @Override
+        public void setQwertyMode(boolean isQwerty) {
+        }
+    }
+}
diff --git a/app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java b/app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java
new file mode 100644
index 00000000..e6a5ea94
--- /dev/null
+++ b/app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java
@@ -0,0 +1,58 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+import net.gsantner.opoc.util.Callback;
+
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
+public class TextWatcherDummy implements TextWatcher {
+    @Override
+    public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
+    }
+
+    @Override
+    public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+    }
+
+    public static TextWatcher before(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                impl.callback(s, start, count, after);
+            }
+        };
+    }
+
+    public static TextWatcher on(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+                impl.callback(s, start, before, count);
+            }
+        };
+    }
+
+    public static TextWatcher after(final Callback.a1<Editable> impl) {
+        return new TextWatcherDummy() {
+            public void afterTextChanged(final Editable s) {
+                impl.callback(s);
+            }
+        };
+    }
+}
diff --git a/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java b/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java
index 1e980f8b..ea117a8a 100644
--- a/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java
+++ b/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java
@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
- *   https://gsantner.net/
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -93,8 +92,8 @@ public class SimpleMarkdownParser {
                     .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<img src=\\'$2\\' alt='$1' />") // img
                     .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
                     .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
-                    .replaceAll("(?m)^([-*] )(.*)$", "<font color='#000001'>&#8226;</font> $2  ") // unordered list + end line
-                    .replaceAll("(?m)^  (-|\\*) ([^<]*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $2  ") // unordered list2 + end line
+                    .replaceAll("(?m)^[-*] (.*)$", "<font color='#000001'>&#8226;</font> $1  ") // unordered list + end line
+                    .replaceAll("(?m)^  [-*] (.*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $1  ") // unordered list2 + end line
                     .replaceAll("`([^<]*)`", "<code>$1</code>") // code
                     .replace("\\*", "●") // temporary replace escaped star symbol
                     .replaceAll("(?m)\\*\\*(.*)\\*\\*", "<b>$1</b>") // bold (DEP: temp star)
@@ -111,6 +110,7 @@ public class SimpleMarkdownParser {
         public String filter(String text) {
             text = text
                     .replace("New:", "<font color='#276230'>New:</font>")
+                    .replace("New features:", "<font color='#276230'>New:</font>")
                     .replace("Added:", "<font color='#276230'>Added:</font>")
                     .replace("Add:", "<font color='#276230'>Add:</font>")
                     .replace("Fixed:", "<font color='#005688'>Fixed:</font>")
@@ -124,6 +124,20 @@ public class SimpleMarkdownParser {
             return text;
         }
     };
+    public final static SmpFilter FILTER_H_TO_SUP = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            text = text
+                    .replace("<h1>", "<sup><sup><sup>")
+                    .replace("</h1>", "</sup></sup></sup>")
+                    .replace("<h2>", "<sup><sup>")
+                    .replace("</h2>", "</sup></sup>")
+                    .replace("<h3>", "<sup>")
+                    .replace("</h3>", "</sup>")
+            ;
+            return text;
+        }
+    };
     public final static SmpFilter FILTER_NONE = new SmpFilter() {
         @Override
         public String filter(String text) {
diff --git a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java b/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
index 0847021b..f96af499 100644
--- a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
- *   https://gsantner.net/
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java b/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java
index 8fb486a3..9f5c948c 100644
--- a/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java
@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
- *   https://gsantner.net/
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -42,8 +41,12 @@ import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 
@@ -56,6 +59,8 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     protected static final String ARRAY_SEPARATOR = "%%%";
     protected static final String ARRAY_SEPARATOR_SUBSTITUTE = "§§§";
     public static final String SHARED_PREF_APP = "app";
+    private static String _debugLog = "";
+
 
     //
     // Members, Constructors
@@ -163,6 +168,14 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
         return ContextCompat.getColor(_context, resColorId);
     }
 
+    public String[] rstrs(int... keyResourceIds) {
+        String[] ret = new String[keyResourceIds.length];
+        for (int i = 0; i < keyResourceIds.length; i++) {
+            ret[i] = rstr(keyResourceIds[i]);
+        }
+        return ret;
+    }
+
 
     //
     // Getter & Setter for String
@@ -188,11 +201,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public String getString(String key, String defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getString(key, defaultValue);
+        try {
+            return gp(pref).getString(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     public String getString(@StringRes int keyResourceId, String defaultValue, @StringRes int keyResourceIdDefaultValue, final SharedPreferences... pref) {
-        return gp(pref).getString(rstr(keyResourceId), rstr(keyResourceIdDefaultValue));
+        return getString(rstr(keyResourceId), rstr(keyResourceIdDefaultValue), pref);
     }
 
     private void setStringListOne(String key, List<String> values, final SharedPreferences pref) {
@@ -206,9 +223,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
 
     private ArrayList<String> getStringListOne(String key, final SharedPreferences pref) {
         ArrayList<String> ret = new ArrayList<>();
-        String value = pref
-                .getString(key, ARRAY_SEPARATOR)
-                .replace(ARRAY_SEPARATOR_SUBSTITUTE, ARRAY_SEPARATOR);
+        String value = getString(key, ARRAY_SEPARATOR).replace(ARRAY_SEPARATOR_SUBSTITUTE, ARRAY_SEPARATOR);
         if (value.equals(ARRAY_SEPARATOR) || TextUtils.isEmpty(value)) {
             return ret;
         }
@@ -243,6 +258,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
         return list.toArray(new String[list.size()]);
     }
 
+
     public ArrayList<String> getStringList(@StringRes int keyResourceId, final SharedPreferences... pref) {
         return getStringListOne(rstr(keyResourceId), gp(pref));
     }
@@ -263,11 +279,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public int getInt(@StringRes int keyResourceId, int defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getInt(rstr(keyResourceId), defaultValue);
+        return getInt(rstr(keyResourceId), defaultValue, pref);
     }
 
     public int getInt(String key, int defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getInt(key, defaultValue);
+        try {
+            return gp(pref).getInt(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     public int getIntOfStringPref(@StringRes int keyResId, int defaultValue, final SharedPreferences... pref) {
@@ -290,7 +310,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
 
     private ArrayList<Integer> getIntListOne(String key, final SharedPreferences pref) {
         ArrayList<Integer> ret = new ArrayList<>();
-        String value = pref.getString(key, ARRAY_SEPARATOR);
+        String value = getString(key, ARRAY_SEPARATOR);
         if (value.equals(ARRAY_SEPARATOR)) {
             return ret;
         }
@@ -347,11 +367,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public long getLong(@StringRes int keyResourceId, long defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getLong(rstr(keyResourceId), defaultValue);
+        return getLong(rstr(keyResourceId), defaultValue, pref);
     }
 
     public long getLong(String key, long defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getLong(key, defaultValue);
+        try {
+            return gp(pref).getLong(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
@@ -366,11 +390,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public float getFloat(@StringRes int keyResourceId, float defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getFloat(rstr(keyResourceId), defaultValue);
+        return getFloat(rstr(keyResourceId), defaultValue);
     }
 
     public float getFloat(String key, float defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getFloat(key, defaultValue);
+        try {
+            return gp(pref).getFloat(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
@@ -404,22 +432,26 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public boolean getBool(@StringRes int keyResourceId, boolean defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getBoolean(rstr(keyResourceId), defaultValue);
+        return getBool(rstr(keyResourceId), defaultValue);
     }
 
     public boolean getBool(String key, boolean defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getBoolean(key, defaultValue);
+        try {
+            return gp(pref).getBoolean(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
     // Getter & Setter for Color
     //
     public int getColor(String key, @ColorRes int defaultColor, final SharedPreferences... pref) {
-        return gp(pref).getInt(key, rcolor(defaultColor));
+        return getInt(key, rcolor(defaultColor));
     }
 
     public int getColor(@StringRes int keyResourceId, @ColorRes int defaultColor, final SharedPreferences... pref) {
-        return gp(pref).getInt(rstr(keyResourceId), rcolor(defaultColor));
+        return getColor(rstr(keyResourceId), defaultColor);
     }
 
     //
@@ -512,4 +544,74 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
         setStringListOne(key, value, _prefApp);
         return this;
     }
+
+    public boolean contains(String key, final SharedPreferences... pref) {
+        return gp(pref).contains(key);
+    }
+
+    /**
+     * A method to determine if current hour is between begin and end.
+     * This is especially useful for time-based light/dark mode
+     */
+    public static boolean isCurrentHourOfDayBetween(int begin, int end) {
+        begin = (begin >= 23 || begin < 0) ? 0 : begin;
+        end = (end >= 23 || end < 0) ? 0 : end;
+        int h = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+        return h >= begin && h <= end;
+    }
+
+    /**
+     * Substract current datetime by given amount of days
+     */
+    public Date getDateOfDaysAgo(int days) {
+        Calendar cal = new GregorianCalendar();
+        cal.add(Calendar.DATE, -days);
+        return cal.getTime();
+    }
+
+    /**
+     * Substract current datetime by given amount of days and check if the given date passed
+     */
+    public boolean didDaysPassedSince(Date date, int days) {
+        if (date == null || days < 0) {
+            return false;
+        }
+        return date.before(getDateOfDaysAgo(days));
+    }
+
+    public boolean afterDaysTrue(String key, int daysSinceLastTime, int firstTime, final SharedPreferences... pref) {
+        Date d = new Date(System.currentTimeMillis());
+        if (!contains(key)) {
+            d = getDateOfDaysAgo(daysSinceLastTime - firstTime);
+            setLong(key, d.getTime());
+            return firstTime < 1;
+        } else {
+            d = new Date(getLong(key, d.getTime()));
+        }
+        boolean trigger = didDaysPassedSince(d, daysSinceLastTime);
+        if (trigger) {
+            setLong(key, new Date(System.currentTimeMillis()).getTime());
+        }
+        return trigger;
+    }
+
+    public static void clearDebugLog() {
+        _debugLog = "";
+    }
+
+    public static String getDebugLog() {
+        return _debugLog;
+    }
+
+    public static synchronized void appendDebugLog(String text) {
+        _debugLog += "[" + new Date().toString() + "] " + text + "\n";
+    }
+
+    public static boolean ne(final String str) {
+        return str != null && !str.trim().isEmpty();
+    }
+
+    public static boolean fexists(final String fp) {
+        return ne(fp) && (new File(fp)).exists();
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
index 76284a11..04c3be4f 100644
--- a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
diff --git a/app/src/main/java/net/gsantner/opoc/ui/SearchOrCustomTextDialog.java b/app/src/main/java/net/gsantner/opoc/ui/SearchOrCustomTextDialog.java
index f83d4e6e..cc703f98 100644
--- a/app/src/main/java/net/gsantner/opoc/ui/SearchOrCustomTextDialog.java
+++ b/app/src/main/java/net/gsantner/opoc/ui/SearchOrCustomTextDialog.java
@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
@@ -10,42 +9,87 @@
 #########################################################*/
 package net.gsantner.opoc.ui;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
 import android.support.annotation.ColorInt;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.AppCompatEditText;
-import android.text.Editable;
+import android.support.v7.widget.TooltipCompat;
+import android.text.InputType;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.TextWatcher;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Checkable;
 import android.widget.Filter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import net.gsantner.opoc.android.dummy.TextWatcherDummy;
 import net.gsantner.opoc.util.Callback;
 import net.gsantner.opoc.util.ContextUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Pattern;
 
-@SuppressWarnings("WeakerAccess")
+@SuppressLint("SetTextI18n")
 public class SearchOrCustomTextDialog {
 
     public static class DialogOptions {
-        public Callback.a1<String> callback;
-        public List<? extends CharSequence> data = new ArrayList<>();
-        public List<? extends CharSequence> highlightData = new ArrayList<>();
+
+        // Callback for search text or text of single item
+        @Nullable
+        public Callback.a1<String> callback = null;
+
+        // Callback for indices of selected items.
+        // List will contain single item if isMultiSelectEnabled == false;
+        @Nullable
+        public Callback.a1<List<Integer>> positionCallback = null;
+
+        public boolean isMultiSelectEnabled = false;
+        public List<? extends CharSequence> data = null;
+        public List<? extends CharSequence> highlightData = null;
+        public List<Integer> iconsForData;
         public String messageText = "";
+        public String defaultText = "";
         public boolean isSearchEnabled = true;
         public boolean isDarkDialog = false;
+        public int dialogWidthDp = WindowManager.LayoutParams.MATCH_PARENT;
+        public int dialogHeightDp = WindowManager.LayoutParams.WRAP_CONTENT;
+        public int gravity = Gravity.NO_GRAVITY;
+        public int searchInputType = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+        public boolean searchIsRegex = false;
+        public Callback.a1<Spannable> highlighter = null;
+        public String extraFilter = null;
+        public List<Integer> preSelected = null;
+
+        public Callback.a0 neutralButtonCallback = null;
 
         @ColorInt
         public int textColor = 0xFF000000;
@@ -54,124 +98,219 @@ public class SearchOrCustomTextDialog {
         @StringRes
         public int cancelButtonText = android.R.string.cancel;
         @StringRes
+        public int neutralButtonText = 0;
+        @StringRes
         public int okButtonText = android.R.string.ok;
         @StringRes
-        public int titleText = android.R.string.untitled;
+        public int titleText = 0;
         @StringRes
         public int searchHintText = android.R.string.search_go;
+        @DrawableRes
+        public int clearInputIcon = android.R.drawable.ic_input_delete;
+    }
+
+    private static class Adapter extends ArrayAdapter<Integer> {
+        @LayoutRes
+        private final int _layout;
+        private final int _layoutHeight;
+        private final LayoutInflater _inflater;
+        private final DialogOptions _dopt;
+        private final List<Integer> _filteredItems;
+        private final Set<Integer> _selectedItems;
+        private final Pattern _extraPattern;
+
+        public static Adapter create(final Context context, final DialogOptions dopt) {
+            return new Adapter(context, dopt, dopt.isMultiSelectEnabled ? android.R.layout.simple_list_item_multiple_choice : android.R.layout.simple_list_item_1, new ArrayList<>());
+        }
+
+        private Adapter(final Context context, final DialogOptions dopt, final int layout, final List<Integer> filteredItems) {
+            super(context, layout, filteredItems);
+            _layout = layout;
+            _filteredItems = filteredItems;
+            _inflater = LayoutInflater.from(context);
+            _dopt = dopt;
+            _extraPattern = (_dopt.extraFilter == null ? null : Pattern.compile(_dopt.extraFilter));
+            _selectedItems = new HashSet<>(_dopt.preSelected != null ? _dopt.preSelected : Collections.emptyList());
+            ContextUtils cu = new ContextUtils(context);
+            _layoutHeight = (int) cu.convertDpToPx(36);
+            cu.freeContextRef();
+        }
+
+        @NonNull
+        @Override
+        public View getView(int pos, @Nullable View convertView, @NonNull ViewGroup parent) {
+            final int index = getItem(pos);
+
+            final TextView textView;
+            if (convertView == null) {
+                textView = (TextView) _inflater.inflate(_layout, parent, false);
+                textView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+                textView.setMinHeight(_layoutHeight);
+            } else {
+                textView = (TextView) convertView;
+            }
+
+            if (textView instanceof Checkable) {
+                ((Checkable) textView).setChecked(_selectedItems.contains(index));
+            }
+
+            if (index >= 0 && _dopt.iconsForData != null && index < _dopt.iconsForData.size() && _dopt.iconsForData.get(index) != 0) {
+                textView.setCompoundDrawablesWithIntrinsicBounds(_dopt.iconsForData.get(index), 0, 0, 0);
+                textView.setCompoundDrawablePadding(32);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    textView.setCompoundDrawableTintList(ColorStateList.valueOf(_dopt.isDarkDialog ? Color.WHITE : Color.BLACK));
+                }
+            } else {
+                textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+            }
+
+            final CharSequence text = _dopt.data.get(index).toString();
+            if (_dopt.highlightData != null) {
+                final boolean hl = _dopt.highlightData.contains(text);
+                textView.setTextColor(hl ? _dopt.highlightColor : _dopt.textColor);
+                textView.setTypeface(null, hl ? Typeface.BOLD : Typeface.NORMAL);
+            }
+
+            if (_dopt.highlighter != null) {
+                Spannable s = new SpannableString(text);
+                _dopt.highlighter.callback(s);
+                textView.setText(s);
+            } else {
+                textView.setText(text);
+            }
+
+            return textView;
+        }
+
+        @NonNull
+        @Override
+        public Filter getFilter() {
+            return new Filter() {
+                @SuppressWarnings("unchecked")
+                @Override
+                protected void publishResults(final CharSequence constraint, final FilterResults results) {
+                    _filteredItems.clear();
+                    _filteredItems.addAll((List<Integer>) results.values);
+                    notifyDataSetChanged();
+                }
+
+                @Override
+                protected FilterResults performFiltering(final CharSequence constraint) {
+                    final List<Integer> resList = new ArrayList<>();
+
+                    if (_dopt.data != null) {
+                        final String fil = constraint.toString();
+                        final boolean emptySearch = fil.isEmpty();
+                        for (int i = 0; i < _dopt.data.size(); i++) {
+                            final String str = _dopt.data.get(i).toString();
+                            final boolean matchExtra = (_extraPattern == null) || _extraPattern.matcher(str).find();
+                            final Locale locale = Locale.getDefault();
+                            final boolean matchNormal = str.toLowerCase(locale).contains(fil.toLowerCase(locale));
+                            final boolean matchRegex = _dopt.searchIsRegex && (str.matches(fil));
+                            if (matchExtra && (matchNormal || matchRegex || emptySearch)) {
+                                resList.add(i);
+                            }
+                        }
+                    }
+
+                    final FilterResults res = new FilterResults();
+                    res.values = resList;
+                    res.count = resList.size();
+                    return res;
+                }
+            };
+        }
     }
 
     public static void showMultiChoiceDialogWithSearchFilterUI(final Activity activity, final DialogOptions dopt) {
-        final List<CharSequence> allItems = new ArrayList<>(dopt.data);
-        final List<CharSequence> filteredItems = new ArrayList<>(allItems);
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, dopt.isDarkDialog
                 ? android.support.v7.appcompat.R.style.Theme_AppCompat_Dialog
                 : android.support.v7.appcompat.R.style.Theme_AppCompat_Light_Dialog
         );
-
-        final ArrayAdapter<CharSequence> listAdapter = new ArrayAdapter<CharSequence>(activity, android.R.layout.simple_list_item_1, filteredItems) {
-            @NonNull
-            @Override
-            public View getView(int pos, @Nullable View convertView, @NonNull ViewGroup parent) {
-                TextView textView = (TextView) super.getView(pos, convertView, parent);
-                String text = textView.getText().toString();
-
-                textView.setTextColor(dopt.textColor);
-                if (dopt.highlightData.contains(text)) {
-                    textView.setTextColor(dopt.highlightColor);
-                }
-                return textView;
-            }
-
-            @Override
-            public Filter getFilter() {
-                return new Filter() {
-                    @SuppressWarnings("unchecked")
-                    @Override
-                    protected void publishResults(final CharSequence constraint, final FilterResults results) {
-                        filteredItems.clear();
-                        filteredItems.addAll((List<String>) results.values);
-                        notifyDataSetChanged();
-                    }
-
-                    @Override
-                    protected FilterResults performFiltering(final CharSequence constraint) {
-                        final FilterResults res = new FilterResults();
-                        final ArrayList<CharSequence> resList = new ArrayList<>();
-                        final String fil = constraint.toString();
-
-                        for (final CharSequence str : allItems) {
-                            if ("".equals(fil) || str.toString().toLowerCase(Locale.getDefault()).contains(fil.toLowerCase(Locale.getDefault()))) {
-                                resList.add(str);
-                            }
-                        }
-                        res.values = resList;
-                        res.count = resList.size();
-                        return res;
-                    }
-                };
-            }
-        };
+        final Adapter listAdapter = Adapter.create(activity, dopt);
 
         final AppCompatEditText searchEditText = new AppCompatEditText(activity);
+        searchEditText.setText(dopt.defaultText);
         searchEditText.setSingleLine(true);
         searchEditText.setMaxLines(1);
         searchEditText.setTextColor(dopt.textColor);
         searchEditText.setHintTextColor((dopt.textColor & 0x00FFFFFF) | 0x99000000);
         searchEditText.setHint(dopt.searchHintText);
+        searchEditText.setInputType(dopt.searchInputType == 0 ? searchEditText.getInputType() : dopt.searchInputType);
+        searchEditText.addTextChangedListener(TextWatcherDummy.after((cbEditable) -> listAdapter.getFilter().filter(cbEditable)));
 
-        searchEditText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(final Editable arg0) {
-                listAdapter.getFilter().filter(searchEditText.getText());
-            }
+        final ContextUtils cu = new ContextUtils(activity);
+        final int margin = (int) cu.convertDpToPx(8);
+        cu.freeContextRef();
 
-            @Override
-            public void onTextChanged(final CharSequence arg0, final int arg1, final int arg2, final int arg3) {
-            }
+        final LinearLayout searchLayout = new LinearLayout(activity);
+        searchLayout.setOrientation(LinearLayout.HORIZONTAL);
 
-            @Override
-            public void beforeTextChanged(final CharSequence arg0, final int arg1, final int arg2, final int arg3) {
-            }
-        });
+        LinearLayout.LayoutParams lp;
+        lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT, 1);
+        lp.gravity = Gravity.START | Gravity.BOTTOM;
+        searchLayout.addView(searchEditText, lp);
+
+        // 'Button to clear the search box'
+        final ImageView clearButton = new ImageView(activity);
+        clearButton.setImageResource(dopt.clearInputIcon);
+        TooltipCompat.setTooltipText(clearButton, activity.getString(android.R.string.cancel));
+        clearButton.setColorFilter(dopt.isDarkDialog ? Color.WHITE : Color.parseColor("#ff505050"));
+        lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT, 0);
+        lp.gravity = Gravity.END | Gravity.CENTER_VERTICAL;
+        lp.setMargins(margin, 0, (int) (margin * 1.5), 0);
+        searchLayout.addView(clearButton, lp);
+        clearButton.setOnClickListener((v) -> searchEditText.setText(""));
 
         final ListView listView = new ListView(activity);
         final LinearLayout linearLayout = new LinearLayout(activity);
         listView.setAdapter(listAdapter);
+        listView.setVisibility(dopt.data != null && !dopt.data.isEmpty() ? View.VISIBLE : View.GONE);
         linearLayout.setOrientation(LinearLayout.VERTICAL);
+
         if (dopt.isSearchEnabled) {
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-            ContextUtils cu = new net.gsantner.opoc.util.ContextUtils(listView.getContext());
-            int px = (int) (new net.gsantner.opoc.util.ContextUtils(listView.getContext()).convertDpToPx(8));
-            lp.setMargins(px, px / 2, px, px / 2);
-            linearLayout.addView(searchEditText, lp);
+            lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            lp.setMargins(margin, margin / 2, margin, margin / 2);
+            linearLayout.addView(searchLayout, lp);
         }
+
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0);
         layoutParams.weight = 1;
         linearLayout.addView(listView, layoutParams);
         if (!TextUtils.isEmpty(dopt.messageText)) {
             dialogBuilder.setMessage(dopt.messageText);
         }
+
         dialogBuilder.setView(linearLayout)
-                .setTitle(dopt.titleText)
                 .setOnCancelListener(null)
-                .setNegativeButton(dopt.cancelButtonText, null);
-        if (dopt.isSearchEnabled) {
+                .setNegativeButton(dopt.cancelButtonText, (dialogInterface, i) -> dialogInterface.dismiss());
+
+        if (dopt.titleText != 0) {
+            dialogBuilder.setTitle(dopt.titleText);
+        }
+
+        // Ok button action
+        if ((dopt.isSearchEnabled && dopt.callback != null) || (dopt.isMultiSelectEnabled)) {
             dialogBuilder.setPositiveButton(dopt.okButtonText, (dialogInterface, i) -> {
-                dialogInterface.dismiss();
-                if (dopt.callback != null && !TextUtils.isEmpty(searchEditText.getText().toString())) {
-                    dopt.callback.callback(searchEditText.getText().toString());
+                final String searchText = dopt.isSearchEnabled ? searchEditText.getText().toString() : null;
+                if (dopt.positionCallback != null && !listAdapter._selectedItems.isEmpty()) {
+                    final List<Integer> sel = new ArrayList<>(listAdapter._selectedItems);
+                    Collections.sort(sel);
+                    dopt.positionCallback.callback(sel);
+                } else if (dopt.callback != null && !TextUtils.isEmpty(searchText)) {
+                    dopt.callback.callback(searchText);
                 }
             });
         }
 
+        // Setup neutralbutton
+        if (dopt.neutralButtonCallback != null && dopt.neutralButtonText != 0) {
+            dialogBuilder.setNeutralButton(dopt.neutralButtonText, (dialogInterface, i) -> {
+                dopt.neutralButtonCallback.callback();
+            });
+        }
+
         final AlertDialog dialog = dialogBuilder.create();
-        listView.setOnItemClickListener((parent, view, position, id) -> {
-            dialog.dismiss();
-            if (dopt.callback != null) {
-                dopt.callback.callback(filteredItems.get(position).toString());
-            }
-        });
 
         searchEditText.setOnKeyListener((keyView, keyCode, keyEvent) -> {
             if ((keyEvent.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
@@ -184,6 +323,72 @@ public class SearchOrCustomTextDialog {
             return false;
         });
 
+        Window w;
+        if ((w = dialog.getWindow()) != null && dopt.isSearchEnabled) {
+            w.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        }
         dialog.show();
+        if ((w = dialog.getWindow()) != null) {
+            int ds_w = dopt.dialogWidthDp < 100 ? dopt.dialogWidthDp : ((int) (dopt.dialogWidthDp * activity.getResources().getDisplayMetrics().density));
+            int ds_h = dopt.dialogHeightDp < 100 ? dopt.dialogHeightDp : ((int) (dopt.dialogHeightDp * activity.getResources().getDisplayMetrics().density));
+            w.setLayout(ds_w, ds_h);
+        }
+
+        if ((w = dialog.getWindow()) != null && dopt.gravity != Gravity.NO_GRAVITY) {
+            WindowManager.LayoutParams wlp = w.getAttributes();
+            wlp.gravity = dopt.gravity;
+            w.setAttributes(wlp);
+        }
+
+        if (dopt.isSearchEnabled) {
+            searchEditText.requestFocus();
+        }
+        if (dopt.defaultText != null) {
+            listAdapter.getFilter().filter(searchEditText.getText());
+        }
+
+        // Helper function to trigger callback with single item
+        final Callback.b1<Integer> directActivate = (position) -> {
+            final int index = listAdapter._filteredItems.get(position);
+            dialog.dismiss();
+            if (dopt.callback != null) {
+                dopt.callback.callback(dopt.data.get(index).toString());
+            }
+            if (dopt.positionCallback != null) {
+                dopt.positionCallback.callback(Collections.singletonList(index));
+            }
+            return true;
+        };
+
+        // Helper function to append selection count to OK button
+        final Button okButton = dialog.getButton(Dialog.BUTTON_POSITIVE);
+        final String okText = activity.getString(dopt.okButtonText) + (dopt.isMultiSelectEnabled ? " (%d)" : "");
+        final Callback.a0 setOkButtonState = () -> {
+            okButton.setText(okText.replace("%d", Integer.toString(listAdapter._selectedItems.size())));
+        };
+
+        // Set ok button text initially
+        setOkButtonState.callback();
+
+        // Item click action
+        listView.setOnItemClickListener((parent, textView, pos, id) -> {
+            if (dopt.isMultiSelectEnabled) {
+                final int index = listAdapter._filteredItems.get(pos);
+                if (listAdapter._selectedItems.contains(index)) {
+                    listAdapter._selectedItems.remove(index);
+                } else {
+                    listAdapter._selectedItems.add(index);
+                }
+                if (textView instanceof Checkable) {
+                    ((Checkable) textView).setChecked(listAdapter._selectedItems.contains(index));
+                }
+                setOkButtonState.callback();
+            } else {
+                directActivate.callback(pos);
+            }
+        });
+
+        // long click always activates
+        listView.setOnItemLongClickListener((parent, view, pos, id) -> directActivate.callback(pos));
     }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java b/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java
index 2114f202..741b3b76 100644
--- a/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java
+++ b/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java
@@ -1,21 +1,27 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
- *   https://gsantner.net/
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Build;
+import android.provider.CalendarContract;
+import android.support.annotation.ColorInt;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
@@ -26,12 +32,16 @@ import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.util.TypedValue;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebView;
+import android.widget.ScrollView;
+
+import java.util.List;
 
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection"})
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "rawtypes", "UnusedReturnValue"})
 public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
     //########################
     //## Members, Constructors
@@ -43,6 +53,12 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
         _activity = activity;
     }
 
+    @Override
+    public void freeContextRef() {
+        super.freeContextRef();
+        _activity = null;
+    }
+
     //########################
     //##     Methods
     //########################
@@ -81,9 +97,11 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
     }
 
 
-    public void showSnackBar(@StringRes int stringResId, boolean showLong) {
-        Snackbar.make(_activity.findViewById(android.R.id.content), stringResId,
-                showLong ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
+    public Snackbar showSnackBar(@StringRes int stringResId, boolean showLong) {
+        Snackbar s = Snackbar.make(_activity.findViewById(android.R.id.content), stringResId,
+                showLong ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT);
+        s.show();
+        return s;
     }
 
     public void showSnackBar(@StringRes int stringResId, boolean showLong, @StringRes int actionResId, View.OnClickListener listener) {
@@ -93,18 +111,58 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
                 .show();
     }
 
-    public void hideSoftKeyboard() {
-        InputMethodManager imm = (InputMethodManager) _activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        if (imm != null && _activity.getCurrentFocus() != null && _activity.getCurrentFocus().getWindowToken() != null) {
-            imm.hideSoftInputFromWindow(_activity.getCurrentFocus().getWindowToken(), 0);
+    public ActivityUtils setSoftKeyboardVisibile(boolean visible, View... editView) {
+        final Activity activity = _activity;
+        if (activity != null) {
+            final View v = (editView != null && editView.length > 0) ? (editView[0]) : (activity.getCurrentFocus() != null && activity.getCurrentFocus().getWindowToken() != null ? activity.getCurrentFocus() : null);
+            final InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            if (v != null && imm != null) {
+                Runnable r = () -> {
+                    if (visible) {
+                        v.requestFocus();
+                        imm.showSoftInput(v, InputMethodManager.SHOW_FORCED);
+                    } else {
+                        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+                    }
+                };
+                r.run();
+                for (int d : new int[]{100, 350}) {
+                    v.postDelayed(r, d);
+                }
+            }
         }
+        return this;
     }
 
-    public void showSoftKeyboard() {
-        InputMethodManager imm = (InputMethodManager) _activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        if (imm != null && _activity.getCurrentFocus() != null && _activity.getCurrentFocus().getWindowToken() != null) {
-            imm.showSoftInput(_activity.getCurrentFocus(), InputMethodManager.SHOW_FORCED);
+    public ActivityUtils hideSoftKeyboard() {
+        if (_activity != null) {
+            InputMethodManager imm = (InputMethodManager) _activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            if (imm != null && _activity.getCurrentFocus() != null && _activity.getCurrentFocus().getWindowToken() != null) {
+                imm.hideSoftInputFromWindow(_activity.getCurrentFocus().getWindowToken(), 0);
+            }
         }
+        return this;
+    }
+
+    public ActivityUtils showSoftKeyboard() {
+        if (_activity != null) {
+            InputMethodManager imm = (InputMethodManager) _activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            if (imm != null && _activity.getCurrentFocus() != null && _activity.getCurrentFocus().getWindowToken() != null) {
+                showSoftKeyboard(_activity.getCurrentFocus());
+            }
+        }
+        return this;
+    }
+
+
+    public ActivityUtils showSoftKeyboard(View textInputView) {
+        if (_activity != null) {
+            InputMethodManager imm = (InputMethodManager) _activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            if (imm != null && textInputView != null) {
+                imm.showSoftInput(textInputView, InputMethodManager.SHOW_FORCED);
+            }
+        }
+        return this;
     }
 
     public void showDialogWithHtmlTextView(@StringRes int resTitleId, String html) {
@@ -112,19 +170,23 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
     }
 
     public void showDialogWithHtmlTextView(@StringRes int resTitleId, String text, boolean isHtml, DialogInterface.OnDismissListener dismissedListener) {
+        ScrollView scroll = new ScrollView(_context);
         AppCompatTextView textView = new AppCompatTextView(_context);
-        int padding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16,
-                _context.getResources().getDisplayMetrics());
-        textView.setMovementMethod(new LinkMovementMethod());
-        textView.setPadding(padding, 0, padding, 0);
+        int padding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, _context.getResources().getDisplayMetrics());
 
+        scroll.setPadding(padding, 0, padding, 0);
+        scroll.addView(textView);
+        textView.setMovementMethod(new LinkMovementMethod());
         textView.setText(isHtml ? new SpannableString(Html.fromHtml(text)) : text);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 17);
+
         AlertDialog.Builder dialog = new AlertDialog.Builder(_context)
-                .setPositiveButton(android.R.string.ok, null)
-                .setOnDismissListener(dismissedListener)
-                .setTitle(resTitleId)
-                .setView(textView);
-        dialog.show();
+                .setPositiveButton(android.R.string.ok, null).setOnDismissListener(dismissedListener)
+                .setView(scroll);
+        if (resTitleId != 0) {
+            dialog.setTitle(resTitleId);
+        }
+        dialogFullWidth(dialog.show(), true, false);
     }
 
     public void showDialogWithRawFileInWebView(String fileInRaw, @StringRes int resTitleId) {
@@ -134,11 +196,11 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
                 .setPositiveButton(android.R.string.ok, null)
                 .setTitle(resTitleId)
                 .setView(wv);
-        dialog.show();
+        dialogFullWidth(dialog.show(), true, false);
     }
 
     // Toggle with no param, else set visibility according to first bool
-    public void toggleStatusbarVisibility(boolean... optionalForceVisible) {
+    public ActivityUtils toggleStatusbarVisibility(boolean... optionalForceVisible) {
         WindowManager.LayoutParams attrs = _activity.getWindow().getAttributes();
         int flag = WindowManager.LayoutParams.FLAG_FULLSCREEN;
         if (optionalForceVisible.length == 0) {
@@ -149,9 +211,10 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
             attrs.flags |= flag;
         }
         _activity.getWindow().setAttributes(attrs);
+        return this;
     }
 
-    public void showGooglePlayEntryForThisApp() {
+    public ActivityUtils showGooglePlayEntryForThisApp() {
         String pkgId = "details?id=" + _activity.getPackageName();
         Intent goToMarket = new Intent(Intent.ACTION_VIEW, Uri.parse("market://" + pkgId));
         goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
@@ -161,11 +224,12 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
             _activity.startActivity(goToMarket);
         } catch (ActivityNotFoundException e) {
             _activity.startActivity(new Intent(Intent.ACTION_VIEW,
-                    Uri.parse("http://play.google.com/store/apps/" + pkgId)));
+                    Uri.parse("https://play.google.com/store/apps/" + pkgId)));
         }
+        return this;
     }
 
-    public void setStatusbarColor(int color, boolean... fromRes) {
+    public ActivityUtils setStatusbarColor(int color, boolean... fromRes) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (fromRes != null && fromRes.length > 0 && fromRes[0]) {
                 color = ContextCompat.getColor(_context, color);
@@ -173,5 +237,110 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
 
             _activity.getWindow().setStatusBarColor(color);
         }
+        return this;
+    }
+
+    public ActivityUtils setLauncherActivityEnabled(Class activityClass, boolean enable) {
+        try {
+            ComponentName component = new ComponentName(_context, activityClass);
+            _context.getPackageManager().setComponentEnabledSetting(component, enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+        } catch (Exception ignored) {
+        }
+        return this;
+    }
+
+    public boolean isLauncherEnabled(Class activityClass) {
+        try {
+            ComponentName component = new ComponentName(_context, activityClass);
+            return _context.getPackageManager().getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        } catch (Exception ignored) {
+        }
+        return false;
+    }
+
+    @ColorInt
+    public Integer getCurrentPrimaryColor() {
+        TypedValue typedValue = new TypedValue();
+        _context.getTheme().resolveAttribute(getResId(ResType.ATTR, "colorPrimary"), typedValue, true);
+        return typedValue.data;
+    }
+
+    @ColorInt
+    public Integer getCurrentPrimaryDarkColor() {
+        TypedValue typedValue = new TypedValue();
+        _context.getTheme().resolveAttribute(getResId(ResType.ATTR, "colorPrimaryDark"), typedValue, true);
+        return typedValue.data;
+    }
+
+    @ColorInt
+    public Integer getCurrentAccentColor() {
+        TypedValue typedValue = new TypedValue();
+        _context.getTheme().resolveAttribute(getResId(ResType.ATTR, "colorAccent"), typedValue, true);
+        return typedValue.data;
+    }
+
+    @ColorInt
+    public Integer getActivityBackgroundColor() {
+        TypedArray array = _activity.getTheme().obtainStyledAttributes(new int[]{
+                android.R.attr.colorBackground,
+        });
+        int c = array.getColor(0, 0xFF0000);
+        array.recycle();
+        return c;
+    }
+
+    public ActivityUtils startCalendarApp() {
+        Uri.Builder builder = CalendarContract.CONTENT_URI.buildUpon();
+        builder.appendPath("time");
+        builder.appendPath(Long.toString(System.currentTimeMillis()));
+        Intent intent = new Intent(Intent.ACTION_VIEW, builder.build());
+        _activity.startActivity(intent);
+        return this;
+    }
+
+    /**
+     * Detect if the activity is currently in splitscreen/multiwindow mode
+     */
+    public boolean isInSplitScreenMode() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return _activity.isInMultiWindowMode();
+        }
+        return false;
+    }
+
+    /**
+     * Show dialog in full width / show keyboard
+     *
+     * @param dialog Get via dialog.show()
+     */
+    public void dialogFullWidth(AlertDialog dialog, boolean fullWidth, boolean showKeyboard) {
+        try {
+            Window w;
+            if (dialog != null && (w = dialog.getWindow()) != null) {
+                if (fullWidth) {
+                    w.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                }
+                if (showKeyboard) {
+                    w.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    // Make activity/app not show up in the recents history - call before finish / System.exit
+    public ActivityUtils removeActivityFromHistory() {
+        try {
+            ActivityManager am = (ActivityManager) _activity.getSystemService(Context.ACTIVITY_SERVICE);
+            if (am != null && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+                List<ActivityManager.AppTask> tasks = am.getAppTasks();
+                if (tasks != null && !tasks.isEmpty()) {
+                    tasks.get(0).setExcludeFromRecents(true);
+                }
+            }
+
+        } catch (Exception ignored) {
+        }
+        return this;
     }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/AdBlock.java b/app/src/main/java/net/gsantner/opoc/util/AdBlock.java
index 304a4b85..c5c81678 100644
--- a/app/src/main/java/net/gsantner/opoc/util/AdBlock.java
+++ b/app/src/main/java/net/gsantner/opoc/util/AdBlock.java
@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
@@ -46,8 +45,9 @@ import java.util.Set;
 /**
  * Simple Host-Based AdBlocker
  */
-@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection", "unused"})
+@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection", "unused", "TryFinallyCanBeTryWithResources"})
 public class AdBlock {
+    private static final Object synchronizeObj = new Object();
     private static final AdBlock instance = new AdBlock();
 
     public static AdBlock getInstance() {
@@ -61,7 +61,9 @@ public class AdBlock {
     //########################
     private final Set<String> _adblockHostsFromRaw = new HashSet<>();
     private final Set<String> _adblockHosts = new HashSet<>();
-    private boolean _isLoaded;
+    private final List<Callback.b3<URI, String, String>> _customBlockCallbacks = new ArrayList<>();
+    private boolean _isLoaded = false;
+    private boolean _isAdblockLogging = false;
 
     //########################
     //##
@@ -72,25 +74,47 @@ public class AdBlock {
     }
 
     public boolean isAdHost(String urlS) {
+        boolean block = false;
         if (urlS != null && !urlS.isEmpty() && urlS.startsWith("http")) {
             try {
-                URI url = new URI(urlS);
+                URI url;
+                try {
+                    url = new URI(urlS);
+                } catch (Exception e) {
+                    url = new URI(urlS.replaceFirst("[?].*", ""));
+                }
                 String host = url.getHost().trim();
                 if (host.startsWith("www.") && host.length() >= 4) {
                     host = host.substring(4);
                 }
-                return _adblockHosts.contains(host) || _adblockHosts.contains("www." + host);
+                block = _adblockHosts.contains(host) || _adblockHosts.contains("www." + host);
+                for (Callback.b3<URI, String, String> cb : _customBlockCallbacks) {
+                    if (block) {
+                        break;
+                    }
+                    try {
+                        block = cb.callback(url, urlS, host);
+                    } catch (Exception ignored) {
+                    }
+                }
             } catch (URISyntaxException e) {
                 e.printStackTrace();
             }
 
         }
-        return false;
+
+        if (_isAdblockLogging) {
+            Log.d(getClass().getSimpleName(), "UrlAllowed-" + (block ? "N" : "Y") + "  " + urlS);
+        }
+        return block;
     }
 
     public AdBlock reset() {
-        _adblockHosts.clear();
-        _adblockHosts.addAll(_adblockHostsFromRaw);
+        synchronized (synchronizeObj) {
+            _adblockHosts.clear();
+            _adblockHosts.addAll(_adblockHostsFromRaw);
+            _customBlockCallbacks.clear();
+        }
         return this;
     }
 
@@ -102,7 +126,7 @@ public class AdBlock {
         return new WebResourceResponse("text/plain", "utf-8", new ByteArrayInputStream("".getBytes()));
     }
 
-    public void addBlockedHosts(String... hosts) {
+    public AdBlock addBlockedHosts(String... hosts) {
         for (String host : hosts) {
             if (host != null) {
                 host = host.trim();
@@ -110,23 +134,29 @@ public class AdBlock {
                     host = host.substring(4);
                 }
                 if (!host.startsWith("#") && !host.startsWith("\"")) {
-                    _adblockHosts.add(host);
+                    synchronized (synchronizeObj) {
+                        _adblockHosts.add(host);
+                    }
                 }
             }
         }
-
+        return this;
     }
 
-    public void loadHostsFromRawAssetsAsync(final Context context) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
+    public void loadHostsFromRawAssetsAsync(final Context context, final boolean... debugIgnoreAssets) {
+        if (debugIgnoreAssets != null && debugIgnoreAssets.length > 0 && debugIgnoreAssets[0]) {
+            _isLoaded = true;
+            return;
+        }
+
+        new Thread(() -> {
+            try {
+                synchronized (synchronizeObj) {
                     loadHostsFromRawAssets(context);
                     _isLoaded = true;
-                } catch (IOException e) {
-                    e.printStackTrace();
                 }
+            } catch (IOException e) {
+                e.printStackTrace();
             }
         }).start();
     }
@@ -172,4 +202,17 @@ public class AdBlock {
         }
         return adblockResIds;
     }
+
+    // URI uri, String url, String host
+    public AdBlock addCustomBlockCallback(Callback.b3<URI, String, String> cb) {
+        synchronized (synchronizeObj) {
+            _customBlockCallbacks.add(cb);
+        }
+        return this;
+    }
+
+    public AdBlock setLogEnabled(boolean isAdblockLogging) {
+        _isAdblockLogging = isAdblockLogging;
+        return this;
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/Callback.java b/app/src/main/java/net/gsantner/opoc/util/Callback.java
index 697e7d77..012cb634 100644
--- a/app/src/main/java/net/gsantner/opoc/util/Callback.java
+++ b/app/src/main/java/net/gsantner/opoc/util/Callback.java
@@ -1,17 +1,21 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
- *   https://gsantner.net/
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
 
 @SuppressWarnings("unused")
 public class Callback {
+
+    public interface a0 {
+        void callback();
+    }
+
     public interface a1<A> {
         void callback(A arg1);
     }
@@ -31,4 +35,52 @@ public class Callback {
     public interface a5<A, B, C, D, E> {
         void callback(A arg1, B arg2, C arg3, D arg4, E arg5);
     }
+
+    public interface b0 {
+        boolean callback();
+    }
+
+    public interface b1<A> {
+        boolean callback(A arg1);
+    }
+
+    public interface b2<A, B> {
+        boolean callback(A arg1, B arg2);
+    }
+
+    public interface b3<A, B, C> {
+        boolean callback(A arg1, B arg2, C arg3);
+    }
+
+    public interface b4<A, B, C, D> {
+        boolean callback(A arg1, B arg2, C arg3, D arg4);
+    }
+
+    public interface b5<A, B, C, D, E> {
+        boolean callback(A arg1, B arg2, C arg3, D arg4, E arg5);
+    }
+
+    public interface s0 {
+        String callback();
+    }
+
+    public interface s1<A> {
+        String callback(A arg1);
+    }
+
+    public interface s2<A, B> {
+        String callback(A arg1, B arg2);
+    }
+
+    public interface s3<A, B, C> {
+        String callback(A arg1, B arg2, C arg3);
+    }
+
+    public interface s4<A, B, C, D> {
+        String callback(A arg1, B arg2, C arg3, D arg4);
+    }
+
+    public interface s5<A, B, C, D, E> {
+        String callback(A arg1, B arg2, C arg3, D arg4, E arg5);
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
index 1ade61f9..483461d8 100644
--- a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
+++ b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
@@ -1,20 +1,21 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
- *   https://gsantner.net/
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -37,6 +38,10 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
+import android.os.SystemClock;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.support.annotation.ColorInt;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
@@ -44,9 +49,14 @@ import android.support.annotation.Nullable;
 import android.support.annotation.RawRes;
 import android.support.annotation.StringRes;
 import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.app.ActivityManagerCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v4.text.TextUtilsCompat;
+import android.support.v4.util.Pair;
+import android.support.v4.view.ViewCompat;
 import android.text.Html;
+import android.text.InputFilter;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -55,6 +65,11 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.View;
+import android.view.WindowManager;
+import android.webkit.MimeTypeMap;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -62,17 +77,21 @@ import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
+import static android.content.Context.VIBRATOR_SERVICE;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.graphics.Bitmap.CompressFormat;
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection"})
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection", "TryFinallyCanBeTryWithResources", "UnusedAssignment", "UnusedReturnValue"})
 public class ContextUtils {
     //
     // Members, Constructors
@@ -87,6 +106,9 @@ public class ContextUtils {
         return _context;
     }
 
+    public void freeContextRef() {
+        _context = null;
+    }
 
     //
     // Class Methods
@@ -101,39 +123,55 @@ public class ContextUtils {
      *
      * @return A valid id if the id could be found, else 0
      */
-    public int getResId(ResType resType, final String name) {
-        return _context.getResources().getIdentifier(name, resType.name().toLowerCase(), _context.getPackageName());
+    public int getResId(final ResType resType, final String name) {
+        try {
+            return _context.getResources().getIdentifier(name, resType.name().toLowerCase(), _context.getPackageName());
+        } catch (Exception e) {
+            return 0;
+        }
     }
 
     /**
      * Get String by given string ressource id (nuermic)
      */
-    public String rstr(@StringRes int strResId) {
-        return _context.getString(strResId);
+    public String rstr(@StringRes final int strResId) {
+        try {
+            return _context.getString(strResId);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**
      * Get String by given string ressource identifier (textual)
      */
-    public String rstr(String strResKey) {
+    public String rstr(final String strResKey, Object... a0getResKeyAsFallback) {
         try {
             return rstr(getResId(ResType.STRING, strResKey));
         } catch (Resources.NotFoundException e) {
-            return null;
+            return a0getResKeyAsFallback != null && a0getResKeyAsFallback.length > 0 ? strResKey : null;
         }
     }
 
     /**
      * Get drawable from given ressource identifier
      */
-    public Drawable rdrawable(@DrawableRes int resId) {
-        return ContextCompat.getDrawable(_context, resId);
+    public Drawable rdrawable(@DrawableRes final int resId) {
+        try {
+            return ContextCompat.getDrawable(_context, resId);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**
      * Get color by given color ressource id
      */
-    public int rcolor(@ColorRes int resId) {
+    public int rcolor(@ColorRes final int resId) {
+        if (resId == 0) {
+            Log.e(getClass().getName(), "ContextUtils::rcolor: resId is 0!");
+            return Color.BLACK;
+        }
         return ContextCompat.getColor(_context, resId);
     }
 
@@ -159,29 +197,37 @@ public class ContextUtils {
      * @param intColor  The color coded in int
      * @param withAlpha Optional; Set first bool parameter to true to also include alpha value
      */
-    public String colorToHexString(int intColor, boolean... withAlpha) {
+    public static String colorToHexString(final int intColor, final boolean... withAlpha) {
         boolean a = withAlpha != null && withAlpha.length >= 1 && withAlpha[0];
         return String.format(a ? "#%08X" : "#%06X", (a ? 0xFFFFFFFF : 0xFFFFFF) & intColor);
     }
 
+    public static String getAndroidVersion() {
+        return Build.VERSION.RELEASE + " (" + Build.VERSION.SDK_INT + ")";
+    }
+
     public String getAppVersionName() {
+        PackageManager manager = _context.getPackageManager();
         try {
-            PackageManager manager = _context.getPackageManager();
-            PackageInfo info = manager.getPackageInfo(getPackageName(), 0);
+            PackageInfo info = manager.getPackageInfo(getPackageIdManifest(), 0);
             return info.versionName;
         } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return "?";
+            try {
+                PackageInfo info = manager.getPackageInfo(getPackageIdReal(), 0);
+                return info.versionName;
+            } catch (PackageManager.NameNotFoundException ignored) {
+            }
         }
+        return "?";
     }
 
     public String getAppInstallationSource() {
         String src = null;
         try {
-            src = _context.getPackageManager().getInstallerPackageName(getPackageName());
+            src = _context.getPackageManager().getInstallerPackageName(getPackageIdManifest());
         } catch (Exception ignored) {
         }
-        if (TextUtils.isEmpty(src)) {
+        if (src == null || src.trim().isEmpty()) {
             return "Sideloaded";
         } else if (src.toLowerCase().contains(".amazon.")) {
             return "Amazon Appstore";
@@ -189,7 +235,7 @@ public class ContextUtils {
         switch (src) {
             case "com.android.vending":
             case "com.google.android.feedback": {
-                return "Google Play Store";
+                return "Google Play";
             }
             case "org.fdroid.fdroid.privileged":
             case "org.fdroid.fdroid": {
@@ -212,23 +258,31 @@ public class ContextUtils {
      * Send a {@link Intent#ACTION_VIEW} Intent with given paramter
      * If the parameter is an string a browser will get triggered
      */
-    public void openWebpageInExternalBrowser(final String url) {
-        Uri uri = Uri.parse(url);
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-        intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+    public ContextUtils openWebpageInExternalBrowser(final String url) {
         try {
+            Uri uri = Uri.parse(url);
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
             _context.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
+        return this;
     }
 
     /**
-     * Get this apps package name. The builtin method may fail when used with flavors
+     * Get the apps base packagename, which is equal with all build flavors and variants
      */
-    public String getPackageName() {
+    public String getPackageIdManifest() {
         String pkg = rstr("manifest_package_id");
-        return pkg != null ? pkg : _context.getPackageName();
+        return !TextUtils.isEmpty(pkg) ? pkg : _context.getPackageName();
+    }
+
+    /**
+     * Get this apps package name, returns the flavor specific package name.
+     */
+    public String getPackageIdReal() {
+        return _context.getPackageName();
     }
 
     /**
@@ -239,23 +293,36 @@ public class ContextUtils {
      * of the package set in manifest (root element).
      * Falls back to applicationId of the app which may differ from manifest.
      */
-    public Object getBuildConfigValue(String fieldName) {
-        String pkg = getPackageName() + ".BuildConfig";
+    public Object getBuildConfigValue(final String fieldName) {
+        final String pkg = getPackageIdManifest() + ".BuildConfig";
         try {
             Class<?> c = Class.forName(pkg);
             return c.getField(fieldName).get(null);
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
         }
+        return null;
+    }
+
+    public List<String> getBuildConfigFields() {
+        final String pkg = getPackageIdManifest() + ".BuildConfig";
+        final List<String> fields = new ArrayList<>();
+        try {
+            for (Field f : Class.forName(pkg).getFields()) {
+                fields.add(f.getName());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return fields;
     }
 
     /**
      * Get a BuildConfig bool value
      */
-    public Boolean bcbool(String fieldName, Boolean defaultValue) {
+    public Boolean bcbool(final String fieldName, final Boolean defaultValue) {
         Object field = getBuildConfigValue(fieldName);
-        if (field != null && field instanceof Boolean) {
+        if (field instanceof Boolean) {
             return (Boolean) field;
         }
         return defaultValue;
@@ -264,9 +331,9 @@ public class ContextUtils {
     /**
      * Get a BuildConfig string value
      */
-    public String bcstr(String fieldName, String defaultValue) {
+    public String bcstr(final String fieldName, final String defaultValue) {
         Object field = getBuildConfigValue(fieldName);
-        if (field != null && field instanceof String) {
+        if (field instanceof String) {
             return (String) field;
         }
         return defaultValue;
@@ -275,9 +342,9 @@ public class ContextUtils {
     /**
      * Get a BuildConfig string value
      */
-    public Integer bcint(String fieldName, int defaultValue) {
+    public Integer bcint(final String fieldName, final int defaultValue) {
         Object field = getBuildConfigValue(fieldName);
-        if (field != null && field instanceof Integer) {
+        if (field instanceof Integer) {
             return (Integer) field;
         }
         return defaultValue;
@@ -297,26 +364,6 @@ public class ContextUtils {
         return bcbool("IS_FOSS_BUILD", false);
     }
 
-    /**
-     * Request a bitcoin donation with given details.
-     * All parameters are awaited as string resource ids
-     */
-    public void showDonateBitcoinRequest(@StringRes final int srBitcoinId, @StringRes final int srBitcoinAmount, @StringRes final int srBitcoinMessage, @StringRes final int srAlternativeDonateUrl) {
-        if (!isGooglePlayBuild()) {
-            String btcUri = String.format("bitcoin:%s?amount=%s&label=%s&message=%s",
-                    rstr(srBitcoinId), rstr(srBitcoinAmount),
-                    rstr(srBitcoinMessage), rstr(srBitcoinMessage));
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(btcUri));
-            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
-            try {
-                _context.startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                openWebpageInExternalBrowser(rstr(srAlternativeDonateUrl));
-            }
-        }
-    }
-
     public String readTextfileFromRawRes(@RawRes int rawResId, String linePrefix, String linePostfix) {
         StringBuilder sb = new StringBuilder();
         BufferedReader br = null;
@@ -365,8 +412,8 @@ public class ContextUtils {
      * Check if app with given {@code packageName} is installed
      */
     public boolean isAppInstalled(String packageName) {
-        PackageManager pm = _context.getApplicationContext().getPackageManager();
         try {
+            PackageManager pm = _context.getApplicationContext().getPackageManager();
             pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
             return true;
         } catch (PackageManager.NameNotFoundException e) {
@@ -378,17 +425,17 @@ public class ContextUtils {
      * Restart the current app. Supply the class to start on startup
      */
     public void restartApp(Class classToStart) {
-        Intent inte = new Intent(_context, classToStart);
-        PendingIntent inteP = PendingIntent.getActivity(_context, 555, inte, PendingIntent.FLAG_CANCEL_CURRENT);
+        Intent intent = new Intent(_context, classToStart);
+        PendingIntent pendi = PendingIntent.getActivity(_context, 555, intent, PendingIntent.FLAG_CANCEL_CURRENT);
         AlarmManager mgr = (AlarmManager) _context.getSystemService(Context.ALARM_SERVICE);
         if (_context instanceof Activity) {
             ((Activity) _context).finish();
         }
         if (mgr != null) {
-            mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, inteP);
+            mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendi);
         } else {
-            inte.addFlags(FLAG_ACTIVITY_NEW_TASK);
-            _context.startActivity(inte);
+            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+            _context.startActivity(intent);
         }
         Runtime.getRuntime().exit(0);
     }
@@ -457,19 +504,25 @@ public class ContextUtils {
      * {@code androidLC} may be in any of the forms: en, de, de-rAt
      * If given an empty string, the default (system) locale gets loaded
      */
-    public void setAppLanguage(String androidLC) {
+    public void setAppLanguage(final String androidLC) {
         Locale locale = getLocaleByAndroidCode(androidLC);
+        locale = (locale != null && !androidLC.isEmpty()) ? locale : Resources.getSystem().getConfiguration().locale;
+        setLocale(locale);
+    }
+
+    public ContextUtils setLocale(final Locale locale) {
         Configuration config = _context.getResources().getConfiguration();
-        config.locale = (locale != null && !androidLC.isEmpty())
-                ? locale : Resources.getSystem().getConfiguration().locale;
+        config.locale = (locale != null ? locale : Resources.getSystem().getConfiguration().locale);
         _context.getResources().updateConfiguration(config, null);
+        Locale.setDefault(locale);
+        return this;
     }
 
     /**
      * Try to guess if the color on top of the given {@code colorOnBottomInt}
      * should be light or dark. Returns true if top color should be light
      */
-    public boolean shouldColorOnTopBeLight(@ColorInt int colorOnBottomInt) {
+    public boolean shouldColorOnTopBeLight(@ColorInt final int colorOnBottomInt) {
         return 186 > (((0.299 * Color.red(colorOnBottomInt))
                 + ((0.587 * Color.green(colorOnBottomInt))
                 + (0.114 * Color.blue(colorOnBottomInt)))));
@@ -478,7 +531,7 @@ public class ContextUtils {
     /**
      * Convert a html string to an android {@link Spanned} object
      */
-    public Spanned htmlToSpanned(String html) {
+    public Spanned htmlToSpanned(final String html) {
         Spanned result;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
             result = Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
@@ -502,12 +555,87 @@ public class ContextUtils {
         return dp * _context.getResources().getDisplayMetrics().density;
     }
 
+    /**
+     * Get the private directory for the current package (usually /data/data/package.name/)
+     */
+    @SuppressWarnings("StatementWithEmptyBody")
+    public File getAppDataPrivateDir() {
+        File filesDir;
+        try {
+            filesDir = new File(new File(_context.getPackageManager().getPackageInfo(getPackageIdReal(), 0).applicationInfo.dataDir), "files");
+        } catch (PackageManager.NameNotFoundException e) {
+            filesDir = _context.getFilesDir();
+        }
+        if (!filesDir.exists() && filesDir.mkdirs()) ;
+        return filesDir;
+    }
+
+    /**
+     * Get public (accessible) appdata folders
+     */
+    @SuppressWarnings("StatementWithEmptyBody")
+    public List<Pair<File, String>> getAppDataPublicDirs(boolean internalStorageFolder, boolean sdcardFolders, boolean storageNameWithoutType) {
+        List<Pair<File, String>> dirs = new ArrayList<>();
+        for (File externalFileDir : ContextCompat.getExternalFilesDirs(_context, null)) {
+            if (externalFileDir == null || Environment.getExternalStorageDirectory() == null) {
+                continue;
+            }
+            boolean isInt = externalFileDir.getAbsolutePath().startsWith(Environment.getExternalStorageDirectory().getAbsolutePath());
+            boolean add = (internalStorageFolder && isInt) || (sdcardFolders && !isInt);
+            if (add) {
+                dirs.add(new Pair<>(externalFileDir, getStorageName(externalFileDir, storageNameWithoutType)));
+                if (!externalFileDir.exists() && externalFileDir.mkdirs()) ;
+            }
+        }
+        return dirs;
+    }
+
+    public String getStorageName(final File externalFileDir, final boolean storageNameWithoutType) {
+        boolean isInt = externalFileDir.getAbsolutePath().startsWith(Environment.getExternalStorageDirectory().getAbsolutePath());
+
+        String[] split = externalFileDir.getAbsolutePath().split("/");
+        if (split.length > 2) {
+            return isInt ? (storageNameWithoutType ? "Internal Storage" : "") : (storageNameWithoutType ? split[2] : ("SD Card (" + split[2] + ")"));
+        } else {
+            return "Storage";
+        }
+    }
+
+    public List<Pair<File, String>> getStorages(final boolean internalStorageFolder, final boolean sdcardFolders) {
+        List<Pair<File, String>> storages = new ArrayList<>();
+        for (Pair<File, String> pair : getAppDataPublicDirs(internalStorageFolder, sdcardFolders, true)) {
+            if (pair.first != null && pair.first.getAbsolutePath().lastIndexOf("/Android/data") > 0) {
+                try {
+                    storages.add(new Pair<>(new File(pair.first.getCanonicalPath().replaceFirst("/Android/data.*", "")), pair.second));
+                } catch (IOException ignored) {
+                }
+            }
+        }
+        return storages;
+    }
+
+    public File getStorageRootFolder(final File file) {
+        String filepath;
+        try {
+            filepath = file.getCanonicalPath();
+        } catch (Exception ignored) {
+            return null;
+        }
+        for (Pair<File, String> storage : getStorages(false, true)) {
+            //noinspection ConstantConditions
+            if (filepath.startsWith(storage.first.getAbsolutePath())) {
+                return storage.first;
+            }
+        }
+        return null;
+    }
+
     /**
      * Request the givens paths to be scanned by MediaScanner
      *
      * @param files Files and folders to scan
      */
-    public void mediaScannerScanFile(File... files) {
+    public void mediaScannerScanFile(final File... files) {
         if (android.os.Build.VERSION.SDK_INT > 19) {
             String[] paths = new String[files.length];
             for (int i = 0; i < files.length; i++) {
@@ -556,8 +684,12 @@ public class ContextUtils {
     /**
      * Get a {@link Bitmap} out of a {@link DrawableRes}
      */
-    public Bitmap drawableToBitmap(@DrawableRes int drawableId) {
-        return drawableToBitmap(ContextCompat.getDrawable(_context, drawableId));
+    public Bitmap drawableToBitmap(@DrawableRes final int drawableId) {
+        try {
+            return drawableToBitmap(ContextCompat.getDrawable(_context, drawableId));
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**
@@ -565,7 +697,7 @@ public class ContextUtils {
      * Specifying a {@code maxDimen} is also possible and a value below 2000
      * is recommended, otherwise a {@link OutOfMemoryError} may occur
      */
-    public Bitmap loadImageFromFilesystem(File imagePath, int maxDimen) {
+    public Bitmap loadImageFromFilesystem(final File imagePath, final int maxDimen) {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
         BitmapFactory.decodeFile(imagePath.getAbsolutePath(), options);
@@ -581,7 +713,7 @@ public class ContextUtils {
      * @param maxDimen Max size of the Bitmap (width or height)
      * @return the scaling factor that needs to be applied to the bitmap
      */
-    public int calculateInSampleSize(BitmapFactory.Options options, int maxDimen) {
+    public int calculateInSampleSize(final BitmapFactory.Options options, final int maxDimen) {
         // Raw height and width of image
         int height = options.outHeight;
         int width = options.outWidth;
@@ -597,7 +729,7 @@ public class ContextUtils {
      * Scale the bitmap so both dimensions are lower or equal to {@code maxDimen}
      * This keeps the aspect ratio
      */
-    public Bitmap scaleBitmap(Bitmap bitmap, int maxDimen) {
+    public Bitmap scaleBitmap(final Bitmap bitmap, final int maxDimen) {
         int picSize = Math.min(bitmap.getHeight(), bitmap.getWidth());
         float scale = 1.f * maxDimen / picSize;
         Matrix matrix = new Matrix();
@@ -605,44 +737,27 @@ public class ContextUtils {
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
     }
 
-    /**
-     * Write the given {@link Bitmap} to {@code imageFile}, in {@link CompressFormat#JPEG} format
-     */
-    public boolean writeImageToFileJpeg(File imageFile, Bitmap image) {
-        return writeImageToFile(imageFile, image, Bitmap.CompressFormat.JPEG, 95);
-    }
-
     /**
      * Write the given {@link Bitmap} to filesystem
      *
      * @param targetFile The file to be written in
-     * @param image      The image as android {@link Bitmap}
-     * @param format     One format of {@link CompressFormat}, null will determine based on filename
-     * @param quality    Quality level, defaults to 95
+     * @param image      Android {@link Bitmap}
      * @return True if writing was successful
      */
-    public boolean writeImageToFile(File targetFile, Bitmap image, CompressFormat format, Integer quality) {
+    public boolean writeImageToFile(final File targetFile, final Bitmap image, Integer... a0quality) {
+        final int quality = (a0quality != null && a0quality.length > 0 && a0quality[0] >= 0 && a0quality[0] <= 100) ? a0quality[0] : 70;
+        final String lc = targetFile.getAbsolutePath().toLowerCase(Locale.ROOT);
+        final CompressFormat format = lc.endsWith(".webp") ? CompressFormat.WEBP : (lc.endsWith(".png") ? CompressFormat.PNG : CompressFormat.JPEG);
+
+        boolean ok = false;
         File folder = new File(targetFile.getParent());
-        if (quality == null || quality < 0 || quality > 100) {
-            quality = 95;
-        }
-        if (format == null) {
-            format = CompressFormat.JPEG;
-            String lc = targetFile.getAbsolutePath().toLowerCase(Locale.ROOT);
-            if (lc.endsWith(".png")) {
-                format = CompressFormat.PNG;
-            }
-            if (lc.endsWith(".webp")) {
-                format = CompressFormat.WEBP;
-            }
-        }
         if (folder.exists() || folder.mkdirs()) {
             FileOutputStream stream = null;
             try {
-                stream = new FileOutputStream(targetFile); // overwrites this image every time
+                stream = new FileOutputStream(targetFile);
                 image.compress(format, quality, stream);
-                return true;
-            } catch (FileNotFoundException ignored) {
+                ok = true;
+            } catch (Exception ignored) {
             } finally {
                 try {
                     if (stream != null) {
@@ -652,14 +767,18 @@ public class ContextUtils {
                 }
             }
         }
-        return false;
+        try {
+            image.recycle();
+        } catch (Exception ignored) {
+        }
+        return ok;
     }
 
     /**
      * Draw text in the center of the given {@link DrawableRes}
      * This may be useful for e.g. badge counts
      */
-    public Bitmap drawTextOnDrawable(@DrawableRes int drawableRes, String text, int textSize) {
+    public Bitmap drawTextOnDrawable(@DrawableRes final int drawableRes, final String text, final int textSize) {
         Resources resources = _context.getResources();
         float scale = resources.getDisplayMetrics().density;
         Bitmap bitmap = drawableToBitmap(drawableRes);
@@ -684,12 +803,16 @@ public class ContextUtils {
      * Try to tint all {@link Menu}s {@link MenuItem}s with given color
      */
     @SuppressWarnings("ConstantConditions")
-    public void tintMenuItems(Menu menu, boolean recurse, @ColorInt int iconColor) {
+    public void tintMenuItems(final Menu menu, final boolean recurse, @ColorInt final int iconColor) {
         for (int i = 0; i < menu.size(); i++) {
             MenuItem item = menu.getItem(i);
-            tintDrawable(item.getIcon(), iconColor);
-            if (item.hasSubMenu() && recurse) {
-                tintMenuItems(item.getSubMenu(), recurse, iconColor);
+            try {
+                tintDrawable(item.getIcon(), iconColor);
+                if (item.hasSubMenu() && recurse) {
+                    tintMenuItems(item.getSubMenu(), recurse, iconColor);
+                }
+            } catch (Exception ignored) {
+                // This should not happen at all, but may in bad menu.xml configuration
             }
         }
     }
@@ -697,14 +820,14 @@ public class ContextUtils {
     /**
      * Loads {@link Drawable} by given {@link DrawableRes} and applies a color
      */
-    public Drawable tintDrawable(@DrawableRes int drawableRes, @ColorInt int color) {
+    public Drawable tintDrawable(@DrawableRes final int drawableRes, @ColorInt final int color) {
         return tintDrawable(rdrawable(drawableRes), color);
     }
 
     /**
      * Tint a {@link Drawable} with given {@code color}
      */
-    public Drawable tintDrawable(@Nullable Drawable drawable, @ColorInt int color) {
+    public Drawable tintDrawable(@Nullable Drawable drawable, @ColorInt final int color) {
         if (drawable != null) {
             drawable = DrawableCompat.wrap(drawable);
             DrawableCompat.setTint(drawable.mutate(), color);
@@ -716,7 +839,10 @@ public class ContextUtils {
      * Try to make icons in Toolbar/ActionBars SubMenus visible
      * This may not work on some devices and it maybe won't work on future android updates
      */
-    public void setSubMenuIconsVisiblity(Menu menu, boolean visible) {
+    public void setSubMenuIconsVisiblity(final Menu menu, final boolean visible) {
+        if (TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL) {
+            return;
+        }
         if (menu.getClass().getSimpleName().equals("MenuBuilder")) {
             try {
                 @SuppressLint("PrivateApi") Method m = menu.getClass().getDeclaredMethod("setOptionalIconsVisible", Boolean.TYPE);
@@ -727,4 +853,165 @@ public class ContextUtils {
             }
         }
     }
+
+
+    public String getLocalizedDateFormat() {
+        return ((SimpleDateFormat) android.text.format.DateFormat.getDateFormat(_context)).toPattern();
+    }
+
+    public String getLocalizedTimeFormat() {
+        return ((SimpleDateFormat) android.text.format.DateFormat.getTimeFormat(_context)).toPattern();
+    }
+
+    public String getLocalizedDateTimeFormat() {
+        return getLocalizedDateFormat() + " " + getLocalizedTimeFormat();
+    }
+
+    /**
+     * A {@link InputFilter} for filenames
+     */
+    @SuppressWarnings("Convert2Lambda")
+    public static final InputFilter INPUTFILTER_FILENAME = new InputFilter() {
+        public CharSequence filter(CharSequence src, int start, int end, Spanned dest, int dstart, int dend) {
+            if (src.length() < 1) return null;
+            char last = src.charAt(src.length() - 1);
+            String illegal = "|\\?*<\":>[]/'";
+            if (illegal.indexOf(last) > -1) return src.subSequence(0, src.length() - 1);
+            return null;
+        }
+    };
+
+    /**
+     * A simple {@link Runnable} which does a touch event on a view.
+     * This pops up e.g. the keyboard on a {@link android.widget.EditText}
+     * <p>
+     * Example: new Handler().postDelayed(new DoTouchView(editView), 200);
+     */
+    public static class DoTouchView implements Runnable {
+        View _view;
+
+        public DoTouchView(View view) {
+            _view = view;
+        }
+
+        @Override
+        public void run() {
+            _view.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, 0, 0, 0));
+            _view.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 0, 0, 0));
+        }
+    }
+
+
+    public String getMimeType(final File file) {
+        return getMimeType(Uri.fromFile(file));
+    }
+
+    /**
+     * Detect MimeType of given file
+     * Android/Java's own MimeType map is very very small and detection barely works at all
+     * Hence use custom map for some file extensions
+     */
+    public String getMimeType(final Uri uri) {
+        String mimeType = null;
+        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+            ContentResolver cr = _context.getContentResolver();
+            mimeType = cr.getType(uri);
+        } else {
+            String filename = uri.toString();
+            if (filename.endsWith(".jenc")) {
+                filename = filename.replace(".jenc", "");
+            }
+            String ext = MimeTypeMap.getFileExtensionFromUrl(filename);
+            mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.toLowerCase());
+
+            // Try to guess if the recommended methods fail
+            if (TextUtils.isEmpty(mimeType)) {
+                switch (ext) {
+                    case "md":
+                    case "markdown":
+                    case "mkd":
+                    case "mdown":
+                    case "mkdn":
+                    case "mdwn":
+                    case "rmd":
+                        mimeType = "text/markdown";
+                        break;
+                    case "yaml":
+                    case "yml":
+                        mimeType = "text/yaml";
+                        break;
+                    case "json":
+                        mimeType = "text/json";
+                        break;
+                    case "txt":
+                        mimeType = "text/plain";
+                        break;
+                }
+            }
+        }
+
+        if (TextUtils.isEmpty(mimeType)) {
+            mimeType = "*/*";
+        }
+        return mimeType;
+    }
+
+    public Integer parseColor(final String colorstr) {
+        if (colorstr == null || colorstr.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            return Color.parseColor(colorstr);
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    public boolean isDeviceGoodHardware() {
+        try {
+            ActivityManager activityManager = (ActivityManager) _context.getSystemService(Context.ACTIVITY_SERVICE);
+            return !ActivityManagerCompat.isLowRamDevice(activityManager) &&
+                    Runtime.getRuntime().availableProcessors() >= 4 &&
+                    activityManager.getMemoryClass() >= 128;
+        } catch (Exception ignored) {
+            return true;
+        }
+    }
+
+    // Vibrate device one time by given amount of time, defaulting to 50ms
+    // Requires <uses-permission android:name="android.permission.VIBRATE" /> in AndroidManifest to work
+    @SuppressWarnings("UnnecessaryReturnStatement")
+    @SuppressLint("MissingPermission")
+    public void vibrate(final int... ms) {
+        int ms_v = ms != null && ms.length > 0 ? ms[0] : 50;
+        Vibrator vibrator = ((Vibrator) _context.getSystemService(VIBRATOR_SERVICE));
+        if (vibrator == null) {
+            return;
+        } else if (Build.VERSION.SDK_INT >= 26) {
+            vibrator.vibrate(VibrationEffect.createOneShot(ms_v, VibrationEffect.DEFAULT_AMPLITUDE));
+        } else {
+            vibrator.vibrate(ms_v);
+        }
+    }
+
+    /*
+    Check if Wifi is connected. Requires these permissions in AndroidManifest:
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+     */
+    @SuppressLint("MissingPermission")
+    public boolean isWifiConnected(boolean... enabledOnly) {
+        final boolean doEnabledCheckOnly = enabledOnly != null && enabledOnly.length > 0 && enabledOnly[0];
+        final ConnectivityManager connectivityManager = (ConnectivityManager) _context.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        final NetworkInfo wifiInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        return wifiInfo != null && (doEnabledCheckOnly ? wifiInfo.isAvailable() : wifiInfo.isConnected());
+    }
+
+    // Returns if the device is currently in portrait orientation (landscape=false)
+    public boolean isDeviceOrientationPortrait() {
+        final int rotation = ((WindowManager) _context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getOrientation();
+        return (rotation == Surface.ROTATION_0) || (rotation == Surface.ROTATION_180);
+    }
 }
+
+
diff --git a/app/src/main/java/net/gsantner/opoc/util/FileUtils.java b/app/src/main/java/net/gsantner/opoc/util/FileUtils.java
index 5e02d17f..7dbd1658 100644
--- a/app/src/main/java/net/gsantner/opoc/util/FileUtils.java
+++ b/app/src/main/java/net/gsantner/opoc/util/FileUtils.java
@@ -1,21 +1,23 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
 
 
+import android.text.TextUtils;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -28,6 +30,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.URLConnection;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -35,20 +38,29 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "deprecation"})
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "deprecation", "TryFinallyCanBeTryWithResources"})
 public class FileUtils {
     // Used on methods like copyFile(src, dst)
     private static final int BUFFER_SIZE = 4096;
 
     public static String readTextFileFast(final File file) {
         try {
-            return new String(readCloseBinaryStream(new FileInputStream(file)));
+            return new String(readCloseStreamWithSize(new FileInputStream(file), (int) file.length()));
         } catch (FileNotFoundException e) {
             System.err.println("readTextFileFast: File " + file + " not found.");
         }
         return "";
     }
 
+    public static byte[] readCloseStreamWithSize(final InputStream stream, int size) {
+        byte[] data = new byte[size];
+        try (DataInputStream dis = new DataInputStream(stream)) {
+            dis.readFully(data);
+        } catch (IOException ignored) {
+        }
+        return data;
+    }
+
     public static String readTextFile(final File file) {
         try {
             return readCloseTextStream(new FileInputStream(file));
@@ -230,6 +242,30 @@ public class FileUtils {
         }
     }
 
+    public static boolean copyFile(final File src, final FileOutputStream os) {
+        InputStream is = null;
+        try {
+            try {
+                is = new FileInputStream(src);
+                byte[] buf = new byte[BUFFER_SIZE];
+                int len;
+                while ((len = is.read(buf)) > 0) {
+                    os.write(buf, 0, len);
+                }
+                return true;
+            } finally {
+                if (is != null) {
+                    is.close();
+                }
+                if (os != null) {
+                    os.close();
+                }
+            }
+        } catch (IOException ex) {
+            return false;
+        }
+    }
+
     // Returns -1 if the file did not contain any of the needles, otherwise,
     // the index of which needle was found in the contents of the file.
     //
@@ -356,55 +392,70 @@ public class FileUtils {
      */
     public static String getMimeType(File file) {
         String guess = null;
-        if (file != null && file.exists() && file.isFile()) {
-            InputStream is = null;
-            try {
-                is = new BufferedInputStream(new FileInputStream(file));
-                guess = URLConnection.guessContentTypeFromStream(is);
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (is != null) {
-                    try {
-                        is.close();
-                    } catch (IOException ignored) {
+        if (file != null) {
+            if (file.exists() && file.isFile()) {
+                InputStream is = null;
+                try {
+                    is = new BufferedInputStream(new FileInputStream(file));
+                    guess = URLConnection.guessContentTypeFromStream(is);
+                } catch (Exception ignored) {
+                } finally {
+                    if (is != null) {
+                        try {
+                            is.close();
+                        } catch (Exception ignored) {
+                        }
                     }
                 }
             }
 
-            if (guess == null || guess.isEmpty()) {
-                guess = "*/*";
-                int dot = file.getName().lastIndexOf(".") + 1;
-                if (dot > 0 && dot < file.getName().length()) {
-                    switch (file.getName().substring(dot)) {
-                        case "md":
-                        case "markdown":
-                        case "mkd":
-                        case "mdown":
-                        case "mkdn":
-                        case "mdwn":
-                        case "rmd":
-                            guess = "text/markdown";
-                            break;
-                        case "txt":
-                            guess = "text/plain";
-                            break;
-                    }
+            String filename = file.getName().replace(".jenc", "");
+            int dot = filename.lastIndexOf(".") + 1;
+            if (dot > 0 && dot < filename.length()) {
+                switch (filename.substring(dot)) {
+                    case "md":
+                    case "markdown":
+                    case "mkd":
+                    case "mdown":
+                    case "mkdn":
+                    case "mdwn":
+                    case "rmd":
+                        guess = "text/markdown";
+                        break;
+                    case "txt":
+                        guess = "text/plain";
+                        break;
+                    case "webp":
+                        guess = "image/webp";
+                        break;
+                    case "jpg":
+                    case "jpeg":
+                        guess = "image/jpeg";
+                        break;
+                    case "png":
+                        guess = "image/png";
+                        break;
                 }
             }
+
+            if (TextUtils.isEmpty(guess)) {
+                guess = URLConnection.guessContentTypeFromName(filename);
+            }
         }
-        return guess;
+
+        return TextUtils.isEmpty(guess) ? "*/*" : guess;
     }
 
     public static boolean isTextFile(File file) {
-        return getMimeType(file).startsWith("text/");
+        String mime = getMimeType(file);
+        return mime != null && mime.startsWith("text/");
     }
 
     /**
      * Analyze given textfile and retrieve multiple information from it
      * Information is written back to the {@link AtomicInteger} parameters
      */
-    public static void retrieveTextFileSummary(File file, AtomicInteger numCharacters, AtomicInteger numLines) {
+    public static void retrieveTextFileSummary(File file, AtomicInteger numCharacters, AtomicInteger numLines, AtomicInteger numWords) {
         BufferedReader br = null;
         try {
             br = new BufferedReader(new FileReader(file));
@@ -412,11 +463,15 @@ public class FileUtils {
             while ((line = br.readLine()) != null) {
                 numLines.getAndIncrement();
                 numCharacters.getAndSet(numCharacters.get() + line.length());
+                if (!line.equals("")) {
+                    numWords.getAndSet(numWords.get() + line.split("\\s+").length);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             numCharacters.set(-1);
             numLines.set(-1);
+            numWords.set(-1);
         } finally {
             if (br != null) {
                 try {
@@ -437,7 +492,36 @@ public class FileUtils {
         }
         String[] units = abbreviation ? new String[]{"B", "kB", "MB", "GB", "TB"} : new String[]{"Bytes", "Kilobytes", "Megabytes", "Gigabytes", "Terabytes"};
         int unit = (int) (Math.log10(size) / Math.log10(1024));
-        return new DecimalFormat("#,##0.#").format(size / Math.pow(1024, unit))
-                + " " + units[unit];
+        return new DecimalFormat("#,##0.#", DecimalFormatSymbols.getInstance(Locale.ENGLISH)).format(size / Math.pow(1024, unit)) + " " + units[unit];
+    }
+
+    public static int[] getTimeDiffHMS(long now, long past) {
+        int[] ret = new int[3];
+        long diff = Math.abs(now - past);
+        ret[0] = (int) (diff / (1000 * 60 * 60)); // hours
+        ret[1] = (int) (diff / (1000 * 60)) % 60; // min
+        ret[2] = (int) (diff / 1000) % 60; // sec
+        return ret;
+    }
+
+    public static String getHumanReadableByteCountSI(final long bytes) {
+        if (bytes < 1000) {
+            return String.format(Locale.getDefault(), "%d%s", bytes, "B");
+        } else if (bytes < 1000000) {
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000f), "KB");
+        } else if (bytes < 1000000000) {
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000f), "MB");
+        } else if (bytes < 1000000000000L) {
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000000f), "GB");
+        } else {
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000000000f), "TB");
+        }
+    }
+
+    public static File join(File file, String... childSegments) {
+        for (final String s : childSegments != null ? childSegments : new String[0]) {
+            file = new File(file, s);
+        }
+        return file;
     }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java b/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java
index 6190188e..dc06674e 100644
--- a/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java
+++ b/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java
@@ -1,11 +1,10 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
@@ -77,7 +76,7 @@ public class NetworkUtils {
             int written = 0;
             final float invLength = 1f / connection.getContentLength();
 
-            byte data[] = new byte[BUFFER_SIZE];
+            byte[] data = new byte[BUFFER_SIZE];
             while ((count = input.read(data)) != -1) {
                 output.write(data, 0, count);
                 if (invLength != -1f && progressCallback != null) {
@@ -150,6 +149,7 @@ public class NetworkUtils {
         return performCall(url, method, data, null);
     }
 
+    @SuppressWarnings("CharsetObjectCanBeUsed")
     private static String performCall(final URL url, final String method, final String data, final HttpURLConnection existingConnection) {
         try {
             final HttpURLConnection connection = existingConnection != null
@@ -160,7 +160,7 @@ public class NetworkUtils {
             if (data != null && !data.isEmpty()) {
                 connection.setDoOutput(true);
                 final OutputStream output = connection.getOutputStream();
-                output.write(data.getBytes(Charset.forName(UTF8)));
+                output.write(data.getBytes(Charset.forName("UTF-8")));
                 output.flush();
                 output.close();
             }
@@ -220,4 +220,14 @@ public class NetworkUtils {
 
         return result;
     }
+
+    public static void httpGetAsync(final String url, final Callback.a1<String> callback) {
+        new Thread(() -> {
+            try {
+                String c = NetworkUtils.performCall(url, GET);
+                callback.callback(c);
+            } catch (Exception ignored) {
+            }
+        }).start();
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java b/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java
index 36265218..be156745 100644
--- a/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java
+++ b/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java
@@ -1,11 +1,10 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
diff --git a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java b/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java
index 9b8d9fe8..dc467500 100644
--- a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java
+++ b/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java
@@ -1,19 +1,26 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
- *   https://gsantner.net/
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
  *
- *   License: Apache 2.0 / Commercial
- *  https://github.com/gsantner/opoc/#licensing
- *  https://www.apache.org/licenses/LICENSE-2.0
+ *   License of this file: Apache 2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *     https://github.com/gsantner/opoc/#licensing
  *
 #########################################################*/
 package net.gsantner.opoc.util;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -21,51 +28,89 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
+import android.os.ParcelFileDescriptor;
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintJob;
 import android.print.PrintManager;
+import android.provider.CalendarContract;
+import android.provider.MediaStore;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
+import android.support.annotation.StringRes;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.content.pm.ShortcutInfoCompat;
 import android.support.v4.content.pm.ShortcutManagerCompat;
 import android.support.v4.graphics.drawable.IconCompat;
+import android.support.v4.provider.DocumentFile;
+import android.support.v4.util.Pair;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.ImageView;
+import android.widget.Toast;
 
 import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
+import static android.app.Activity.RESULT_OK;
+
 /**
- * A utility class to ease information sharing on Android
- * Also allows to parse/fetch information out of shared information
+ * A utility class to ease information sharing on Android.
+ * Also allows to parse/fetch information out of shared information.
+ * (M)Permissions are not checked, wrap ShareUtils methods if neccessary
  */
-@SuppressWarnings({"UnusedReturnValue", "WeakerAccess", "SameParameterValue", "unused", "deprecation", "ConstantConditions", "ObsoleteSdkInt", "SpellCheckingInspection"})
+@SuppressWarnings({"UnusedReturnValue", "WeakerAccess", "SameParameterValue", "unused", "deprecation", "ConstantConditions", "ObsoleteSdkInt", "SpellCheckingInspection", "JavadocReference", "ConstantLocale"})
 public class ShareUtil {
     public final static String EXTRA_FILEPATH = "real_file_path_2";
-    public final static SimpleDateFormat SDF_RFC3339_ISH = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm", Locale.getDefault());
-    public final static SimpleDateFormat SDF_SHORT = new SimpleDateFormat("yyMMdd-HHmm", Locale.getDefault());
+    public final static SimpleDateFormat SDF_RFC3339_ISH = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss", Locale.getDefault());
+    public final static SimpleDateFormat SDF_SHORT = new SimpleDateFormat("yyMMdd-HHmmss", Locale.getDefault());
+    public final static SimpleDateFormat SDF_IMAGES = new SimpleDateFormat("yyyyMMdd-HHmmss", Locale.getDefault()); //20190511-230845
     public final static String MIME_TEXT_PLAIN = "text/plain";
+    public final static String PREF_KEY__SAF_TREE_URI = "pref_key__saf_tree_uri";
 
+    public final static int REQUEST_CAMERA_PICTURE = 50001;
+    public final static int REQUEST_PICK_PICTURE = 50002;
+    public final static int REQUEST_SAF = 50003;
+
+    public final static int MIN_OVERWRITE_LENGTH = 5;
+
+    protected static String _lastCameraPictureFilepath;
+    protected static String _fileProviderAuthority;
 
     protected Context _context;
-    protected String _fileProviderAuthority;
     protected String _chooserTitle;
 
-    public ShareUtil(Context context) {
+    public ShareUtil(final Context context) {
         _context = context;
         _chooserTitle = "➥";
     }
 
+    public void setContext(final Context c) {
+        _context = c;
+    }
+
+    public void freeContextRef() {
+        _context = null;
+    }
+
     public String getFileProviderAuthority() {
         if (TextUtils.isEmpty(_fileProviderAuthority)) {
             throw new RuntimeException("Error at ShareUtil.getFileProviderAuthority(): No FileProvider authority provided");
@@ -73,13 +118,12 @@ public class ShareUtil {
         return _fileProviderAuthority;
     }
 
-    public ShareUtil setFileProviderAuthority(String fileProviderAuthority) {
+    public static void setFileProviderAuthority(final String fileProviderAuthority) {
         _fileProviderAuthority = fileProviderAuthority;
-        return this;
     }
 
 
-    public ShareUtil setChooserTitle(String title) {
+    public ShareUtil setChooserTitle(final String title) {
         _chooserTitle = title;
         return this;
     }
@@ -90,7 +134,7 @@ public class ShareUtil {
      * @param file the file
      * @return Uri for this file
      */
-    public Uri getUriByFileProviderAuthority(File file) {
+    public Uri getUriByFileProviderAuthority(final File file) {
         return FileProvider.getUriForFile(_context, getFileProviderAuthority(), file);
     }
 
@@ -100,9 +144,11 @@ public class ShareUtil {
      * @param intent      Thing to be shared
      * @param chooserText The title text for the chooser, or null for default
      */
-    public void showChooser(Intent intent, String chooserText) {
-        _context.startActivity(Intent.createChooser(intent,
-                chooserText != null ? chooserText : _chooserTitle));
+    public void showChooser(final Intent intent, final String chooserText) {
+        try {
+            _context.startActivity(Intent.createChooser(intent, chooserText != null ? chooserText : _chooserTitle));
+        } catch (Exception ignored) {
+        }
     }
 
     /**
@@ -114,7 +160,7 @@ public class ShareUtil {
      * @param iconRes Icon resource for the item
      * @param title   Title of the item
      */
-    public void createLauncherDesktopShortcut(Intent intent, @DrawableRes int iconRes, String title) {
+    public void createLauncherDesktopShortcut(final Intent intent, @DrawableRes final int iconRes, final String title) {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         if (intent.getAction() == null) {
@@ -139,7 +185,7 @@ public class ShareUtil {
      * @param iconRes Icon resource for the item
      * @param title   Title of the item
      */
-    public void createLauncherDesktopShortcutLegacy(Intent intent, @DrawableRes int iconRes, String title) {
+    public void createLauncherDesktopShortcutLegacy(final Intent intent, @DrawableRes final int iconRes, final String title) {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         if (intent.getAction() == null) {
@@ -160,7 +206,7 @@ public class ShareUtil {
      * @param text     The text to share
      * @param mimeType MimeType or null (uses text/plain)
      */
-    public void shareText(String text, @Nullable String mimeType) {
+    public void shareText(final String text, @Nullable final String mimeType) {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.putExtra(Intent.EXTRA_TEXT, text);
         intent.setType(mimeType != null ? mimeType : MIME_TEXT_PLAIN);
@@ -173,13 +219,74 @@ public class ShareUtil {
      * @param file     The file to share
      * @param mimeType The files mime type
      */
-    public void shareStream(File file, String mimeType) {
-        Uri fileUri = FileProvider.getUriForFile(_context, getFileProviderAuthority(), file);
+    public boolean shareStream(final File file, final String mimeType) {
         Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.putExtra(Intent.EXTRA_STREAM, fileUri);
         intent.putExtra(EXTRA_FILEPATH, file.getAbsolutePath());
         intent.setType(mimeType);
-        showChooser(intent, null);
+
+        try {
+            Uri fileUri = FileProvider.getUriForFile(_context, getFileProviderAuthority(), file);
+            intent.putExtra(Intent.EXTRA_STREAM, fileUri);
+            showChooser(intent, null);
+            return true;
+        } catch (Exception ignored) { // FileUriExposed(API24) / IllegalArgument
+        }
+        return false;
+    }
+
+    /**
+     * Share the given files as stream with given mime-type
+     *
+     * @param files    The files to share
+     * @param mimeType The files mime type. Usally * / * is the best option
+     */
+    public boolean shareStreamMultiple(final Collection<File> files, final String mimeType) {
+        ArrayList<Uri> uris = new ArrayList<>();
+        for (File file : files) {
+            File uri = new File(file.toString());
+            uris.add(FileProvider.getUriForFile(_context, getFileProviderAuthority(), file));
+        }
+
+        try {
+            Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
+            intent.setType(mimeType);
+            intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
+            showChooser(intent, null);
+            return true;
+        } catch (Exception e) { // FileUriExposed(API24) / IllegalArgument
+            return false;
+        }
+    }
+
+    /**
+     * Start calendar application to add new event, with given details prefilled
+     */
+    public boolean createCalendarAppointment(@Nullable final String title, @Nullable final String description, @Nullable final String location, @Nullable final Long... startAndEndTime) {
+        Intent intent = new Intent(Intent.ACTION_INSERT).setData(CalendarContract.Events.CONTENT_URI);
+        if (title != null) {
+            intent.putExtra(CalendarContract.Events.TITLE, title);
+        }
+        if (description != null) {
+            intent.putExtra(CalendarContract.Events.DESCRIPTION, (description.length() > 800 ? description.substring(0, 800) : description));
+        }
+        if (location != null) {
+            intent.putExtra(CalendarContract.Events.EVENT_LOCATION, location);
+        }
+        if (startAndEndTime != null) {
+            if (startAndEndTime.length > 0 && startAndEndTime[0] > 0) {
+                intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, startAndEndTime[0]);
+            }
+            if (startAndEndTime.length > 1 && startAndEndTime[1] > 0) {
+                intent.putExtra(CalendarContract.EXTRA_EVENT_END_TIME, startAndEndTime[1]);
+            }
+        }
+
+        try {
+            _context.startActivity(intent);
+            return true;
+        } catch (ActivityNotFoundException e) {
+            return false;
+        }
     }
 
     /**
@@ -187,26 +294,29 @@ public class ShareUtil {
      *
      * @param file The file to share
      */
-    public void viewFileInOtherApp(File file, @Nullable String type) {
-        Uri fileUri = FileProvider.getUriForFile(_context, getFileProviderAuthority(), file);
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.putExtra(Intent.EXTRA_STREAM, fileUri);
-        intent.setData(fileUri);
-        intent.putExtra(EXTRA_FILEPATH, file.getAbsolutePath());
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.setDataAndType(fileUri, type);
-        showChooser(intent, null);
-    }
+    public boolean viewFileInOtherApp(final File file, @Nullable final String type) {
+        // On some specific devices the first won't work
+        Uri fileUri = null;
+        try {
+            fileUri = FileProvider.getUriForFile(_context, getFileProviderAuthority(), file);
+        } catch (Exception ignored) {
+            try {
+                fileUri = Uri.fromFile(file);
+            } catch (Exception ignored2) {
+            }
+        }
 
-    /**
-     * Share the given bitmap with given format
-     *
-     * @param bitmap Image
-     * @param format A {@link Bitmap.CompressFormat}, supporting JPEG,PNG,WEBP
-     * @return if success, true
-     */
-    public boolean shareImage(Bitmap bitmap, Bitmap.CompressFormat format) {
-        return shareImage(bitmap, format, 95, "SharedImage");
+        if (fileUri != null) {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.putExtra(Intent.EXTRA_STREAM, fileUri);
+            intent.setData(fileUri);
+            intent.putExtra(EXTRA_FILEPATH, file.getAbsolutePath());
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.setDataAndType(fileUri, type);
+            showChooser(intent, null);
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -218,20 +328,36 @@ public class ShareUtil {
      * @param quality   Quality of the exported image [0-100]
      * @return if success, true
      */
-    public boolean shareImage(Bitmap bitmap, Bitmap.CompressFormat format, int quality, String imageName) {
+    public boolean shareImage(final Bitmap bitmap, final Integer... quality) {
         try {
-            String ext = format.name().toLowerCase();
-            File file = File.createTempFile(imageName, "." + ext.replace("jpeg", "jpg"), _context.getExternalCacheDir());
-            if (bitmap != null && new ContextUtils(_context).writeImageToFile(file, bitmap, format, quality)) {
-                shareStream(file, "image/" + ext);
+            File file = new File(_context.getCacheDir(), getFilenameWithTimestamp());
+            if (bitmap != null && new ContextUtils(_context).writeImageToFile(file, bitmap, quality)) {
+                String x = FileUtils.getMimeType(file);
+                shareStream(file, FileUtils.getMimeType(file));
                 return true;
             }
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (Exception ignored) {
         }
         return false;
     }
 
+    /**
+     * Generate a filename based off current datetime in filename (year, month, day, hour, minute, second)
+     * Examples: Screenshot_20210208-184301_Trebuchet.png IMG_20190511-230845.jpg
+     *
+     * @param A0prefixA1postfixA2ext All arguments are optional and default values are taken for null
+     *                               [0] = Prefix [Screenshot/IMG]
+     *                               [1] = Postfix [Trebuchet]
+     *                               [2] = File extensions [jpg/png/txt]
+     * @return Filename
+     */
+    public static String getFilenameWithTimestamp(String... A0prefixA1postfixA2ext) {
+        final String prefix = (((A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 0 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[0])) ? A0prefixA1postfixA2ext[0] : "Screenshot") + "_").trim().replaceFirst("^_$", "");
+        final String postfix = ("_" + ((A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 1 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[1])) ? A0prefixA1postfixA2ext[1] : "")).trim().replaceFirst("^_$", "");
+        final String ext = (A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 2 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[2])) ? A0prefixA1postfixA2ext[2] : "jpg";
+        return String.format("%s%s%s.%s", prefix.trim(), SDF_IMAGES.format(new Date()), postfix.trim(), ext.toLowerCase().replace(".", "").replace("jpeg", "jpg"));
+    }
+
     /**
      * Print a {@link WebView}'s contents, also allows to create a PDF
      *
@@ -240,18 +366,25 @@ public class ShareUtil {
      * @return {{@link PrintJob}} or null
      */
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    @SuppressWarnings("deprecation")
-    public PrintJob print(WebView webview, String jobName) {
+    public PrintJob print(final WebView webview, final String jobName, final boolean... landscape) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            PrintDocumentAdapter printAdapter;
-            PrintManager printManager = (PrintManager) webview.getContext().getSystemService(Context.PRINT_SERVICE);
+            final PrintDocumentAdapter printAdapter;
+            final PrintManager printManager = (PrintManager) _context.getSystemService(Context.PRINT_SERVICE);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 printAdapter = webview.createPrintDocumentAdapter(jobName);
             } else {
                 printAdapter = webview.createPrintDocumentAdapter();
             }
+            final PrintAttributes.Builder attrib = new PrintAttributes.Builder();
+            if (landscape != null && landscape.length > 0 && landscape[0]) {
+                attrib.setMediaSize(new PrintAttributes.MediaSize("ISO_A4", "android", 11690, 8270));
+                attrib.setMinMargins(new PrintAttributes.Margins(0, 0, 0, 0));
+            }
             if (printManager != null) {
-                return printManager.print(jobName, printAdapter, new PrintAttributes.Builder().build());
+                try {
+                    return printManager.print(jobName, printAdapter, attrib.build());
+                } catch (Exception ignored) {
+                }
             }
         } else {
             Log.e(getClass().getName(), "ERROR: Method called on too low Android API version");
@@ -264,8 +397,7 @@ public class ShareUtil {
      * See {@link #print(WebView, String) print method}
      */
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    @SuppressWarnings("deprecation")
-    public PrintJob createPdf(WebView webview, String jobName) {
+    public PrintJob createPdf(final WebView webview, final String jobName) {
         return print(webview, jobName);
     }
 
@@ -277,21 +409,21 @@ public class ShareUtil {
      * @return A {@link Bitmap} or null
      */
     @Nullable
-    public static Bitmap getBitmapFromWebView(WebView webView) {
+    public static Bitmap getBitmapFromWebView(final WebView webView, final boolean... a0fullpage) {
         try {
             //Measure WebView's content
-            int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-            webView.measure(widthMeasureSpec, heightMeasureSpec);
-            webView.layout(0, 0, webView.getMeasuredWidth(), webView.getMeasuredHeight());
+            if (a0fullpage != null && a0fullpage.length > 0 && a0fullpage[0]) {
+                int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+                int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                webView.measure(widthMeasureSpec, heightMeasureSpec);
+                webView.layout(0, 0, webView.getMeasuredWidth(), webView.getMeasuredHeight());
+            }
 
             //Build drawing cache and store its size
             webView.buildDrawingCache();
-            int measuredWidth = webView.getMeasuredWidth();
-            int measuredHeight = webView.getMeasuredHeight();
 
             //Creates the bitmap and draw WebView's content on in
-            Bitmap bitmap = Bitmap.createBitmap(measuredWidth, measuredHeight, Bitmap.Config.ARGB_8888);
+            Bitmap bitmap = Bitmap.createBitmap(webView.getMeasuredWidth(), webView.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
             canvas.drawBitmap(bitmap, 0, bitmap.getHeight(), new Paint());
 
@@ -310,7 +442,7 @@ public class ShareUtil {
      * Replace (primary) clipboard contents with given {@code text}
      * @param text Text to be set
      */
-    public boolean setClipboard(CharSequence text) {
+    public boolean setClipboard(final CharSequence text) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
             android.text.ClipboardManager cm = ((android.text.ClipboardManager) _context.getSystemService(Context.CLIPBOARD_SERVICE));
             if (cm != null) {
@@ -321,7 +453,10 @@ public class ShareUtil {
             android.content.ClipboardManager cm = ((android.content.ClipboardManager) _context.getSystemService(Context.CLIPBOARD_SERVICE));
             if (cm != null) {
                 ClipData clip = ClipData.newPlainText(_context.getPackageName(), text);
-                cm.setPrimaryClip(clip);
+                try {
+                    cm.setPrimaryClip(clip);
+                } catch (Exception ignored) {
+                }
                 return true;
             }
         }
@@ -363,7 +498,7 @@ public class ShareUtil {
      * @param callback        Callback after paste try
      * @param serverOrNothing Supply one or no hastebin server. If empty, the default gets taken
      */
-    public void pasteOnHastebin(final String text, final Callback.a2<Boolean, String> callback, String... serverOrNothing) {
+    public void pasteOnHastebin(final String text, final Callback.a2<Boolean, String> callback, final String... serverOrNothing) {
         final Handler handler = new Handler();
         final String server = (serverOrNothing != null && serverOrNothing.length > 0 && serverOrNothing[0] != null)
                 ? serverOrNothing[0] : "https://hastebin.com";
@@ -385,7 +520,7 @@ public class ShareUtil {
      * @param body    Body (content) text to be prefilled in the mail
      * @param to      recipients to be prefilled in the mail
      */
-    public void draftEmail(String subject, String body, String... to) {
+    public void draftEmail(final String subject, final String body, final String... to) {
         Intent intent = new Intent(Intent.ACTION_SENDTO);
         intent.setData(Uri.parse("mailto:"));
         if (subject != null) {
@@ -406,7 +541,7 @@ public class ShareUtil {
      * @param receivingIntent The intent from {@link Activity#getIntent()}
      * @return A file or null if extraction did not succeed
      */
-    public File extractFileFromIntent(Intent receivingIntent) {
+    public File extractFileFromIntent(final Intent receivingIntent) {
         String action = receivingIntent.getAction();
         String type = receivingIntent.getType();
         File tmpf;
@@ -441,6 +576,17 @@ public class ShareUtil {
                             fileStr = fileStr.substring(prefix.length());
                         }
                     }
+
+                    // prefix for External storage (/storage/emulated/0  ///  /sdcard/) --> e.g. "content://com.amaze.filemanager/storage_root/file.txt" = "/sdcard/file.txt"
+                    for (String prefix : new String[]{"external/", "media/", "storage_root/"}) {
+                        if (fileStr.startsWith((tmps = prefix))) {
+                            File f = new File(Uri.decode(Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + fileStr.substring(tmps.length())));
+                            if (f.exists()) {
+                                return f;
+                            }
+                        }
+                    }
+
                     // Next/OwnCloud Fileprovider
                     for (String fp : new String[]{"org.nextcloud.files", "org.nextcloud.beta.files", "org.owncloud.files"}) {
                         if (fileProvider.equals(fp) && fileStr.startsWith(tmps = "external_files/")) {
@@ -455,6 +601,17 @@ public class ShareUtil {
                     if (fileProvider.equals("com.mi.android.globalFileexplorer.myprovider") && fileStr.startsWith(tmps = "external_files")) {
                         return new File(Uri.decode(Environment.getExternalStorageDirectory().getAbsolutePath() + fileStr.substring(tmps.length())));
                     }
+
+                    if (fileStr.startsWith(tmps = "external_files/")) {
+                        for (String prefix : new String[]{Environment.getExternalStorageDirectory().getAbsolutePath(), "/storage", ""}) {
+                            File f = new File(Uri.decode(prefix + "/" + fileStr.substring(tmps.length())));
+                            if (f.exists()) {
+                                return f;
+                            }
+                        }
+
+                    }
+
                     // URI Encoded paths with full path after content://package/
                     if (fileStr.startsWith("/") || fileStr.startsWith("%2F")) {
                         tmpf = new File(Uri.decode(fileStr));
@@ -473,4 +630,586 @@ public class ShareUtil {
         }
         return null;
     }
+
+    /**
+     * Request a picture from gallery
+     * Result will be available from {@link Activity#onActivityResult(int, int, Intent)}.
+     * It will return the path to the image if locally stored. If retrieved from e.g. a cloud
+     * service, the image will get copied to app-cache folder and it's path returned.
+     */
+    public void requestGalleryPicture() {
+        if (!(_context instanceof Activity)) {
+            throw new RuntimeException("Error: ShareUtil.requestGalleryPicture needs an Activity Context.");
+        }
+        Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        try {
+            ((Activity) _context).startActivityForResult(intent, REQUEST_PICK_PICTURE);
+        } catch (Exception ex) {
+            Toast.makeText(_context, "No gallery app installed!", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public String extractFileFromIntentStr(final Intent receivingIntent) {
+        File f = extractFileFromIntent(receivingIntent);
+        return f != null ? f.getAbsolutePath() : null;
+    }
+
+    /**
+     * Request a picture from camera-like apps
+     * Result ({@link String}) will be available from {@link Activity#onActivityResult(int, int, Intent)}.
+     * It has set resultCode to {@link Activity#RESULT_OK} with same requestCode, if successfully
+     * The requested image savepath has to be stored at caller side (not contained in intent),
+     * it can be retrieved using {@link #extractResultFromActivityResult(int, int, Intent, Activity...)}
+     * returns null if an error happened.
+     *
+     * @param target Path to file to write to, if folder the filename gets app_name + millis + random filename. If null DCIM folder is used.
+     */
+    @SuppressWarnings("RegExpRedundantEscape")
+    public String requestCameraPicture(final File target) {
+        if (!(_context instanceof Activity)) {
+            throw new RuntimeException("Error: ShareUtil.requestCameraPicture needs an Activity Context.");
+        }
+        String cameraPictureFilepath = null;
+        Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        if (takePictureIntent.resolveActivity(_context.getPackageManager()) != null) {
+            File photoFile;
+            try {
+                // Create an image file name
+                if (target != null && !target.isDirectory()) {
+                    photoFile = target;
+                } else {
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss", Locale.ENGLISH);
+                    File storageDir = target != null ? target : new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM), "Camera");
+                    String imageFileName = ((new ContextUtils(_context).rstr("app_name")).replaceAll("[^a-zA-Z0-9\\.\\-]", "_") + "_").replace("__", "_") + sdf.format(new Date());
+                    photoFile = new File(storageDir, imageFileName + ".jpg");
+                    if (!photoFile.getParentFile().exists() && !photoFile.getParentFile().mkdirs()) {
+                        photoFile = File.createTempFile(imageFileName + "_", ".jpg", storageDir);
+                    }
+                }
+
+                //noinspection StatementWithEmptyBody
+                if (!photoFile.getParentFile().exists() && photoFile.getParentFile().mkdirs()) ;
+
+                // Save a file: path for use with ACTION_VIEW intents
+                cameraPictureFilepath = photoFile.getAbsolutePath();
+            } catch (IOException ex) {
+                return null;
+            }
+
+            // Continue only if the File was successfully created
+            if (photoFile != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    Uri uri = FileProvider.getUriForFile(_context, getFileProviderAuthority(), photoFile);
+                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+                } else {
+                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(photoFile));
+                }
+                ((Activity) _context).startActivityForResult(takePictureIntent, REQUEST_CAMERA_PICTURE);
+            }
+        }
+        _lastCameraPictureFilepath = cameraPictureFilepath;
+        return cameraPictureFilepath;
+    }
+
+    /**
+     * Extract result data from {@link Activity#onActivityResult(int, int, Intent)}.
+     * Forward all arguments from activity. Only requestCodes from {@link ShareUtil} get analyzed.
+     * Also may forward results via local broadcast
+     */
+    @SuppressLint("ApplySharedPref")
+    public Object extractResultFromActivityResult(final int requestCode, final int resultCode, final Intent data, final Activity... activityOrNull) {
+        Activity activity = greedyGetActivity(activityOrNull);
+        switch (requestCode) {
+            case REQUEST_CAMERA_PICTURE: {
+                String picturePath = (resultCode == RESULT_OK) ? _lastCameraPictureFilepath : null;
+                if (picturePath != null) {
+                    sendLocalBroadcastWithStringExtra(REQUEST_CAMERA_PICTURE + "", EXTRA_FILEPATH, picturePath);
+                }
+                return picturePath;
+            }
+            case REQUEST_PICK_PICTURE: {
+                if (resultCode == RESULT_OK && data != null) {
+                    Uri selectedImage = data.getData();
+                    String[] filePathColumn = {MediaStore.Images.Media.DATA};
+                    String picturePath = null;
+
+                    Cursor cursor = _context.getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+                    if (cursor != null && cursor.moveToFirst()) {
+                        for (String column : filePathColumn) {
+                            int curColIndex = cursor.getColumnIndex(column);
+                            if (curColIndex == -1) {
+                                continue;
+                            }
+                            picturePath = cursor.getString(curColIndex);
+                            if (!TextUtils.isEmpty(picturePath)) {
+                                break;
+                            }
+                        }
+                        cursor.close();
+                    }
+
+                    // Try to grab via file extraction method
+                    data.setAction(Intent.ACTION_VIEW);
+                    picturePath = picturePath != null ? picturePath : extractFileFromIntentStr(data);
+
+                    // Retrieve image from file descriptor / Cloud, e.g.: Google Drive, Picasa
+                    if (picturePath == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                        try {
+                            ParcelFileDescriptor parcelFileDescriptor = _context.getContentResolver().openFileDescriptor(selectedImage, "r");
+                            if (parcelFileDescriptor != null) {
+                                FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+                                FileInputStream input = new FileInputStream(fileDescriptor);
+
+                                // Create temporary file in cache directory
+                                picturePath = File.createTempFile("image", "tmp", _context.getCacheDir()).getAbsolutePath();
+                                FileUtils.writeFile(new File(picturePath), FileUtils.readCloseBinaryStream(input));
+                            }
+                        } catch (IOException ignored) {
+                            // nothing we can do here, null value will be handled below
+                        }
+                    }
+
+                    // Return path to picture on success, else null
+                    if (picturePath != null) {
+                        sendLocalBroadcastWithStringExtra(REQUEST_CAMERA_PICTURE + "", EXTRA_FILEPATH, picturePath);
+                    }
+                    return picturePath;
+                }
+                break;
+            }
+
+            case REQUEST_SAF: {
+                if (resultCode == RESULT_OK && data != null && data.getData() != null) {
+                    Uri treeUri = data.getData();
+                    PreferenceManager.getDefaultSharedPreferences(_context).edit().putString(PREF_KEY__SAF_TREE_URI, treeUri.toString()).commit();
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                        activity.getContentResolver().takePersistableUriPermission(treeUri, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                    }
+                    return treeUri;
+                }
+                break;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Send a local broadcast (to receive within app), with given action and string-extra+value.
+     * This is a convenience method for quickly sending just one thing.
+     */
+    public void sendLocalBroadcastWithStringExtra(final String action, final String extra, final CharSequence value) {
+        Intent intent = new Intent(action);
+        intent.putExtra(extra, value);
+        LocalBroadcastManager.getInstance(_context).sendBroadcast(intent);
+    }
+
+    /**
+     * Receive broadcast results via a callback method
+     *
+     * @param callback       Function to call with received {@link Intent}
+     * @param autoUnregister wether or not to automatically unregister receiver after first match
+     * @param filterActions  All {@link IntentFilter} actions to filter for
+     * @return The created instance. Has to be unregistered on {@link Activity} lifecycle events.
+     */
+    public BroadcastReceiver receiveResultFromLocalBroadcast(final Callback.a2<Intent, BroadcastReceiver> callback, final boolean autoUnregister, final String... filterActions) {
+        IntentFilter intentFilter = new IntentFilter();
+        for (String filterAction : filterActions) {
+            intentFilter.addAction(filterAction);
+        }
+        final BroadcastReceiver br = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (intent != null) {
+                    if (autoUnregister) {
+                        LocalBroadcastManager.getInstance(_context).unregisterReceiver(this);
+                    }
+                    try {
+                        callback.callback(intent, this);
+                    } catch (Exception ignored) {
+                    }
+                }
+            }
+        };
+        LocalBroadcastManager.getInstance(_context).registerReceiver(br, intentFilter);
+        return br;
+    }
+
+    /**
+     * Request edit of image (by image editor/viewer - for example to crop image)
+     *
+     * @param file File that should be edited
+     */
+    public void requestPictureEdit(final File file) {
+        Uri uri = getUriByFileProviderAuthority(file);
+        int flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION;
+
+        Intent intent = new Intent(Intent.ACTION_EDIT);
+        intent.setDataAndType(uri, "image/*");
+        intent.addFlags(flags);
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+        intent.putExtra(EXTRA_FILEPATH, file.getAbsolutePath());
+
+        for (ResolveInfo resolveInfo : _context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)) {
+            String packageName = resolveInfo.activityInfo.packageName;
+            _context.grantUriPermission(packageName, uri, flags);
+        }
+        _context.startActivity(Intent.createChooser(intent, null));
+    }
+
+    /**
+     * Get content://media/ Uri for given file, or null if not indexed
+     *
+     * @param file Target file
+     * @param mode 1 for picture, 2 for video, anything else for other
+     * @return Media URI
+     */
+    @SuppressWarnings("TryFinallyCanBeTryWithResources")
+    public Uri getMediaUri(final File file, final int mode) {
+        Uri uri = MediaStore.Files.getContentUri("external");
+        uri = (mode != 0) ? (mode == 1 ? MediaStore.Images.Media.EXTERNAL_CONTENT_URI : MediaStore.Video.Media.EXTERNAL_CONTENT_URI) : uri;
+
+        Cursor cursor = null;
+        try {
+            cursor = _context.getContentResolver().query(uri, new String[]{MediaStore.Images.Media._ID}, MediaStore.Images.Media.DATA + "= ?", new String[]{file.getAbsolutePath()}, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                int mediaid = cursor.getInt(cursor.getColumnIndex(MediaStore.Images.Media._ID));
+                return Uri.withAppendedPath(uri, mediaid + "");
+            }
+        } catch (Exception ignored) {
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * By default Chrome Custom Tabs only uses Chrome Stable to open links
+     * There are also other packages (like Chrome Beta, Chromium, Firefox, ..)
+     * which implement the Chrome Custom Tab interface. This method changes
+     * the customtab intent to use an available compatible browser, if available.
+     */
+    public void enableChromeCustomTabsForOtherBrowsers(final Intent customTabIntent) {
+        String[] checkpkgs = new String[]{
+                "com.android.chrome", "com.chrome.beta", "com.chrome.dev", "com.google.android.apps.chrome", "org.chromium.chrome",
+                "org.mozilla.fennec_fdroid", "org.mozilla.firefox", "org.mozilla.firefox_beta", "org.mozilla.fennec_aurora",
+                "org.mozilla.klar", "org.mozilla.focus",
+        };
+
+        // Get all intent handlers for web links
+        PackageManager pm = _context.getPackageManager();
+        Intent urlIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.example.com"));
+        List<String> browsers = new ArrayList<>();
+        for (ResolveInfo ri : pm.queryIntentActivities(urlIntent, 0)) {
+            Intent i = new Intent("android.support.customtabs.action.CustomTabsService");
+            i.setPackage(ri.activityInfo.packageName);
+            if (pm.resolveService(i, 0) != null) {
+                browsers.add(ri.activityInfo.packageName);
+            }
+        }
+
+        // Check if the user has a "default browser" selected
+        ResolveInfo ri = pm.resolveActivity(urlIntent, 0);
+        String userDefaultBrowser = (ri == null) ? null : ri.activityInfo.packageName;
+
+        // Select which browser to use out of all installed customtab supporting browsers
+        String pkg = null;
+        if (browsers.isEmpty()) {
+            pkg = null;
+        } else if (browsers.size() == 1) {
+            pkg = browsers.get(0);
+        } else if (!TextUtils.isEmpty(userDefaultBrowser) && browsers.contains(userDefaultBrowser)) {
+            pkg = userDefaultBrowser;
+        } else {
+            for (String checkpkg : checkpkgs) {
+                if (browsers.contains(checkpkg)) {
+                    pkg = checkpkg;
+                    break;
+                }
+            }
+            if (pkg == null && !browsers.isEmpty()) {
+                pkg = browsers.get(0);
+            }
+        }
+        if (pkg != null && customTabIntent != null) {
+            customTabIntent.setPackage(pkg);
+        }
+    }
+
+    /***
+     * Request storage access. The user needs to press "Select storage" at the correct storage.
+     * @param activity The activity which will receive the result from startActivityForResult
+     */
+    public void requestStorageAccessFramework(final Activity... activity) {
+        Activity a = greedyGetActivity(activity);
+        if (a != null && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+            Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
+            );
+            a.startActivityForResult(intent, REQUEST_SAF);
+        }
+    }
+
+    /**
+     * Get storage access framework tree uri. The user must have granted access via {@link #requestStorageAccessFramework(Activity...)}
+     *
+     * @return Uri or null if not granted yet
+     */
+    public Uri getStorageAccessFrameworkTreeUri() {
+        String treeStr = PreferenceManager.getDefaultSharedPreferences(_context).getString(PREF_KEY__SAF_TREE_URI, null);
+        if (!TextUtils.isEmpty(treeStr)) {
+            try {
+                return Uri.parse(treeStr);
+            } catch (Exception ignored) {
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get mounted storage folder root (by tree uri). The user must have granted access via {@link #requestStorageAccessFramework(Activity...)}
+     *
+     * @return File or null if SD not mounted
+     */
+    public File getStorageAccessFolder() {
+        Uri safUri = getStorageAccessFrameworkTreeUri();
+        if (safUri != null) {
+            String safUriStr = safUri.toString();
+            ContextUtils cu = new ContextUtils(_context);
+            for (Pair<File, String> storage : cu.getStorages(false, true)) {
+                @SuppressWarnings("ConstantConditions") String storageFolderName = storage.first.getName();
+                if (safUriStr.contains(storageFolderName)) {
+                    return storage.first;
+                }
+            }
+            cu.freeContextRef();
+        }
+        return null;
+    }
+
+    /**
+     * Check whether or not a file is under a storage access folder (external storage / SD)
+     *
+     * @param file The file object (file/folder)
+     * @return Wether or not the file is under storage access folder
+     */
+    public boolean isUnderStorageAccessFolder(final File file) {
+        if (file != null) {
+            // When file writeable as is, it's the fastest way to learn SAF isn't required
+            if (file.canWrite()) {
+                return false;
+            }
+            ContextUtils cu = new ContextUtils(_context);
+            for (Pair<File, String> storage : cu.getStorages(false, true)) {
+                if (file.getAbsolutePath().startsWith(storage.first.getAbsolutePath())) {
+                    cu.freeContextRef();
+                    return true;
+                }
+            }
+            cu.freeContextRef();
+        }
+        return false;
+    }
+
+    /**
+     * Greedy extract Activity from parameter or convert context if it's a activity
+     */
+    private Activity greedyGetActivity(final Activity... activity) {
+        if (activity != null && activity.length != 0 && activity[0] != null) {
+            return activity[0];
+        }
+        if (_context instanceof Activity) {
+            return (Activity) _context;
+        }
+        return null;
+    }
+
+    /**
+     * Check whether or not a file can be written.
+     * Requires storage access framework permission for external storage (SD)
+     *
+     * @param file  The file object (file/folder)
+     * @param isDir Wether or not the given file parameter is a directory
+     * @return Wether or not the file can be written
+     */
+    public boolean canWriteFile(final File file, final boolean isDir) {
+        if (file == null) {
+            return false;
+        } else if (file.getAbsolutePath().startsWith(Environment.getExternalStorageDirectory().getAbsolutePath())
+                || file.getAbsolutePath().startsWith(_context.getFilesDir().getAbsolutePath())) {
+            boolean s1 = isDir && file.getParentFile().canWrite();
+            return !isDir && file.getParentFile() != null ? file.getParentFile().canWrite() : file.canWrite();
+        } else {
+            DocumentFile dof = getDocumentFile(file, isDir);
+            return dof != null && dof.canWrite();
+        }
+    }
+
+    /**
+     * Get a {@link DocumentFile} object out of a normal java {@link File}.
+     * When used on a external storage (SD), use {@link #requestStorageAccessFramework(Activity...)}
+     * first to get access. Otherwise this will fail.
+     *
+     * @param file  The file/folder to convert
+     * @param isDir Wether or not file is a directory. For non-existing (to be created) files this info is not known hence required.
+     * @return A {@link DocumentFile} object or null if file cannot be converted
+     */
+    @SuppressWarnings("RegExpRedundantEscape")
+    public DocumentFile getDocumentFile(final File file, final boolean isDir) {
+        // On older versions use fromFile
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+            return DocumentFile.fromFile(file);
+        }
+
+        // Get ContextUtils to find storageRootFolder
+        ContextUtils cu = new ContextUtils(_context);
+        File baseFolderFile = cu.getStorageRootFolder(file);
+        cu.freeContextRef();
+
+        String baseFolder = baseFolderFile == null ? null : baseFolderFile.getAbsolutePath();
+        boolean originalDirectory = false;
+        if (baseFolder == null) {
+            return null;
+        }
+
+        String relPath = null;
+        try {
+            String fullPath = file.getCanonicalPath();
+            if (!baseFolder.equals(fullPath)) {
+                relPath = fullPath.substring(baseFolder.length() + 1);
+            } else {
+                originalDirectory = true;
+            }
+        } catch (IOException e) {
+            return null;
+        } catch (Exception ignored) {
+            originalDirectory = true;
+        }
+        Uri treeUri;
+        if ((treeUri = getStorageAccessFrameworkTreeUri()) == null) {
+            return null;
+        }
+        DocumentFile dof = DocumentFile.fromTreeUri(_context, treeUri);
+        if (originalDirectory) {
+            return dof;
+        }
+        String[] parts = relPath.split("\\/");
+        for (int i = 0; i < parts.length; i++) {
+            DocumentFile nextDof = dof.findFile(parts[i]);
+            if (nextDof == null) {
+                try {
+                    nextDof = ((i < parts.length - 1) || isDir) ? dof.createDirectory(parts[i]) : dof.createFile("image", parts[i]);
+                } catch (Exception ignored) {
+                    nextDof = null;
+                }
+            }
+            dof = nextDof;
+        }
+        return dof;
+    }
+
+    public void showMountSdDialog(@StringRes final int title, @StringRes final int description, @DrawableRes final int mountDescriptionGraphic, final Activity... activityOrNull) {
+        Activity activity = greedyGetActivity(activityOrNull);
+        if (activity == null) {
+            return;
+        }
+
+        // Image viewer
+        ImageView imv = new ImageView(activity);
+        imv.setImageResource(mountDescriptionGraphic);
+        imv.setAdjustViewBounds(true);
+
+        AlertDialog.Builder dialog = new AlertDialog.Builder(activity);
+        dialog.setView(imv);
+        dialog.setTitle(title);
+        dialog.setMessage(_context.getString(description) + "\n\n");
+        dialog.setNegativeButton(android.R.string.cancel, null);
+        dialog.setPositiveButton(android.R.string.yes, (dialogInterface, i) -> requestStorageAccessFramework(activity));
+        AlertDialog dialogi = dialog.create();
+        dialogi.show();
+    }
+
+    @SuppressWarnings({"ResultOfMethodCallIgnored", "StatementWithEmptyBody"})
+    public void writeFile(final File file, final boolean isDirectory, final Callback.a2<Boolean, FileOutputStream> writeFileCallback) {
+        try {
+            FileOutputStream fileOutputStream = null;
+            ParcelFileDescriptor pfd = null;
+            final boolean existingEmptyFile = file.canWrite() && file.length() < MIN_OVERWRITE_LENGTH;
+            final boolean nonExistingCreatableFile = !file.exists() && file.getParentFile().canWrite();
+            if (existingEmptyFile || nonExistingCreatableFile) {
+                if (isDirectory) {
+                    file.mkdirs();
+                } else {
+                    fileOutputStream = new FileOutputStream(file);
+                }
+            } else {
+                DocumentFile dof = getDocumentFile(file, isDirectory);
+                if (dof != null && dof.getUri() != null && dof.canWrite()) {
+                    if (isDirectory) {
+                        // Nothing to do
+                    } else {
+                        pfd = _context.getContentResolver().openFileDescriptor(dof.getUri(), "rwt");
+                        fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
+                    }
+                }
+            }
+            if (writeFileCallback != null) {
+                writeFileCallback.callback(fileOutputStream != null || (isDirectory && file.exists()), fileOutputStream);
+            }
+            if (fileOutputStream != null) {
+                try {
+                    fileOutputStream.close();
+                } catch (Exception ignored) {
+                }
+            }
+            if (pfd != null) {
+                pfd.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Call telephone number.
+     * Non direct call, opens up the dialer and pre-sets the telephone number. User needs to press manually.
+     * Direct call requires M permission granted, also add permissions to manifest:
+     * <uses-permission android:name="android.permission.CALL_PHONE" />
+     *
+     * @param telNo      The telephone number to call
+     * @param directCall Direct call number if possible
+     */
+    @SuppressWarnings("SimplifiableConditionalExpression")
+    public void callTelephoneNumber(final String telNo, final boolean... directCall) {
+        Activity activity = greedyGetActivity();
+        if (activity == null) {
+            throw new RuntimeException("Error: ShareUtil::callTelephoneNumber needs to be contstructed with activity context");
+        }
+        boolean ldirectCall = (directCall != null && directCall.length > 0) ? directCall[0] : true;
+
+
+        if (android.os.Build.VERSION.SDK_INT >= 23 && ldirectCall && activity != null) {
+            if (ContextCompat.checkSelfPermission(activity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.CALL_PHONE}, 4001);
+                ldirectCall = false;
+            } else {
+                try {
+                    Intent callIntent = new Intent(Intent.ACTION_CALL);
+                    callIntent.setData(Uri.parse("tel:" + telNo));
+                    activity.startActivity(callIntent);
+                } catch (Exception ignored) {
+                    ldirectCall = false;
+                }
+            }
+        }
+        // Show dialer up with telephone number pre-inserted
+        if (!ldirectCall) {
+            Intent intent = new Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", telNo, null));
+            activity.startActivity(intent);
+        }
+    }
 }
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png
index 8e89a6a9..43583ec9 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_launcher.png and b/app/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml b/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml
new file mode 100644
index 00000000..14e620e1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000"
+        android:pathData="M19.0447,29.8394 L32.0088,23.143 19.0447,16.3663ZM24,6.7503c10.0981,0 16.7945,0.4821 16.7945,0.4821 0.9375,0.1071 3,0.1071 4.8214,2.0357 0,0 1.4732,1.4464 1.9018,4.7678 0.5089,3.8839 0.4821,7.7678 0.4821,7.7678v3.6428c0,0 0.0268,3.8839 -0.4821,7.7678 -0.4286,3.2946 -1.9018,4.7678 -1.9018,4.7678 -1.8214,1.9018 -3.8839,1.9018 -4.8214,2.0089C40.7945,39.9911 34.0981,40.5 24,40.5 11.518,40.3929 7.6877,40.0179 7.6877,40.0179 6.6162,39.8304 4.2056,39.8839 2.3841,37.9822c0,0 -1.4732,-1.4732 -1.9018,-4.7678C-0.0265,29.3305 0.0002,25.4466 0.0002,25.4466v-3.6428c0,0 -0.0268,-3.8839 0.4821,-7.7678C0.9109,10.7146 2.3841,9.2682 2.3841,9.2682 4.2056,7.3396 6.268,7.3396 7.2055,7.2325c0,0 6.6964,-0.4821 16.7945,-0.4821z" android:strokeWidth="0.02678544"/>
+</vector>
diff --git a/app/src/main/res/layout/browser__fragment.xml b/app/src/main/res/layout/browser__fragment.xml
index 96daf8b1..9f534a0a 100644
--- a/app/src/main/res/layout/browser__fragment.xml
+++ b/app/src/main/res/layout/browser__fragment.xml
@@ -5,11 +5,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
 
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <com.github.dfa.diaspora_android.web.ContextMenuWebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
+    </android.support.v4.widget.SwipeRefreshLayout>
+    
     <ProgressBar
         android:id="@+id/progressBar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
@@ -18,4 +23,4 @@
         android:indeterminate="false"
         android:progressDrawable="@drawable/progressbar" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/raw/maintainers.md b/app/src/main/res/raw/maintainers.md
index 999f1073..7b1bc7f9 100644
--- a/app/src/main/res/raw/maintainers.md
+++ b/app/src/main/res/raw/maintainers.md
@@ -1,5 +1,5 @@
 * Gregor Santner (gsantner)
-~° http://gsantner.net
+~° https://github.com/gsantner
 
 * Paul Schaub (vanitasvitae)
 ~° https://github.com/vanitasvitae
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
new file mode 100644
index 00000000..4e4a8035
--- /dev/null
+++ b/app/src/main/res/values-af/strings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Maak navigasie balk oop</string>
+    <string name="close_navdrawer">Sluit navigasie balk</string>
+    <string name="reload">Herlaai</string>
+    <string name="close">Sluit</string>
+    <string name="cancel">Kanselleer</string>
+    <!-- Common Words -->
+    <string name="settings">Instellings</string>
+    <string name="notifications">Kennisgewings</string>
+    <string name="conversations">Gesprekke</string>
+    <string name="stream">Stroom</string>
+    <string name="profile">Profiel</string>
+    <string name="aspects">Aspekte</string>
+    <string name="activities">Aktiwiteite</string>
+    <string name="liked">Hou van</string>
+    <string name="commented">Opgemerk</string>
+    <string name="mentions">Aantal keer genoem</string>
+    <string name="public_">Publiek</string>
+    <string name="search">Soek</string>
+    <string name="contacts">Kontakte</string>
+    <string name="changelog">Verandering-log</string>
+    <string name="statistics">Statistiek</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">Alle kennisgewings</string>
+    <string name="also_commented">Ook Opgemerk</string>
+    <string name="comment_on_post">Lewer kommentaar op hierdie plasing</string>
+    <string name="deleteme_____1">Hou van</string>
+    <string name="mentioned">Aantal keer genoem</string>
+    <string name="reshared">Herdeel</string>
+    <string name="started_sharing">Begin deel</string>
+    <!-- Pod Activity -->
+    <string name="could_not_retrieve_list_of_pods__appspecific">Fout: Kon nie lys van pods verkry nie!</string>
+    <string name="confirmation">Bevestiging</string>
+    <string name="do_you_want_to_exit">Wil jy uitgaan?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Meer</string>
+    <string name="help_license">Omtrent | Hulp</string>
+    <string name="followed_tags">Gevolgde merkers</string>
+    <string name="public_activities">Publieke aktiwiteite</string>
+    <string name="reports">Verslae</string>
+    <string name="share_link_as_text">Deel skakel as teks</string>
+    <string name="share_screenshot_of_webpage">Deel vriesbeeld van webbladsy</string>
+    <string name="take_screenshot_of_webpage">Neem vriesbeeld van webbladsy</string>
+    <string name="saving_image_to">Stoor beeld na</string>
+    <string name="saving_screenshot_as">Stoor vriesbeeld as:</string>
+    <string name="link_adress_copied">Skakel adres gekopieer…</string>
+    <string name="new_post">Nuwe Plasing</string>
+    <string name="go_to_top">Gaan tot bo</string>
+    <string name="search_by_tags_or_persons__appspecific">Soek met merkers of persone</string>
+    <string name="exit_app">Verlaat toep</string>
+    <string name="toggle_mobile_desktop_view">Wissel Mobiele/Monitor oogpunt</string>
+    <string name="share_dotdotdot">Deel…</string>
+    <string name="by_tags">met merkers</string>
+    <string name="by_people">met mense</string>
+    <string name="please_add_a_name">Voer asseblief \'n naam in</string>
+    <string name="share_link_address">Deel skakel adres</string>
+    <string name="save_image">Stoor beeld</string>
+    <string name="share_image">Deel beeld</string>
+    <string name="open_in_external_browser">Maak in eksterne webleser oop…</string>
+    <string name="copy_link_adress_to_clipboard">Kopieer skakel adres na knipbord</string>
+    <string name="copy_image_address_to_clipboard">Kopieer beeld adres na knipbord</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">Kon nie beeld laai nie</string>
+    <!-- Permissions -->
+    <string name="permission_denied">Toestemming geweier.</string>
+    <string name="pod_name">Pod naam</string>
+    <string name="protocol">Protokol</string>
+    <string name="pod_address">Pod adres</string>
+    <string name="missing_value">Vermiste waarde</string>
+    <string name="hide_statusbar">Versteek status balk</string>
+    <string name="show_title">Wys titel</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Voorkoms</string>
+    <string name="network">Netwerk</string>
+    <string name="pod_settings__appspecfic">Pod verstellings</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="user">Gebruiker</string>
+    <string name="general">Algemeen</string>
+    <string name="admin">Admin</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">Tema en kleure</string>
+    <string name="primary_colors">Primêre kleur</string>
+    <string name="colors_of_toolbars">Kleur van die nutsbalke</string>
+    <string name="accent_color">Kontras kleur</string>
+    <string name="color_of_progressbar">Kleur van die vorderingsbalk</string>
+    <string name="amoled_mode">AMOLED modus</string>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">Uitgebreide Kennisgewings</string>
+    <string name="language">Taal</string>
+    <!-- Font size -->
+    <string name="font_size">Fontgrootte</string>
+    <string name="normal">Normaal</string>
+    <string name="large">Groot</string>
+    <string name="huge">Masief</string>
+    <!-- Load images -->
+    <string name="load_images">Laai beelde</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">Skerm Rotasie</string>
+    <string name="control_screen_rotation">Beheer outomatiese skermrotasie</string>
+    <string name="default_">Verstek</string>
+    <string name="portrait">Portret</string>
+    <string name="landscape">Landskap</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">Laai Tor voorkeure</string>
+    <string name="proxy">Volmag</string>
+    <string name="host">Gasheer</string>
+    <string name="port">Poort</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Toep moet herlaai om volmag te deaktiveer</string>
+    <string name="orbot_proxy_preset_loaded">Orbot volmag voorkeure gelaai</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">Persoonlike instellings</string>
+    <string name="manage_hashtags">Bestuur Hutsmerke</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Onvolg Hutsmerke</string>
+    <string name="change_account">Verander rekening</string>
+    <string name="clear_cache">Vee Buffer</string>
+    <string name="clear_webview_cache">Vee WebBuffer skoon</string>
+    <!-- More -->
+    <string name="miscellaneous">Diverse</string>
+    <string name="full_reset">Volle herstel</string>
+    <string name="block_advertisments">Blok advertensies</string>
+    <string name="about">Omtrent</string>
+    <string name="license">Lisensie</string>
+    <string name="debugging">Ontfouting</string>
+    <string name="application">Toepassing</string>
+    <string name="device">Toestel</string>
+    <string name="diaspora_pod__appspecific">diaspora * Pod</string>
+    <string name="app_version_with_arg">Tope weergawe: %1$s</string>
+    <string name="android_version_witharg">Android Weergawe%1$s</string>
+    <string name="device_name_witharg">Toestel naam%1$s</string>
+    <string name="code_name_witharg">Kodenaam: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod profiel naam: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod domein: %1$s</string>
+    <string name="get_the_source">Verkry die bron</string>
+    <string name="translate_the_app">Vertaal hierdie Toep!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Die toepassing is nie in jou taal beskikbaar? Jy kan dit verander! Hoekom help jy ons nie met die vertaling nie? Ons gebruik Stringlate om enigiemand te help om toepassing te vertaal.</string>
+    <string name="let_me_translate">Laat ek vertaal</string>
+    <string name="give_feedback">Gee terugvoer!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion * is nog in ontwikkeling, so as jy voorstelle of enige soort terugvoer het, gebruik asseblief ons probleem volger laat ons weet!</string>
+    <string name="report_bugs">Raporteer foute</string>
+    <string name="share_the_app">Deel die toep</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Haai! Loer na #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Handhawers</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;baie dankie!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Lisensie</string>
+    <string name="show_third_party_licenses">Derdeparty biblioteke</string>
+    <string name="tell_me_more">Vertel my meer</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Bemagtig om Youtube links oop te maak in eksterne Toeps</string>
+    <string name="youtube_links">Youtube links</string>
+    <string name="change_the_theme_of_your_account">Verander die tema van jou rekening</string>
+    <string name="pull_to_refresh">Trek om te verfris</string>
+</resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..d09bf9c8
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">إعدادات</string>
+    <string name="search">بحث</string>
+    <string name="changelog">سِجل التغييرات</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">المزيد</string>
+    <string name="share_dotdotdot">مشاركة</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">اخفاء شريط الاشعارات</string>
+    <string name="show_title">إظهار العنوان</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">المظهر</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">عام</string>
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">تغيير لغة التطبيق. اعد فتح التطبيق لتفعيل التغيير</string>
+    <string name="language">اللّغة</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">افتراضي</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="clear_cache">مسح ذاكرة التخزين المؤقت</string>
+    <!-- More -->
+    <string name="miscellaneous">أخرى</string>
+    <string name="about">عن التطبيق</string>
+    <string name="license">ترخيص</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">المساهمون</string>
+</resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-az/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
new file mode 100644
index 00000000..51109f4f
--- /dev/null
+++ b/app/src/main/res/values-bs/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Otvori navigacijsku ladicu</string>
+    <string name="close_navdrawer">Zatvorite navigacijsku ladicu</string>
+    <string name="close">Zatvori</string>
+    <string name="cancel">Otkaži</string>
+    <!-- Common Words -->
+    <string name="settings">Podešavanja</string>
+    <string name="search">Traži</string>
+    <string name="changelog">Popis izmjena</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Više</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">Sakrij statusnu traku</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Izgled</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">Opće</string>
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Promijeni jezik programa. Iznova pokrenite program da aktivirate promjenu</string>
+    <string name="language">Jezik</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">Osnovni</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="miscellaneous">Razno</string>
+    <string name="about">O programu</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Saradnici</string>
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000..3ad40c44
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Obre el calaix de navegació</string>
+    <string name="close_navdrawer">Tanca el calaix de navegació</string>
+    <string name="reload">Recarrega</string>
+    <string name="close">Tanca</string>
+    <string name="cancel">Cancel·la</string>
+    <!-- Common Words -->
+    <string name="settings">Configuració</string>
+    <string name="notifications">Notificacions</string>
+    <string name="conversations">Conversacions</string>
+    <string name="stream">Transmissió</string>
+    <string name="profile">Perfil</string>
+    <string name="aspects">Aspectes</string>
+    <string name="activities">Activitats</string>
+    <string name="liked">M\'ha agradat</string>
+    <string name="commented">Comentat</string>
+    <string name="mentions">Mencions</string>
+    <string name="public_">Públic</string>
+    <string name="search">Cerca</string>
+    <string name="contacts">Contactes</string>
+    <string name="changelog">Novetats</string>
+    <string name="statistics">Estadí­stiques</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">Totes les notificacions</string>
+    <string name="also_commented">També s\'ha comentat</string>
+    <string name="comment_on_post">Comenta sobre la publicació</string>
+    <string name="deleteme_____1">M\'ha agradat</string>
+    <string name="mentioned">Mencionat</string>
+    <string name="reshared">Recompartit</string>
+    <string name="started_sharing">S\'ha iniciat la compartició</string>
+    <!-- Pod Activity -->
+    <string name="could_not_retrieve_list_of_pods__appspecific">Error: No s\'ha pogut recuperar la llista de pods!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Cal que us connecteu a Internet per continuar</string>
+    <string name="confirmation">Confirmació</string>
+    <string name="do_you_want_to_exit">Voleu sortir?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Més</string>
+    <string name="help_license">Quant a | Ajuda</string>
+    <string name="followed_tags">Etiquetes seguides</string>
+    <string name="public_activities">Activitats públiques</string>
+    <string name="reports">Informes</string>
+    <string name="share_link_as_text">Comparteix l\'enllaç com a text</string>
+    <string name="share_screenshot_of_webpage">Comparteix la captura de pantalla de la pàgina web</string>
+    <string name="take_screenshot_of_webpage">Feu una captura de pantalla de la pàgina web</string>
+    <string name="saving_image_to">S\'està desant la imatge per a</string>
+    <string name="saving_screenshot_as">S\'està desant la captura de pantalla com:</string>
+    <string name="link_adress_copied">S\'ha copiat l\'adreça de l\'enllaç…</string>
+    <string name="new_post">Nova publicació</string>
+    <string name="go_to_top">Vés a l\'inici</string>
+    <string name="search_by_tags_or_persons__appspecific">Cerca per etiquetes o persones</string>
+    <string name="exit_app">Surt de l\'aplicació</string>
+    <string name="toggle_mobile_desktop_view">Commuta la vista de mòbils/escriptori</string>
+    <string name="share_dotdotdot">Comparteix…</string>
+    <string name="by_tags">per etiquetes</string>
+    <string name="by_people">per persones</string>
+    <string name="please_add_a_name">Afegiu un nom</string>
+    <string name="share_link_address">Comparteix l\'adreça de l\'enllaç</string>
+    <string name="save_image">Desa la imatge</string>
+    <string name="share_image">Comparteix la imatge</string>
+    <string name="open_in_external_browser">Obre en un navegador extern…</string>
+    <string name="copy_link_adress_to_clipboard">Copia l\'adreça de l\'enllaç al porta-retalls</string>
+    <string name="copy_image_address_to_clipboard">Copia l\'adreça de la imatge al porta-retalls</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">No s\'ha pogut carregar la imatge</string>
+    <!-- Permissions -->
+    <string name="screenshot_permission__appspecific">Cal que concediu «Accés al permís d\'emmagatzematge» per desar captures de pantalla. Després, hauríeu de tancar l\'aplicació completament o reiniciar el dispositiu. Si no concediu l\'accés a l\'emmagatzematge, però voleu utilitzar la funció de captura de pantalla més endavant, podeu concedir el permís més endavant.
+Aneu a: Configuració del sistema - Aplicacions - dandelion*. A la secció de permisos podeu concedir el «permís d\'emmagatzematge d\'escriptura».</string>
+    <string name="image_permission_description__appspecific">Cal que concediu «Accés al permís d\'emmagatzematge» per desar/penjar imatges. Després, hauríeu de tancar l\'aplicació completament o reiniciar el dispositiu. Si no concediu l\'accés a l\'emmagatzematge, però voleu desar imatges més endavant, podeu concedir el permís més endavant. Aneu a: Configuració del sistema - Aplicacions - dandelion*. A la secció de permisos podeu concedir el «permís d\'emmagatzematge d\'escriptura».</string>
+    <string name="permission_denied">Permís denegat.</string>
+    <string name="permission_granted_try_again">Permís concedit. Torneu-ho a provar.</string>
+    <string name="custom_pod">Pod personalitzat</string>
+    <string name="pod_name">Nom del pod</string>
+    <string name="protocol">Protocol</string>
+    <string name="pod_address">Adreça del pod</string>
+    <string name="missing_value">Falta el valor</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Voleu saltar a la última pàgina visitada?</string>
+    <string name="hide_statusbar_in_mainview">Amaga la barra d\'estat a la vista principal</string>
+    <string name="hide_statusbar">Amaga la barra d\'estat</string>
+    <string name="show_title_in_main_view">Mostra el títol a la vista principal</string>
+    <string name="show_title">Mostra el títol</string>
+    <string name="launcher_shortcut">Drecera del llançador</string>
+    <!-- Operability -->
+    <string name="top_toolbar_loads_stream__appsp">La barra d\'eines superior carrega la transmissió</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Feu clic a un espai buit a la barra d\'eines superior per obrir la transmissió</string>
+    <!-- Category Titles -->
+    <string name="appearance">Aparença</string>
+    <string name="network">Xarxa</string>
+    <string name="pod_settings__appspecfic">Configuració del pod</string>
+    <string name="operability">Operabilitat</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="navigation_drawer">Control lliscant de navegació</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controleu la visibilitat de les entrades al calaix de navegació</string>
+    <string name="user">Usuari</string>
+    <string name="general">General</string>
+    <string name="admin">Administrador/a</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">Tema i colors</string>
+    <string name="control_which_colors_are_used_in_app">Controleu quins colors s\'utilitzen a tota l\'aplicació</string>
+    <string name="primary_colors">Color primari</string>
+    <string name="colors_of_toolbars">Color de les barres d\'eines</string>
+    <string name="accent_color">Color d\'èmfasi</string>
+    <string name="color_of_progressbar">Color de la barra de progrés</string>
+    <string name="amoled_mode">Mode AMOLED</string>
+    <string name="amoled_mode_description__app_specific">Substitueix el color amb la pantalla AMOLED compatible amb el negre en moltes parts de l\'aplicació. Cal reiniciar per canviar aquesta configuració. Per explorar diaspora* en la foscor, també heu d\'activar el tema fosc, que es pot trobar en la configuració del compte personal de diaspora*.</string>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">Notificacions ampliades</string>
+    <string name="extendend_notifications_bell_description__appspecific">Amplieu la campana de notificacions amb un menú desplegable que mostra les categories de notificacions</string>
+    <string name="language_change_restart_description">Canvieu l\'idioma d\'aquesta aplicació. Reinicieu l\'aplicació perquè els canvis tinguin efecte</string>
+    <string name="language">Idioma</string>
+    <string name="system_language">Idioma del sistema</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">Controla la mida del text de WebView</string>
+    <string name="font_size">Mida de la lletra</string>
+    <string name="normal">Normal</string>
+    <string name="large">Gran</string>
+    <string name="huge">Enorme</string>
+    <!-- Load images -->
+    <string name="load_images">Carrega imatges</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Commuta la càrrega d\'imatges a p. ex. estalvia dades mòbils</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">Rotació de pantalla</string>
+    <string name="control_screen_rotation">Control automàtic de la rotació de la pantalla</string>
+    <string name="default_">Per defecte</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignora la configuració del sistema)</string>
+    <string name="portrait">Vertical</string>
+    <string name="landscape">Horitzontal</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">Carrega Tor per defecte</string>
+    <string name="load_proxy_settins_for_tor">Carrega la configuració del servidor intermediari per a Proxy HTTP (Orbot)</string>
+    <string name="proxy">Servidor intermediari</string>
+    <string name="enable_proxy">Activa el servidor intermediari</string>
+    <string name="proxy_dandelion_traffic__appspecific">Trànsit del servidor intermediari de dandelion* evadint el tallafocs.\nPot requerir reinici. Això podria no funcionar en alguns telèfons.</string>
+    <string name="host">Amfitrió</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">L\'aplicació necessita reiniciar-se per desactivar l\'ús del servidor intermediari</string>
+    <string name="orbot_proxy_preset_loaded">S\'ha carregat la configuració per defecte de l\'Orbot</string>
+    <!-- Chrome custom tabs -->
+    <string name="open_external_links_with_chrome_custom_tabs_description">Obre els enllaços externs amb les pestanyes personalitzades de Chrome. S\'ha d\'instal·lar Chromium, Firefox o Google Chrome per poder utilitzar aquesta funció. \nNOTA IMPORTANT: Les pestanyes personalitzades de Chrome no utilitzen servidors intermediaris configurats!</string>
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">Configuració personal</string>
+    <string name="open_diaspora_account_settings__appspecific">Obre la configuració del compte diaspora*</string>
+    <string name="manage_your_contact_list">Gestioneu la vostra llista de contactes</string>
+    <string name="manage_hashtags">Gestioneu les etiquetes</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Deixa de seguir les etiquetes seguides</string>
+    <string name="change_account">Canvia de compte</string>
+    <string name="loug_warning_description__appspecific">Esborra les dades locals de la sessió i canvia a un altre pod /compte diaspora*</string>
+    <string name="logout_warning_description">Això esborrarà totes les galetes i les dades de sessió. Esteu segur que voleu canviar el vostre compte?</string>
+    <string name="clear_cache">Esborra la memòria cau</string>
+    <string name="clear_webview_cache">Esborra la memòria cau de WebView</string>
+    <string name="intellihide_toolbars__appspecific">Amaga automàticament les barres d\'eines superior i inferior mentre es desplaça</string>
+    <string name="intellihide_toolbars">Barra d\'eines «Intellihide»</string>
+    <string name="append_shared_by_notice">Afegeix compartit per avís</string>
+    <string name="append_shared_by_notice__appspecific">Afegiu una referència a aquesta aplicació als textos compartits: [via #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">Divers</string>
+    <string name="full_reset">Reinici complet</string>
+    <string name="wipe_settings_and_logout">Esborra localment totes les configuracions relacionades amb l\'aplicació i tanca les sessions de tots els comptes</string>
+    <string name="wipe_settings_warning__appspecific">Això restablirà tots els paràmetres modificats de l\'aplicació als valors per defecte i es desconnectarà de tots els pods. Les vostres imatges baixades romandran intactes. Esteu segur que voleu continuar?</string>
+    <string name="enable_basic_adblocker_description">Activa el bloqueig d\'anuncis bàsic. Anuncis que es poden incloure p. ex. en vistes integrades</string>
+    <string name="block_advertisments">Bloqueja anuncis</string>
+    <string name="about">Quant a</string>
+    <string name="license">Llicècia</string>
+    <string name="debugging">Depuració</string>
+    <string name="application">Aplicació</string>
+    <string name="device">Dispositiu</string>
+    <string name="diaspora_pod__appspecific">Pod de diaspora*</string>
+    <string name="debug_log">Registre de depuració</string>
+    <string name="debug_log_verbose">Registre de depuració (detallat)</string>
+    <string name="app_version_with_arg">Versió de l\'aplicació: %1$s</string>
+    <string name="android_version_witharg">Versió d\'Android: %1$s</string>
+    <string name="device_name_witharg">Nom del dispositiu: %1$s</string>
+    <string name="code_name_witharg">Nom en clau: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nom de perfil del pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domini del pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">S\'ha copiat el registre de depuració al porta-retalls</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* és el seu complement per a navegar per la xarxa social diapora*. Afegeix característiques com útils barres d\'eines i suport per a servidors intermediaris com la xarxa Tor a la seva experiència social.</string>
+    <string name="contribute_code">Contribuïu amb codi!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* es desenvolupa lliurement, en el sentit de llibertat, i segueix les idees del projecte
+diaspora*. Si voleu contribuir, endavant! Actualment som un equip molt petit, de manera que us agrairíem molt qualsevol tipus d\'ajuda!</string>
+    <string name="get_the_source">Obtén el codi font</string>
+    <string name="translate_the_app">Traduïu l\'aplicació!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">L\'aplicació no està disponible en el vostre idioma? Podeu canviar això! Per què no ens ajudeu a traduir-la? Utilitzem Stringlate perquè qualsevol persona pugui traduir l\'aplicació.</string>
+    <string name="let_me_translate">Permeteu-me traduir</string>
+    <string name="give_feedback">Valoreu-nos!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* encara està en desenvolupament, així que si teniu suggeriments o qualsevol tipus de comentari, feu servir el nostre gestor d\'errors per informar-nos-en!</string>
+    <string name="report_bugs">Informe d\'errors</string>
+    <string name="spread_the_word">Difoneu aquest projecte</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Parleu als vostres amics i familiars sobre diaspora* i #dandelion! Per què no difoneu les vostres experiències? Ens encantaria escoltar-les!</string>
+    <string name="share_the_app">Comparteix l\'aplicació</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ep! Doneu un cop d\'ull a #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Mantenidors</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Aquesta aplicació està sent desenvolupada i mantinguda per &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Col·laboradors</string>
+    <string name="thank_you_witharg">¡%1$s &lt; br &gt;&lt; br &gt; Gràcies!</string>
+    <string name="gnu_gplv3_license">Llicència GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Biblioteques de tercers</string>
+    <string name="the_following_libraries_are_used">S\'utilitzen les següents biblioteques:</string>
+    <string name="inspiration_from_leafpic__appspecific">Prenem alguna inspiració i codi de LeafPic. Aneu a comprovar-ho, també és programari gratuït!</string>
+    <string name="tell_me_more">Expliqueu-me més</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Activeu-ho per obrir enllaços de Youtube en aplicacions externes</string>
+    <string name="youtube_links">Enllaços de YouTube</string>
+    <string name="change_the_theme_of_your_account">Canvia el tema del vostre compte</string>
+    <string name="pull_to_refresh">Feu lliscar per actualitzar</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">S\'està lliscant cap avall a la part superior de la pàgina per actualitzar.\nCal que reinicieu l\'aplicació perquè els canvis tinguin efecte.</string>
+</resources>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000..63534efb
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Otevøít navigaèní panel</string>
+    <string name="close_navdrawer">Zavøít navigaèní panel</string>
+    <string name="reload">Aktualizovat</string>
+    <string name="close">Konec</string>
+    <string name="cancel">Rakovina</string>
+    <!-- Common Words -->
+    <string name="settings">Nastavení</string>
+    <string name="notifications">Oznámení</string>
+    <string name="conversations">Konverzace</string>
+    <string name="stream">Stream</string>
+    <string name="profile">Profil</string>
+    <string name="aspects">Aspekty</string>
+    <string name="activities">Aktivity</string>
+    <string name="liked">Líbilo se</string>
+    <string name="commented">Okomentované příspěvky</string>
+    <string name="mentions">Zmínky</string>
+    <string name="public_">Veřejné</string>
+    <string name="search">Hledat</string>
+    <string name="contacts">Kontakty</string>
+    <string name="changelog">Seznam změn</string>
+    <string name="statistics">Statistika</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">Všechna oznámení</string>
+    <string name="also_commented">Také komentováno</string>
+    <string name="comment_on_post">Okomentoval/a Tvůj příspěvek</string>
+    <string name="deleteme_____1">Líbilo se</string>
+    <string name="mentioned">Zmíněn</string>
+    <string name="reshared">Sdílen</string>
+    <string name="started_sharing">Začalo sdílení</string>
+    <!-- Pod Activity -->
+    <string name="could_not_retrieve_list_of_pods__appspecific">Error: Nemohl získat seznam podů!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Omlouvám se, musíte být připojeni k internetu, abyste mohli pokračovat dál</string>
+    <string name="confirmation">Potvrzení</string>
+    <string name="do_you_want_to_exit">Chceš opustit aplikaci?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Více</string>
+    <string name="help_license">O aplikaci | Pomoc</string>
+    <string name="followed_tags">Zlaté rány</string>
+    <string name="public_activities">Veřejné aktivity</string>
+    <string name="reports">Nahlášení</string>
+    <string name="share_link_as_text">Sdílejte odkaz jako text</string>
+    <string name="share_screenshot_of_webpage">Šablony obrázku webových stránek</string>
+    <string name="take_screenshot_of_webpage">Podívejte se na snímek webové stránky</string>
+    <string name="saving_image_to">Uložit obrázek</string>
+    <string name="saving_screenshot_as">Uložit snímky jako:</string>
+    <string name="link_adress_copied">Zapnutá adresa …</string>
+    <string name="new_post">Nový příspěvek</string>
+    <string name="go_to_top">Jít nahoru</string>
+    <string name="search_by_tags_or_persons__appspecific">Hledat štítky nebo osoby</string>
+    <string name="exit_app">Ukončit aplikaci</string>
+    <string name="toggle_mobile_desktop_view">Pohled na pracovní plochu</string>
+    <string name="share_dotdotdot">Sdílet…</string>
+    <string name="by_tags">tagy</string>
+    <string name="by_people">lidmi</string>
+    <string name="please_add_a_name">Prosím přidejte jméno</string>
+    <string name="share_link_address">Sdílejte adresu odkazu</string>
+    <string name="save_image">Uložit obrázek</string>
+    <string name="share_image">Sdílet obrázek</string>
+    <string name="open_in_external_browser">Otevřít v externím prohlížeči…</string>
+    <string name="copy_link_adress_to_clipboard">Zkopírovat link do schránky</string>
+    <string name="copy_image_address_to_clipboard">Kopírovat adresu obrázku do schránky</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">Nemohl být načten obrázek</string>
+    <!-- Permissions -->
+    <string name="image_permission_description__appspecific">Abys mohl ukládat/nahrávat obrázky, musíš nejprve aplikaci povolit přístup k datovému úložišti. Poté by měla být aplikace uzavřena, případně restartován celý přístroj. Pokud přístupu zabráníš, ale časem se rozhodneš obrázky ukládat, můžeš toto oprávnění povolit později. Otevři: Systémové nastavení - Aplikace - dandelion*. V oblasti oprávnění  poté můžeš změnit vybraná nastavení.</string>
+    <string name="permission_denied">Oprávnění odepřeno.</string>
+    <string name="permission_granted_try_again">Oprávnění povoleno. Prosím, zkus to znovu.</string>
+    <string name="custom_pod">Použij definovaný Pod</string>
+    <string name="pod_name">Název Podu</string>
+    <string name="protocol">Protokol</string>
+    <string name="pod_address">Adresa Podu</string>
+    <string name="missing_value">Chybějící hodnota</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Zavolat poslední navštívenou stránku ve streamu?</string>
+    <string name="hide_statusbar_in_mainview">Hide bar at the main view at the view.</string>
+    <string name="hide_statusbar">Schovat statusbar</string>
+    <string name="show_title_in_main_view">Zobrazit titul v hlavním pohledu</string>
+    <string name="show_title">Zobrazit titul</string>
+    <string name="launcher_shortcut">Launcher shortcut</string>
+    <!-- Operability -->
+    <string name="top_toolbar_loads_stream__appsp">Horní nástrojová lišta načítá stream</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Pro otevření streamu klikni na práznou plochu v horní nástrojové liště</string>
+    <!-- Category Titles -->
+    <string name="appearance">Vzhled</string>
+    <string name="network">Síť</string>
+    <string name="pod_settings__appspecfic">Nastavení Podu</string>
+    <string name="operability">Obsluha</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="navigation_drawer">Navigační šprýmař</string>
+    <string name="control_visibility_of_entries_nav_drawer">Ovládejte viditelnost položek v navigačním šuplíku</string>
+    <string name="user">Uživatel</string>
+    <string name="general">Obecné</string>
+    <string name="admin">Administrátor</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">Téma a zmatek</string>
+    <string name="control_which_colors_are_used_in_app">Ovládání, které barvy jsou používány v průběhu aplikace</string>
+    <string name="primary_colors">Primární barva</string>
+    <string name="colors_of_toolbars">Barva nástrojové lišty</string>
+    <string name="accent_color">Akcentová barva</string>
+    <string name="color_of_progressbar">Barva detailů</string>
+    <string name="amoled_mode">AMOLED model</string>
+    <string name="amoled_mode_description__app_specific">Pro procházení barvy s AMOLED zobrazujeme příjemnou černou barvu v mnoha částech aplikace.</string>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">Rozšířené oznámení</string>
+    <string name="extendend_notifications_bell_description__appspecific">Rozšiř oznámení zvonku pomocí výběrového menu, které zobrazuje kategorie oznámení</string>
+    <string name="language_change_restart_description">Pokud chcete zmìnit jazyk této aplikace, bude vyžadován její restart.</string>
+    <string name="language">Jazyk</string>
+    <string name="system_language">Jazyk systému</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">Konfigurovat velikost textu WebViewu</string>
+    <string name="font_size">Velikost písma</string>
+    <string name="normal">Normální</string>
+    <string name="large">Velké</string>
+    <string name="huge">Obrovské</string>
+    <!-- Load images -->
+    <string name="load_images">Načítej obrázky</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Útok obrázku na např. uložte mobilní data</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">Rotace obrazovky</string>
+    <string name="control_screen_rotation">Kontroluj automatickou rotaci</string>
+    <string name="default_">Standardní</string>
+    <string name="sensor_ignore_system_settings">Senzor\n(ignorovat systémové nastavení)</string>
+    <string name="portrait">Na výšku</string>
+    <string name="landscape">Na šířku</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">Načti přednastavení Toru</string>
+    <string name="load_proxy_settins_for_tor">Načti proxy nastavení pro Tor (Orbot) HTTP Proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Aktivovat proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Veď datovou cestu dandelion*, aby se obešla brána Firewall.\nMůže být vyžadován restart. Toto nemusí fungovat na všech přístrojích.</string>
+    <string name="host">Host</string>
+    <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Při restartu musíte zakázat používání proxy serveru</string>
+    <string name="orbot_proxy_preset_loaded">načtený panel proxy</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">Osobní nastavení</string>
+    <string name="open_diaspora_account_settings__appspecific">Otevřte nastavení účtu diaspory</string>
+    <string name="manage_your_contact_list">Spravte Váš seznam kontaktů</string>
+    <string name="manage_hashtags">Řídit Hashtagy</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Unfollow již následoval hashts</string>
+    <string name="change_account">Změna konta</string>
+    <string name="loug_warning_description__appspecific">Erase local session data and switch to another diaspora* pod/účet</string>
+    <string name="logout_warning_description">Chcete změnit svůj účet?</string>
+    <string name="clear_cache">Vyprázdnit cache</string>
+    <string name="clear_webview_cache">Smazat cache WebView</string>
+    <string name="intellihide_toolbars__appspecific">Automaticky skryjí horní a dolní lišty při každém hodnocení.</string>
+    <string name="intellihide_toolbars">Lity rozumových nástrojů</string>
+    <string name="append_shared_by_notice">Konečný společný přístup</string>
+    <string name="append_shared_by_notice__appspecific">Přidat referenci této aplikace ke sdílenému textu: [via #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">Různé</string>
+    <string name="full_reset">Celkový reset</string>
+    <string name="wipe_settings_and_logout">Podařilo se vám smazat všechna nastavení související s aplikací a přihlásit se ze všech účtů.</string>
+    <string name="wipe_settings_warning__appspecific">Toto přepíše všechna změněná nastavení aplikace do výchozích hodnot a vymaže vás ze všech podů.</string>
+    <string name="enable_basic_adblocker_description">Uživatelné základní Adcker může být součástí např. v embedded views.</string>
+    <string name="block_advertisments">Blokové reklamy</string>
+    <string name="about">Informace</string>
+    <string name="license">Licence</string>
+    <string name="debugging">Debugging</string>
+    <string name="application">Aplikace</string>
+    <string name="device">Přístroj</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Protokol odstraňování chyb</string>
+    <string name="debug_log_verbose">Protokol odstraňování chyb (detailně)</string>
+    <string name="app_version_with_arg">Verze aplikace: %1$s</string>
+    <string name="android_version_witharg">Android verze: %1$s</string>
+    <string name="device_name_witharg">Název přístroje: %1$s</string>
+    <string name="code_name_witharg">Kódový název: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Profilový název Podu: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Doména Podu: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Protokol odstraňování chyb byl zkopírován do schránky</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* je Tvoje doprovodná aplikace pro procházení sociální sítí diaspora*. Nabízí features jako užitečné nástrojové lišty nebo podporu pro proxy servery (např. Tor Network).</string>
+    <string name="contribute_code">Spolupracuj!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* je svobodný software (free as in Freedom) a řídí se myšlenkami projektu diaspora*. Pokud chceš přispívat, jen do toho! Momentálně jsme velmi malý tým, takže jsme velmi vděční za jakýkoli druh pomoci!</string>
+    <string name="get_the_source">Ke zdrojovému kódu</string>
+    <string name="translate_the_app">Přelož aplikaci!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Pokud si nejste jistí, že jste se rozhodli pro něco, co potřebujete?</string>
+    <string name="let_me_translate">Chci překládat</string>
+    <string name="give_feedback">Dej zpětnou vazbu!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* je stále ve vývoji, takže pokud máš jakékoli návrhy, neváhej nám zanechat zpětnou vazbu pomocí užití našeho bug trackeru!</string>
+    <string name="report_bugs">Nahlásit chybu</string>
+    <string name="spread_the_word">Řekni o aplikaci ostatním!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Řekni svým přátelům a rodině o diaspora* a #dadelion! Proč nezačít blogovat o Tvých zkušenostech? Rádi o Tobě uslyšíme!</string>
+    <string name="share_the_app">Sdílejte chuť</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Podívejte se na #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Vývojáři</string>
+    <string name="contributors">Spolupracovníci</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Děkujeme!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Licence</string>
+    <string name="show_third_party_licenses">Knihovny třetí strany</string>
+    <string name="the_following_libraries_are_used">Následující knihovny jsou využívány:</string>
+    <string name="inspiration_from_leafpic__appspecific">We took some inspiration and code from LeafPic.</string>
+    <string name="tell_me_more">Řekni mi více</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Umožnit otevřít Youtube odkazy na externí aplikace</string>
+    <string name="youtube_links">Youtube odkazy</string>
+    <string name="change_the_theme_of_your_account">Změňte téma vašeho účtu</string>
+    <string name="pull_to_refresh">Pull osvěžit</string>
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ead188d6..6d783039 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -27,12 +27,40 @@
     <string name="reshared">Gendelte</string>
     <!-- Pod Activity -->
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Mere</string>
+    <string name="share_dotdotdot">Del…</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 -->
-
+    <string name="hide_statusbar">Gem statusbar</string>
+    <!-- Operability -->
+    <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 -->
+    <string name="appearance">Udseende</string>
+    <string name="network">Netværk</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">Generelt</string>
+    <!-- Themes -->
+    <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 -->
+    <string name="language_change_restart_description">Ændre applikationens sprog. Genstart for at ændringen træder i kraft</string>
+    <string name="language">Sprog</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">Standard</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="clear_cache">Ryd cache</string>
+    <!-- More -->
+    <string name="miscellaneous">Diverse</string>
     <string name="about">Om</string>
     <string name="license">Licens</string>
     <string name="debugging">Fejlsøgning</string>
@@ -60,24 +88,6 @@
     <string name="report_bugs">Rapporter fejl</string>
     <string name="spread_the_word">Spred ordet!</string>
     <!-- License & help (large amount of text) -->
-
-    <!-- Key Names (Untranslatable) -->
-    <!-- Operability -->
-    <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="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 -->
-    <!-- Screen rotation -->
-    <!-- Proxy -->
-    <!-- Chrome custom tabs -->
-    <!-- Diaspora Settings -->
-    <!-- More -->
+    <string name="maintainers">Udviklere</string>
+    <string name="contributors">Bidragsydere</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a59044d1..54bc3bbe 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">NavDrawer öffnen</string>
+    <string name="close_navdrawer">NavDrawer schließen</string>
     <string name="reload">Aktualisieren</string>
+    <string name="close">Schließen</string>
+    <string name="cancel">Abbrechen</string>
     <!-- Common Words -->
     <string name="settings">Einstellungen</string>
     <string name="notifications">Benachrichtigungen</string>
@@ -49,7 +52,7 @@
     <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="share_dotdotdot">Teilen…</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>
@@ -79,48 +82,9 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
     <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>
-    <string name="debugging">Debugging</string>
-    <string name="application">Anwendung</string>
-    <string name="device">Gerät</string>
-    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
-    <string name="debug_log">Debug-Protokoll</string>
-    <string name="debug_log_verbose">Debug-Protokoll (Verbose)</string>
-    <string name="app_version_with_arg">App Version: %1$s</string>
-    <string name="android_version_witharg">Android Version: %1$s</string>
-    <string name="device_name_witharg">Gerätename: %1$s</string>
-    <string name="code_name_witharg">Codename: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Pod Profil Name: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Pod Domain: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Debug-Protokoll in Zwischenablage kopiert</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk diaspora*. Es bietet dir zusätzliche Funktionen wie nützliche Werkzeugleisten und Unterstützung für Proxyserver wie das Tor-Netzwerk.</string>
-    <string name="contribute_code">Mach mit!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* wird frei wie in Freiheit entwickelt und folgt den Ideen des diaspora* Projektes. Wenn du mithelfen willst, nur zu! Wir sind momentan nur ein sehr kleines Team und sind froh über jede Unterstützung!</string>
-    <string name="get_the_source">Zum Quellcode</string>
-    <string name="translate_the_app">Übersetze die App!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Die Anwendung ist nicht in deiner Sprache verfügbar? Das kannst du ändern! Warum hilfst du uns nicht, indem du übersetzt? Wir benutzen die Plattform crowdin, um es jedem zu ermöglichen, die App zu übersetzen.</string>
-    <string name="let_me_translate">Ich möchte übersetzen</string>
-    <string name="give_feedback">Feedback geben!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* befindet sich noch in Entwicklung, wenn du also Vorschläge oder etwas anderes auf dem Herzen hast besuche doch unseren Bug Tracker und lass es uns wissen!</string>
-    <string name="report_bugs">Fehler melden</string>
-    <string name="spread_the_word">Anderen davon erzählen!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Erzähl deiner Familie und deinen Freunden von diaspora* und #dandelion! Warum bloggst du nicht über deine Erfahrungen mit der App? Wir würden gerne davon erfahren!</string>
-    <string name="share_the_app">Weitersagen</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hallo! Schau dir #dandelion an! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Entwickler</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Diese Anwendung wird momentan entwickelt und betreut von &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Mitwirkende</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Vielen Dank!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+ Lizenz</string>
-    <string name="show_third_party_licenses">Drittanbieter-Bibliotheken</string>
-    <string name="the_following_libraries_are_used">Die folgenden Bibliotheken werden genutzt:</string>
-    <string name="inspiration_from_leafpic__appspecific">Wir haben ein wenig bei LeafPic gespickt. Schaut euch das mal an, es handelt sich dabei auch um freie Software!</string>
-    <string name="tell_me_more">Erzähl mir mehr</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="show_title_in_main_view">Titel in der Hauptansicht anzeigen</string>
+    <string name="show_title">Titel anzeigen</string>
+    <string name="launcher_shortcut">Launcher Verknüpfung</string>
     <!-- Operability -->
     <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>
@@ -201,4 +165,48 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
     <string name="wipe_settings_warning__appspecific">Dies wird alle geänderten Einstellungen der Anwendung auf die Standardwerte zurücksetzen und alle Konten abmelden. Deine heruntergeladenen Medien bleiben unberührt. Bist du sicher, dass du fortfahren willst?</string>
     <string name="enable_basic_adblocker_description">Einfachen Werbeblocker aktivieren. Werbung könnte z.B. in eingebetteten Anzeigen enthalten sein</string>
     <string name="block_advertisments">Werbung blockieren</string>
+    <string name="about">Über</string>
+    <string name="license">Lizenz</string>
+    <string name="debugging">Debugging</string>
+    <string name="application">Anwendung</string>
+    <string name="device">Gerät</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Debug-Protokoll</string>
+    <string name="debug_log_verbose">Debug-Protokoll (Verbose)</string>
+    <string name="app_version_with_arg">App Version: %1$s</string>
+    <string name="android_version_witharg">Android Version: %1$s</string>
+    <string name="device_name_witharg">Gerätename: %1$s</string>
+    <string name="code_name_witharg">Codename: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profil Name: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Domain: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Debug-Protokoll in Zwischenablage kopiert</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk diaspora*. Es bietet dir zusätzliche Funktionen wie nützliche Werkzeugleisten und Unterstützung für Proxyserver wie das Tor-Netzwerk.</string>
+    <string name="contribute_code">Mach mit!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* wird frei wie in Freiheit entwickelt und folgt den Ideen des diaspora* Projektes. Wenn du mithelfen willst, nur zu! Wir sind momentan nur ein sehr kleines Team und sind froh über jede Unterstützung!</string>
+    <string name="get_the_source">Zum Quellcode</string>
+    <string name="translate_the_app">Übersetze die App!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Die Anwendung ist nicht in deiner Sprache verfügbar? Das kannst du ändern! Warum hilfst du uns nicht, indem du übersetzt? Wir benutzen die Plattform crowdin, um es jedem zu ermöglichen, die App zu übersetzen.</string>
+    <string name="let_me_translate">Ich möchte übersetzen</string>
+    <string name="give_feedback">Feedback geben!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* befindet sich noch in Entwicklung, wenn du also Vorschläge oder etwas anderes auf dem Herzen hast besuche doch unseren Bug Tracker und lass es uns wissen!</string>
+    <string name="report_bugs">Fehler melden</string>
+    <string name="spread_the_word">Anderen davon erzählen!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Erzähl deiner Familie und deinen Freunden von diaspora* und #dandelion! Warum bloggst du nicht über deine Erfahrungen mit der App? Wir würden gerne davon erfahren!</string>
+    <string name="share_the_app">Weitersagen</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hallo! Schau dir #dandelion an! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Entwickler</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Diese Anwendung wird momentan entwickelt und betreut von &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Beitragende</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Vielen Dank!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Lizenz</string>
+    <string name="show_third_party_licenses">Drittanbieter-Bibliotheken</string>
+    <string name="the_following_libraries_are_used">Die folgenden Bibliotheken werden genutzt:</string>
+    <string name="inspiration_from_leafpic__appspecific">Wir haben ein wenig bei LeafPic gespickt. Schaut euch das mal an, es handelt sich dabei auch um freie Software!</string>
+    <string name="tell_me_more">Erzähl mir mehr</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Einschalten um YouTube Links in einer externen App zu öffnen</string>
+    <string name="youtube_links">YouTube Links</string>
+    <string name="change_the_theme_of_your_account">Thema des Accounts ändern</string>
+    <string name="pull_to_refresh">Pull-To-Refresh</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">In der Website von ganz oben nach unten ziehen um zu aktualisieren.\nDu musst die App neu starten damit die Änderungen wirksam werden.</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-eo/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0f782b30..603085a5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Abrir el panel de navegación</string>
+    <string name="close_navdrawer">Cerrar el panel de navegación</string>
     <string name="reload">Refrescar</string>
+    <string name="close">Cerrar</string>
+    <string name="cancel">Cancelar</string>
     <!-- Common Words -->
     <string name="settings">Ajustes</string>
     <string name="notifications">Notificaciones</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">Compartir…</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>
@@ -75,48 +79,7 @@
     <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>
-    <string name="debugging">Depurando</string>
-    <string name="application">Aplicación</string>
-    <string name="device">Dispositivo</string>
-    <string name="diaspora_pod__appspecific">Pod de diaspora*</string>
-    <string name="debug_log">Depurar registro</string>
-    <string name="debug_log_verbose">Depurar registro (Detallado)</string>
-    <string name="app_version_with_arg">Versión aplicación:%1$s</string>
-    <string name="android_version_witharg">Versión de Android: %1$s</string>
-    <string name="device_name_witharg">Nombre del dispositivo: %1$s</string>
-    <string name="code_name_witharg">Nombre clave: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Nombre de perfil del pod: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Dominio del pod:%1$s</string>
-    <string name="debug_log_copied_to_clipboard">Registro de depuración copiado al portapapeles</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* es su complemento para navegar por la red social diapora*. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social.</string>
-    <string name="contribute_code">¡Contribuir con código!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* se desarrolla libre, en el sentido de libertad, y sigue las ideas del proyecto diaspora*. Si usted quiere contribuir, ¡adelante! Actualmente somos un equipo muy pequeño, por lo que ¡agradeceríamos mucho cualquier tipo de ayuda!</string>
-    <string name="get_the_source">Obtener el código fuente</string>
-    <string name="translate_the_app">¡Traducir la aplicación!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">¿La aplicación no está disponible en su idioma? ¡Usted puede cambiar eso! ¿Por qué no nos ayuda traduciéndola? Utilizamos la plataforma crowdin para permitir a cualquiera traducir la aplicación.</string>
-    <string name="let_me_translate">Permítanme traducir</string>
-    <string name="give_feedback">Danos tu opinión!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* todavía está en desarrollo, así que si tiene sugerencias o cualquier tipo de comentarios, ¡utilice nuestro gestor de errores para hacérnoslo saber!</string>
-    <string name="report_bugs">Reporte de errores</string>
-    <string name="spread_the_word">¡Corre la voz!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">¡Hable a sus amigos y familiares acerca de diaspora* y #dandelion! ¿Por qué no difunde sus experiencias? ¡Nos encantaría escucharle!</string>
-    <string name="share_the_app">Compartir la aplicación</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">¡Hey! ¡Mira #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Mantenimiento</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está siendo desarrollada y mantenida por &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="contributors">Colaboradores</string>
-    <string name="thank_you_witharg">¡%1$s &lt; br &gt;&lt; br &gt; Gracias!</string>
-    <string name="gnu_gplv3_license">Licencia GNU GPLv3 +</string>
-    <string name="show_third_party_licenses">Bibliotecas de terceros</string>
-    <string name="the_following_libraries_are_used">Se utilizan las siguientes bibliotecas:</string>
-    <string name="inspiration_from_leafpic__appspecific">Tomamos algo de inspiración y código de LeafPic. ¡Venga, tomad prestado, es software libre también!</string>
-    <string name="tell_me_more">Saber más</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="launcher_shortcut">Atajo de lanzador</string>
     <!-- Operability -->
     <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>
@@ -144,7 +107,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Cambiar el idioma de esta aplicación. Reinicie la aplicación para que los cambios surtan efecto</string>
+    <string name="language_change_restart_description">Cambiar el idioma de esta aplicación. Reiniciar la aplicación para que se apliquen los cambios</string>
     <string name="language">Idioma</string>
     <string name="system_language">Idioma del sistema</string>
     <!-- Font size -->
@@ -197,4 +160,48 @@
     <string name="wipe_settings_warning__appspecific">Esto restablecerá todas las modificaciones en la configuración a sus valores predeterminados y se desconectará de todos los pods. Las imágenes descargadas permanecerán intactas. ¿Está seguro de que desea continuar?</string>
     <string name="enable_basic_adblocker_description">Habilitar bloqueador de publicidad básico. Publicidad podrá ser incluida p.ej. en vistas incrustadas</string>
     <string name="block_advertisments">Bloquear publicidad</string>
+    <string name="about">Acerca de</string>
+    <string name="license">Licencia</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicación</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Pod de diaspora*</string>
+    <string name="debug_log">Depurar registro</string>
+    <string name="debug_log_verbose">Depurar registro (Detallado)</string>
+    <string name="app_version_with_arg">Versión aplicación:%1$s</string>
+    <string name="android_version_witharg">Versión de Android: %1$s</string>
+    <string name="device_name_witharg">Nombre del dispositivo: %1$s</string>
+    <string name="code_name_witharg">Nombre clave: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nombre de perfil del pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio del pod:%1$s</string>
+    <string name="debug_log_copied_to_clipboard">Registro de depuración copiado al portapapeles</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* es su complemento para navegar por la red social diapora*. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social.</string>
+    <string name="contribute_code">¡Contribuir con código!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* se desarrolla libre, en el sentido de libertad, y sigue las ideas del proyecto diaspora*. Si usted quiere contribuir, ¡adelante! Actualmente somos un equipo muy pequeño, por lo que ¡agradeceríamos mucho cualquier tipo de ayuda!</string>
+    <string name="get_the_source">Obtener el código fuente</string>
+    <string name="translate_the_app">¡Traducir la aplicación!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">¿La aplicación no está disponible en su idioma? ¡Usted puede cambiar eso! ¿Por qué no nos ayuda traduciéndola? Utilizamos la plataforma crowdin para permitir a cualquiera traducir la aplicación.</string>
+    <string name="let_me_translate">Permítanme traducir</string>
+    <string name="give_feedback">Danos tu opinión!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* todavía está en desarrollo, así que si tiene sugerencias o cualquier tipo de comentarios, ¡utilice nuestro gestor de errores para hacérnoslo saber!</string>
+    <string name="report_bugs">Reporte de errores</string>
+    <string name="spread_the_word">¡Corre la voz!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">¡Hable a sus amigos y familiares acerca de diaspora* y #dandelion! ¿Por qué no difunde sus experiencias? ¡Nos encantaría escucharle!</string>
+    <string name="share_the_app">Compartir la aplicación</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">¡Hey! ¡Mira #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Mantenimiento</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está siendo desarrollada y mantenida por &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Contribuidores</string>
+    <string name="thank_you_witharg">¡%1$s &lt; br &gt;&lt; br &gt; Gracias!</string>
+    <string name="gnu_gplv3_license">Licencia GNU GPLv3 +</string>
+    <string name="show_third_party_licenses">Bibliotecas de terceros</string>
+    <string name="the_following_libraries_are_used">Se utilizan las siguientes bibliotecas:</string>
+    <string name="inspiration_from_leafpic__appspecific">Tomamos algo de inspiración y código de LeafPic. ¡Venga, tomad prestado, es software libre también!</string>
+    <string name="tell_me_more">Saber más</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Habilitar para abrir enlaces de Youtube en aplicaciones externas</string>
+    <string name="youtube_links">Enlaces de YouTube</string>
+    <string name="change_the_theme_of_your_account">Cambiar el tema de tu cuenta</string>
+    <string name="pull_to_refresh">Tirar para refrescar</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Deslizar hacia abajo la parte superior de la página para refrescar.\n Necesita reiniciar la aplicación para que los cambios surtan efecto.</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
new file mode 100644
index 00000000..f5cf3963
--- /dev/null
+++ b/app/src/main/res/values-fa/strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">تنظیمات</string>
+    <string name="search">جستجو</string>
+    <string name="changelog">لاگ تغییرات</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">بیشتر</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">مخفی کردن نوار وضعیت</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">عمومی</string>
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">تغییر زبان برنامه. لازم است برنامه را از نو اجرا کنید تا تغییرات را ببینید</string>
+    <string name="language">زبان</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">پیش‌فرض</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="about">درباره مارکور</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">همکاران</string>
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
new file mode 100644
index 00000000..04cb116a
--- /dev/null
+++ b/app/src/main/res/values-fil/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">Mga Tanawin</string>
+    <string name="search">Hanapin</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Ayos</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9162948b..b039f5c3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Ouvrir le tiroir de navigation</string>
+    <string name="close_navdrawer">Fermer le tiroir de navigation</string>
     <string name="reload">Rafraîchir</string>
+    <string name="close">Fermer</string>
+    <string name="cancel">Annuler</string>
     <!-- Common Words -->
     <string name="settings">Paramètres</string>
     <string name="notifications">Notifications</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">Partager…</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>
@@ -75,51 +79,7 @@
     <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>
-    <string name="license">Licence</string>
-    <string name="debugging">Déboguer</string>
-    <string name="application">Application</string>
-    <string name="device">Appareil</string>
-    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
-    <string name="debug_log">Journal de débogage</string>
-    <string name="debug_log_verbose">Log de débogage (Verbeux)</string>
-    <string name="app_version_with_arg">Version app : %1$s</string>
-    <string name="android_version_witharg">Version Android : %1$s</string>
-    <string name="device_name_witharg">Nom de l\'appareil : %1$s</string>
-    <string name="code_name_witharg">Nom de code : %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Pod alias : %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Adresse du pod : %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Journal de débogage copié dans le presse-papiers</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* est votre application compagnon pour naviguer sur le réseau social diaspora*. Il ajoute des fonctionnalités telles que des barres d’outils utiles et la prise en charge pour les serveurs proxy comme le réseau Tor à votre expérience sociale.</string>
-    <string name="contribute_code">Contribuez au code !</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* est libre, et suit les idées du projet diaspora*. Si vous voulez contribuer, allez-y ! Actuellement, nous sommes une toute petite équipe, donc nous apprécierions tout type d\'aide !</string>
-    <string name="get_the_source">Obtenir la source</string>
-    <string name="translate_the_app">Traduire l\'application !</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">L’application n’est pas disponible dans votre langue ? Vous pouvez changer cela ! Pourquoi ne pas nous aider à la traduire ? Nous utilisons la plate-forme crowdin pour permettre à quiconque de traduire l’application.</string>
-    <string name="let_me_translate">Je voudrais traduire</string>
-    <string name="give_feedback">Donnez votre avis !</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* est encore en développement, donc si vous avez des suggestions ou n’importe quel genre de retour, veuillez utiliser notre traqueur de bogues pour nous le faire savoir !</string>
-    <string name="report_bugs">Signaler un bug</string>
-    <string name="spread_the_word">Faîtes passer le mot !</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Parlez de diaspora* et #dandelion à vos amis et votre famille ! Pourquoi ne pas bloguer à propos de votre expérience ? Nous aimerions la lire !</string>
-    <string name="share_the_app">Partager cette application</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hé ! Découvrez #dandelion ! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Mainteneurs</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Cette application est actuellement développée et maintenue par &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Contributeurs</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Merci !</string>
-    <string name="gnu_gplv3_license">Licence GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Bibliothèques tierces</string>
-    <string name="the_following_libraries_are_used">Les bibliothèques suivantes sont utilisées :</string>
-    <string name="inspiration_from_leafpic__appspecific">Nous avons pris des inspirations et du code de LeafPic. Allez voir, c\'est aussi un logiciel libre !</string>
-    <string name="tell_me_more">En savoir plus</string>
-
-    <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
     <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>
@@ -147,7 +107,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Change la langue de l\'application. Redémarrez l\'application pour que les changements prennent effet</string>
+    <string name="language_change_restart_description">Changer la langue de l\'interface. Vous devrez redémarrer l\'application pour que ce changement soit pris en compte</string>
     <string name="language">Langue</string>
     <string name="system_language">Langue du système</string>
     <!-- Font size -->
@@ -200,4 +160,48 @@
     <string name="wipe_settings_warning__appspecific">Ceci va réinitialiser tous les changements à leurs valeurs par défaut et vous déconnecter de tous les pods. Vos images téléchargées resteront intactes. Êtes-vous sûr de vouloir continuer ?</string>
     <string name="enable_basic_adblocker_description">Activer un bloqueur de pub. Des pubs peuvent être incluses, dans des vues embarquées par exemple</string>
     <string name="block_advertisments">Bloquer les publicités</string>
+    <string name="about">À propos</string>
+    <string name="license">Licence</string>
+    <string name="debugging">Déboguer</string>
+    <string name="application">Application</string>
+    <string name="device">Appareil</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Journal de débogage</string>
+    <string name="debug_log_verbose">Log de débogage (Verbeux)</string>
+    <string name="app_version_with_arg">Version app : %1$s</string>
+    <string name="android_version_witharg">Version Android : %1$s</string>
+    <string name="device_name_witharg">Nom de l\'appareil : %1$s</string>
+    <string name="code_name_witharg">Nom de code : %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod alias : %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Adresse du pod : %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Journal de débogage copié dans le presse-papiers</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* est votre application compagnon pour naviguer sur le réseau social diaspora*. Il ajoute des fonctionnalités telles que des barres d’outils utiles et la prise en charge pour les serveurs proxy comme le réseau Tor à votre expérience sociale.</string>
+    <string name="contribute_code">Contribuez au code !</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* est libre, et suit les idées du projet diaspora*. Si vous voulez contribuer, allez-y ! Actuellement, nous sommes une toute petite équipe, donc nous apprécierions tout type d\'aide !</string>
+    <string name="get_the_source">Obtenir la source</string>
+    <string name="translate_the_app">Traduire l\'application !</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">L’application n’est pas disponible dans votre langue ? Vous pouvez changer cela ! Pourquoi ne pas nous aider à la traduire ? Nous utilisons la plate-forme crowdin pour permettre à quiconque de traduire l’application.</string>
+    <string name="let_me_translate">Je voudrais traduire</string>
+    <string name="give_feedback">Donnez votre avis !</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* est encore en développement, donc si vous avez des suggestions ou n’importe quel genre de retour, veuillez utiliser notre traqueur de bogues pour nous le faire savoir !</string>
+    <string name="report_bugs">Signaler un bug</string>
+    <string name="spread_the_word">Faîtes passer le mot !</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Parlez de diaspora* et #dandelion à vos amis et votre famille ! Pourquoi ne pas bloguer à propos de votre expérience ? Nous aimerions la lire !</string>
+    <string name="share_the_app">Partager cette application</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hé ! Découvrez #dandelion ! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Mainteneurs</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Cette application est actuellement développée et maintenue par &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contributeurs</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Merci !</string>
+    <string name="gnu_gplv3_license">Licence GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Bibliothèques tierces</string>
+    <string name="the_following_libraries_are_used">Les bibliothèques suivantes sont utilisées :</string>
+    <string name="inspiration_from_leafpic__appspecific">Nous avons pris des inspirations et du code de LeafPic. Allez voir, c\'est aussi un logiciel libre !</string>
+    <string name="tell_me_more">En savoir plus</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Autoriser l\'ouverture des liens Youtube par une appli externe</string>
+    <string name="youtube_links">Liens Youtube</string>
+    <string name="change_the_theme_of_your_account">Changer le thème de votre compte</string>
+    <string name="pull_to_refresh">Tirer vers le bas pour mettre à jour</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Tirez depuis le haut de la page vers le bas pour l\'actualiser.\nVous devez redémarrer l\'application pour que ces changements prennent effet.</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 1046e470..86bd9019 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Editado con nano-->
 <resources>
     <!-- Application -->
-<string name="open_navdrawer">Abrir cadro de navegación</string>
-<string name="close_navdrawer">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>
+    <string name="close">Pechar</string>
+    <string name="cancel">Cancelar</string>
     <!-- Common Words -->
     <string name="settings">Axustes</string>
     <string name="notifications">Notificacións</string>
-    <string name="conversations">Conversa</string>
-    <string name="stream">Fío de comentarios</string>
+    <string name="conversations">Conversas</string>
+    <string name="stream">Cronoloxía</string>
     <string name="profile">Perfil</string>
     <string name="aspects">Aspecto</string>
     <string name="activities">Actividades</string>
@@ -28,10 +29,10 @@
     <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>
+    <string name="started_sharing">Xa compartes</string>
     <!-- Pod Activity -->
     <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="sorry_need_to_be_connected_to_internet">Desculpa, tes que ter conexión a internet para esto</string>
     <string name="confirmation">Confirmación</string>
     <string name="do_you_want_to_exit">Quere saír?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
@@ -49,12 +50,12 @@
     <string name="new_post">Nova mensaxe</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="exit_app">Saír da app</string>
     <string name="toggle_mobile_desktop_view">Vista móbil/escritorio</string>
-    <string name="share_dotdotdot">Compartir&#8230;</string>
+    <string name="share_dotdotdot">Compartir…</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="please_add_a_name">Por favor, engade 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>
@@ -64,69 +65,27 @@
     <!-- More from MainActivity -->
     <string name="unable_to_load_image">Non se cargou a imaxe</string>
     <!-- Permissions -->
-    <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="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="screenshot_permission__appspecific">Debes permitir \"Permiso de acceso a almacenamento\" para gardar capturas. Podes
+        pechar a aplicación ou reiniciar o dispositivo. Se non permites acceder ao almacenamento pero queres utilizar máis tarde a captura de pantalla, poderás permitir posteriormente o acceso na sección de permisos do dispositivo onde podes activar o \"permiso de acceso a almacenamento\" para dandelion*.</string>
+    <string name="image_permission_description__appspecific">Tes que permitir \"Permiso de acceso a almacenamento\" para gardar/subir imaxes. Despois de iso deberías
+        pechar a aplicación ou reiniciar o dispositivo. Se non permites acceder ao almacenamento, para poder gardar imaxes posteriormente, deberás abrir: preferencias do sistema - apps - dandelion* no dispositivo.
+   Na sección de permisos podes 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="permission_granted_try_again">Permiso concedido. Inténtao de novo.</string>
     <string name="custom_pod">Nodo personalizado</string>
     <string name="pod_name">Nome do nodo</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_page_in_stream__appspecific">Ir a última paxina lida na conversa?</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Ir a última páxina 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>
-    <string name="license">Licenza</string>
-    <string name="debugging">Depurando</string>
-    <string name="application">Aplicación</string>
-    <string name="device">Dispositivo</string>
-    <string name="diaspora_pod__appspecific">Nodo diaspora*</string>
-    <string name="debug_log">Rexistro de depuración</string>
-    <string name="debug_log_verbose">Rexistro de depuración (polo miúdo)</string>
-    <string name="app_version_with_arg">Versión do App: %1$s</string>
-    <string name="android_version_witharg">Versión Android: %1$s</string>
-    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
-    <string name="code_name_witharg">Alcume: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Nome do perfil do nodo: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Dominio do nodo: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Ficheiro de depuración copiado ao portapapeis</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* é a súa aplicación para a rede social diaspora*. Engade características como barras de ferramentas e soporte para servidores proxy como a rede Tor para a súa experiencia social.</string>
-    <string name="contribute_code">Contribúa ao código!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* é desenvolto libre, libre de Liberdade, e segue o espíritu que marca o proxecto diaspora*. Se quere contribuír, adiante! Por agora somos un equipo pequeno, así que agradecemos calquer tipo de axuda!</string>
-    <string name="get_the_source">Obteña as fontes</string>
-    <string name="translate_the_app">Traduza o app!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Non está a aplicación no seu idioma? Pode cambiar eso! Por qué non nos axuda traducíndoa? Utilizamos a plataforma github para que calquera poida traducir a app.</string>
-    <string name="let_me_translate">Deixame traducir</string>
-    <string name="give_feedback">Qué lle parece!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* aínda está en desenvolvemento, asi que si ten suxerencias de calquer tipo o valoración, por favor utilice o noso xestor de erros para facérnolo saber!</string>
-    <string name="report_bugs">Reporte erros</string>
-    <string name="spread_the_word">Difunda!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Dígalle aos seus amigos e familiares que utiliza diaspora* e #dandelion! Por qué no escribir sobre a experiencia? Encantaríanos saber de vostede!</string>
-    <string name="share_the_app">Comparta a aplicación</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Ei!! Olla a #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Mantedores</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está a ser desenvolta e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Contribúen</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazas!</string>
-    <string name="gnu_gplv3_license">Licenza GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Código de terceiras partes</string>
-    <string name="the_following_libraries_are_used">Utilízase o seguinte código:</string>
-    <string name="inspiration_from_leafpic__appspecific">Inspirámonos e collemos código de LeafPic. Bótalle un ollo, tamén é software libre!</string>
-    <string name="tell_me_more">Cóntame máis</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="launcher_shortcut">Atallo do lanzador</string>
     <!-- Operability -->
     <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>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Preme nun espazo baleiro na barra superior para abrir a conversa</string>
     <!-- Category Titles -->
     <string name="appearance">Aparencia</string>
     <string name="network">Rede</string>
@@ -135,13 +94,13 @@
     <!-- Visuals -->
     <!-- Navigiation Slider -->
     <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="control_visibility_of_entries_nav_drawer">Controla 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="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="control_which_colors_are_used_in_app">Escolle 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>
@@ -151,7 +110,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Cambiar o idioma de esta aplicación. Reinicie para que se aplique o troco</string>
+    <string name="language_change_restart_description">Cambiar o idioma de esta aplicación. Reinicia para que se aplique o troco</string>
     <string name="language">Idioma</string>
     <string name="system_language">Idioma do sistema</string>
     <!-- Font size -->
@@ -175,22 +134,22 @@
     <string name="load_proxy_settins_for_tor">Cargar axustes proxy para Tor (Orbot) HTTP Proxy</string>
     <string name="proxy">Proxy</string>
     <string name="enable_proxy">Habilitar Proxy</string>
-    <string name="proxy_dandelion_traffic__appspecific">Proxy para o tráfico de dandelion* para saltar cortalumes.\nPodería precisar reinicio. Esto podería non funcionar en algúns móbiles.</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy para o tráfico de dandelion* para saltar cortalumes.\nPodería precisar reinicio. Esto podería non funcionar nalgúns móbiles.</string>
     <string name="host">Servidor</string>
     <string name="port">Porto</string>
-    <string name="app_needs_restart_to_disable_proxy_usage">Precisa reiniciar o app para deshabilitar o uso do proxy</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Precisa reiniciar a app para desactivar o uso do proxy</string>
     <string name="orbot_proxy_preset_loaded">Cargadas as preferencias do proxy Orbot</string>
     <!-- Chrome custom tabs -->
     <string name="open_external_links_with_chrome_custom_tabs_description">Abrir ligazóns externas con Chrome Custom Tabs. Chromium ou Google Chrome ten que estar instalado para utilizar esta característica.\nIMPORTANTE: Chrome Custom Tabs non utiliza os servidores proxy configurados!</string>
     <!-- Diaspora Settings -->
     <string name="personal_settings">Axustes personais</string>
     <string name="open_diaspora_account_settings__appspecific">Abrir os axustes da conta diaspora*</string>
-    <string name="manage_your_contact_list">Xestione a súa lista de contactos</string>
+    <string name="manage_your_contact_list">Xestiona a lista de contactos</string>
     <string name="manage_hashtags">Xestionar etiquetas</string>
-    <string name="unfollow_already_followed_hashtags__appspecific">Deixar de seguir etiquetas que segue</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Deixar de seguir etiquetas que segues</string>
     <string name="change_account">Mudar de conta</string>
     <string name="loug_warning_description__appspecific">Eliminar os datos locais da sesión e cambiar a outro nodo/conta de diaspora*</string>
-    <string name="logout_warning_description">Esto eliminará todas as cookies e datos de sesión. Seguro que quere mudar de conta?</string>
+    <string name="logout_warning_description">Esto eliminará todas as cookies e datos de sesión. Seguro que queres mudar de conta?</string>
     <string name="clear_cache">Limpar cache</string>
     <string name="clear_webview_cache">Limpar a cache da VistaWeb</string>
     <string name="intellihide_toolbars__appspecific">Agochar automáticamente as barras superior e inferior mentras desplaza</string>
@@ -200,8 +159,52 @@
     <!-- More -->
     <string name="miscellaneous">Varios</string>
     <string name="full_reset">Restablecer completamente</string>
-    <string name="wipe_settings_and_logout">Eliminar todas os axustes locais do app e desconectar todas as contas</string>
-    <string name="wipe_settings_warning__appspecific">Esto restablecerá todos os axustes da aplicación ao valor por omisión e desconectarao de todos os nodos. As súas imaxes descargadas permanecerán. Seguro que quere proceder?</string>
-    <string name="enable_basic_adblocker_description">Habilitar un AdBlocker básico. Poderían verse anuncios por exemplo en vistas incrustadas</string>
+    <string name="wipe_settings_and_logout">Eliminar todolos axustes locais da app e desconectar todas as contas</string>
+    <string name="wipe_settings_warning__appspecific">Esto restablecerá todos os axustes da aplicación ao valor por omisión e desconectarate de todolos nodos. As imaxes descargadas permanecerán. Seguro que queres proceder?</string>
+    <string name="enable_basic_adblocker_description">Activar un AdBlocker básico. Poderían verse anuncios por exemplo en vistas incrustadas</string>
     <string name="block_advertisments">Bloquear publicidade</string>
+    <string name="about">Sobre</string>
+    <string name="license">Licenza</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicación</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Nodo diaspora*</string>
+    <string name="debug_log">Rexistro de depuración</string>
+    <string name="debug_log_verbose">Rexistro de depuración (polo miúdo)</string>
+    <string name="app_version_with_arg">Versión da App: %1$s</string>
+    <string name="android_version_witharg">Versión Android: %1$s</string>
+    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
+    <string name="code_name_witharg">Alcume: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nome do perfil do nodo: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio do nodo: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Ficheiro de depuración copiado ao portapapeis</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* é a túa aplicación para a rede social diaspora*. Engade características como barras de ferramentas e soporte para servidores proxy como a rede Tor.</string>
+    <string name="contribute_code">Contribúa ao código!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* é desenvolta libre, libre de Liberdade, e segue o espíritu que marca o proxecto diaspora*. Se queres contribuír, adiante! Por agora somos un equipo pequeno, así que agradecemos calquer tipo de axuda!</string>
+    <string name="get_the_source">Aquí as fontes</string>
+    <string name="translate_the_app">Traduce a app!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Non está a aplicación no teu idioma? Podes cambiar eso! Por qué non nos axudas traducíndoa? Utilizamos a plataforma Crowdin para que calquera poida traducir a app.</string>
+    <string name="let_me_translate">Deixame traducir</string>
+    <string name="give_feedback">Danos a túa opinión!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* aínda está en desenvolvemento, asi que se tes suxestións de calquer tipo ou valoración, por favor usa o noso xestor de errros para facérnolo saber!</string>
+    <string name="report_bugs">Reporte erros</string>
+    <string name="spread_the_word">Difunde!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Dille aos teus amigos e familiares que utilizas diaspora* e #dandelion! Por qué non escribir sobre a experiencia? Encantaríanos saber de ti!</string>
+    <string name="share_the_app">Comparte a aplicación</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ei!! Olla #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Mantedores</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicación está a ser desenvolta e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Contribúen</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazas!</string>
+    <string name="gnu_gplv3_license">Licenza GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Código de terceiras partes</string>
+    <string name="the_following_libraries_are_used">Utilízase o seguinte código:</string>
+    <string name="inspiration_from_leafpic__appspecific">Inspirámonos e collemos código de LeafPic. Bótalle un ollo, tamén é software libre!</string>
+    <string name="tell_me_more">Cóntame máis</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Activar para abrir vídeos YouTube nunha app externa</string>
+    <string name="youtube_links">Ligazóns YouTube</string>
+    <string name="change_the_theme_of_your_account">Cambiar o decorado da túa conta</string>
+    <string name="pull_to_refresh">Tira para actualizar</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Tirar hacia abaixo na parte superior da páxina.\nDebes reiniciar a app para que os cambios se apliquen.</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000..07facc0c
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">नेविगेशन ड्रॉवर खोलें</string>
+    <string name="close_navdrawer">नेविगेशन ड्रॉवर को बंद करें</string>
+    <!-- Common Words -->
+    <string name="settings">सेटिंग्स</string>
+    <string name="search">खोजें</string>
+    <string name="changelog">बदलाव लॉग</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">अधिक</string>
+    <string name="share_dotdotdot">साझा करें...</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">स्थिति पट्टी छुपाएँ</string>
+    <string name="show_title">शीर्षक दिखाएं</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">दिखावट</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">इस ऐप की भाषा बदलें परिवर्तन प्रभावी होने के लिए ऐप को पुन: प्रारंभ करें</string>
+    <string name="language">भाषा</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="clear_cache">कैश को साफ़ करें</string>
+    <!-- More -->
+    <string name="miscellaneous">विविध</string>
+    <string name="about">जानकारी</string>
+    <string name="license">लाइसेंस</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">योगदान कर्ता</string>
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 47d407fe..36ef8efa 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -48,7 +48,7 @@
     <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="share_dotdotdot">Megosztás…</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>
@@ -71,49 +71,6 @@
     <string name="pod_address">Pod címe</string>
     <string name="missing_value">Hiányzó érték</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>
-    <string name="debugging">Hibakeresés</string>
-    <string name="application">Alkalmazás</string>
-    <string name="device">Eszköz</string>
-    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
-    <string name="debug_log">Hibakeresési napló</string>
-    <string name="debug_log_verbose">Hibakeresési napló (részletes)</string>
-    <string name="app_version_with_arg">Alkalmazásverzió: %1$s</string>
-    <string name="android_version_witharg">Android verzió: %1$s</string>
-    <string name="device_name_witharg">Eszköznév: %1$s</string>
-    <string name="code_name_witharg">Kódnév: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Podprofilnév: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Pod domain: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Hibakeresési napló átmásolva a vágólapra</string>
-    <string name="dandelion_is_your_companion__appspecific">A dandelion* a te segédalkalmazásod a diaspora* közösségi hálózat böngészésére. Olyan funkciókat ad hozzá a közösségi élményedhez, mint hasznos eszköztárak és proxyszerver-támogatás (pl. Tor).</string>
-    <string name="contribute_code">Járulj hozzá a fejlesztéshez!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">A dandelion* szabad szoftver és a diaspora* projekt elképzeléseit követi. Ha hozzá akarsz járulni, csak rajta! Jelenleg egy nagyon kis csapat vagyunk, így nagyra értékelünk bármilyen segítséget!
-</string>
-    <string name="get_the_source">A program forrása</string>
-    <string name="translate_the_app">Fordítsd le az alkalmazást!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Nem érhető el az alkalmazás a nyelveden? Ezen változtathatsz! Mit szólnál ahhoz, ha segítenél nekünk a lefordításában? A crowdin platformot használjuk, hogy bárki le tudja fordítani az alkalmazást.</string>
-    <string name="let_me_translate">Hadd fordítsak</string>
-    <string name="give_feedback">Adj visszajelzést!</string>
-    <string name="dandelion_still_in_development__appspecific">A dandelion* még mindig fejlesztés alatt áll, szóval ha vannak javaslataid vagy bármilyen visszajelzésed, kérlek, használd a hibanyomkövetőt!</string>
-    <string name="report_bugs">Hibajelentés</string>
-    <string name="spread_the_word">Ajánld másoknak!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Beszélj a barátaiddal és családtagjaiddal a diaspora*-ról és a #dandelionról! Mi lenne, ha blogolnál a tapasztalataidról? Szeretnénk hallani tőled valamit!</string>
-    <string name="share_the_app">Az alkalmazás megosztása</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Szia! Próbáld ki a #dandeliont! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Karbantartók</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Ezt az alkalmazást jelenleg &lt;br&gt;&lt;br&gt;%1$s fejleszti és tartja karban.</string>
-    <string name="contributors">Hozzájárulók</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Köszönjük!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+ Licenc</string>
-    <string name="show_third_party_licenses">3. személytől származó könyvtárak</string>
-    <string name="the_following_libraries_are_used">A következő könyvtárak vannak használatban:</string>
-    <string name="inspiration_from_leafpic__appspecific">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
-    <string name="tell_me_more">Tudj meg többet</string>
-
-    <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
     <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>
@@ -194,4 +151,43 @@
     <string name="wipe_settings_warning__appspecific">Ez az összes módosított beállítás értékét visszaállítja alapra és kijelentkeztet téged az összes podról. A letöltött képeid érintetlenül maradnak. Biztos, hogy folytatod?</string>
     <string name="enable_basic_adblocker_description">Alap hirdetésblokkoló (AdBlocker) engedélyezése. Reklámok jelenhetnek meg pl. a beépített megjelenítéseknél</string>
     <string name="block_advertisments">Hirdetések blokkolása</string>
+    <string name="about">Névjegy</string>
+    <string name="license">Licenc</string>
+    <string name="debugging">Hibakeresés</string>
+    <string name="application">Alkalmazás</string>
+    <string name="device">Eszköz</string>
+    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
+    <string name="debug_log">Hibakeresési napló</string>
+    <string name="debug_log_verbose">Hibakeresési napló (részletes)</string>
+    <string name="app_version_with_arg">Alkalmazásverzió: %1$s</string>
+    <string name="android_version_witharg">Android verzió: %1$s</string>
+    <string name="device_name_witharg">Eszköznév: %1$s</string>
+    <string name="code_name_witharg">Kódnév: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Podprofilnév: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod domain: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Hibakeresési napló átmásolva a vágólapra</string>
+    <string name="dandelion_is_your_companion__appspecific">A dandelion* a te segédalkalmazásod a diaspora* közösségi hálózat böngészésére. Olyan funkciókat ad hozzá a közösségi élményedhez, mint hasznos eszköztárak és proxyszerver-támogatás (pl. Tor).</string>
+    <string name="contribute_code">Járulj hozzá a fejlesztéshez!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">A dandelion* szabad szoftver és a diaspora* projekt elképzeléseit követi. Ha hozzá akarsz járulni, csak rajta! Jelenleg egy nagyon kis csapat vagyunk, így nagyra értékelünk bármilyen segítséget!</string>
+    <string name="get_the_source">A program forrása</string>
+    <string name="translate_the_app">Fordítsd le az alkalmazást!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Nem érhető el az alkalmazás a nyelveden? Ezen változtathatsz! Mit szólnál ahhoz, ha segítenél nekünk a lefordításában? A crowdin platformot használjuk, hogy bárki le tudja fordítani az alkalmazást.</string>
+    <string name="let_me_translate">Hadd fordítsak</string>
+    <string name="give_feedback">Adj visszajelzést!</string>
+    <string name="dandelion_still_in_development__appspecific">A dandelion* még mindig fejlesztés alatt áll, szóval ha vannak javaslataid vagy bármilyen visszajelzésed, kérlek, használd a hibanyomkövetőt!</string>
+    <string name="report_bugs">Hibajelentés</string>
+    <string name="spread_the_word">Ajánld másoknak!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Beszélj a barátaiddal és családtagjaiddal a diaspora*-ról és a #dandelionról! Mi lenne, ha blogolnál a tapasztalataidról? Szeretnénk hallani tőled valamit!</string>
+    <string name="share_the_app">Az alkalmazás megosztása</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Szia! Próbáld ki a #dandeliont! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Karbantartók</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Ezt az alkalmazást jelenleg &lt;br&gt;&lt;br&gt;%1$s fejleszti és tartja karban.</string>
+    <string name="contributors">Hozzájárulók</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Köszönjük!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ Licenc</string>
+    <string name="show_third_party_licenses">3. személytől származó könyvtárak</string>
+    <string name="the_following_libraries_are_used">A következő könyvtárak vannak használatban:</string>
+    <string name="inspiration_from_leafpic__appspecific">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
+    <string name="tell_me_more">Tudj meg többet</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d8ce0984..8271dda5 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Apri barra di navigazione</string>
+    <string name="close_navdrawer">Chiudi barra di navigazione</string>
     <string name="reload">Ricarica</string>
+    <string name="close">Chiudi</string>
+    <string name="cancel">Annulla</string>
     <!-- Common Words -->
     <string name="settings">Impostazioni</string>
     <string name="notifications">Notifiche</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">Condividi…</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>
@@ -78,51 +82,10 @@
     <string name="missing_value">Valore mancante</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="hide_statusbar">Nascondi la 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>
-    <string name="debugging">Debug</string>
-    <string name="application">Applicazione</string>
-    <string name="device">Dispositivo</string>
-    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
-    <string name="debug_log">Log di debug</string>
-    <string name="debug_log_verbose">Log di debug (dettagliato)</string>
-    <string name="app_version_with_arg">Versione app: %1$s</string>
-    <string name="android_version_witharg">Versione Android: %1$s</string>
-    <string name="device_name_witharg">Nome dispositivo: %1$s</string>
-    <string name="code_name_witharg">Codename: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Pod alias: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Dominio pod: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Log di debug copiato negli appunti</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social.</string>
-    <string name="contribute_code">Contribuisci al codice!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
-    <string name="get_the_source">Ottieni il codice sorgente</string>
-    <string name="translate_the_app">Traduci l\'app!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app.</string>
-    <string name="let_me_translate">Fammi tradurre</string>
-    <string name="give_feedback">Lascia un feedback!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua!</string>
-    <string name="report_bugs">Segnala un bug</string>
-    <string name="spread_the_word">Passaparola!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate!</string>
-    <string name="share_the_app">Condividi l\'app</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Ehi! Scopri #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Manutentori</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Quest\'app è attualmente sviluppata e mantenuta da &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Contributori</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazie!</string>
-    <string name="gnu_gplv3_license">Licenza GNU GPL versione 3 o superiore</string>
-    <string name="show_third_party_licenses">Librerie di terze parti</string>
-    <string name="the_following_libraries_are_used">Sono utilizzate le seguenti librerie:</string>
-    <string name="inspiration_from_leafpic__appspecific">Abbiamo preso ispirazione e parte del codice da LeafPic. Dagli un\'occhiata, anch\'esso è software libero!</string>
-    <string name="tell_me_more">Dimmi di più</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="launcher_shortcut">Avvio rapido</string>
     <!-- Operability -->
     <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>
@@ -150,7 +113,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Cambia la lingua di questa app. Riavvia l\'app per rendere effettive le modifiche</string>
+    <string name="language_change_restart_description">Cambia lingua dell\'app. Riavvia affinchè le modifiche abbiano effetto</string>
     <string name="language">Lingua</string>
     <string name="system_language">Lingua di sistema</string>
     <!-- Font size -->
@@ -197,10 +160,54 @@
     <string name="append_shared_by_notice">Aggiungi avviso dell\'app</string>
     <string name="append_shared_by_notice__appspecific">Aggiungere un riferimento a questa applicazione ai testi condivisi: [via #dandelion]</string>
     <!-- More -->
-    <string name="miscellaneous">Vario</string>
+    <string name="miscellaneous">Altro</string>
     <string name="full_reset">Reset completo</string>
     <string name="wipe_settings_and_logout">Elimina localmente tutte le impostazioni relative all\'app e disconnette da tutti gli account</string>
     <string name="wipe_settings_warning__appspecific">Questo cancellerà tutte le impostazioni dell\'app che sono state cambiate ai loro valori predefiniti e ti disconnetterà da tutti i pod. Le immagini scaricate non verranno toccate. Sei sicuro di voler procedere?</string>
     <string name="enable_basic_adblocker_description">Abilitare AdBlocker base. Gli annunci possono essere inclusi ad es. nelle visualizzazioni incorporate</string>
     <string name="block_advertisments">Blocca le pubblicità</string>
+    <string name="about">Informazioni</string>
+    <string name="license">Licenza</string>
+    <string name="debugging">Debug</string>
+    <string name="application">Applicazione</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Log di debug</string>
+    <string name="debug_log_verbose">Log di debug (dettagliato)</string>
+    <string name="app_version_with_arg">Versione app: %1$s</string>
+    <string name="android_version_witharg">Versione Android: %1$s</string>
+    <string name="device_name_witharg">Nome dispositivo: %1$s</string>
+    <string name="code_name_witharg">Codename: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod alias: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Dominio pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Log di debug copiato negli appunti</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social.</string>
+    <string name="contribute_code">Contribuisci al codice!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
+    <string name="get_the_source">Ottieni il codice sorgente</string>
+    <string name="translate_the_app">Traduci l\'app!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app.</string>
+    <string name="let_me_translate">Fammi tradurre</string>
+    <string name="give_feedback">Lascia un feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua!</string>
+    <string name="report_bugs">Segnala un bug</string>
+    <string name="spread_the_word">Passaparola!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate!</string>
+    <string name="share_the_app">Condividi l\'app</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ehi! Scopri #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Manutentori</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Quest\'app è attualmente sviluppata e mantenuta da &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Collaboratori</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Grazie!</string>
+    <string name="gnu_gplv3_license">Licenza GNU GPL versione 3 o superiore</string>
+    <string name="show_third_party_licenses">Librerie di terze parti</string>
+    <string name="the_following_libraries_are_used">Sono utilizzate le seguenti librerie:</string>
+    <string name="inspiration_from_leafpic__appspecific">Abbiamo preso ispirazione e parte del codice da LeafPic. Dagli un\'occhiata, anch\'esso è software libero!</string>
+    <string name="tell_me_more">Dimmi di più</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Abilita l\'apertura dei link Youtube su app esterna</string>
+    <string name="youtube_links">Links Youtube</string>
+    <string name="change_the_theme_of_your_account">Cambia il tema del tuo account</string>
+    <string name="pull_to_refresh">Trascina per aggiornare</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Trascina dall\'alto al basso per aggiornare la pagina.\nDevi riavviare l\'app affinchè le modifiche abbiano effetto.</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 00000000..cd8d0245
--- /dev/null
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Application -->
+  <!-- Common Words -->
+  <!-- Notifications dropdown menu -->
+  <!-- Pod Activity -->
+  <!-- Drawer, Menu, Toolbar, ContextMenu -->
+  <!-- More from MainActivity -->
+  <!-- Permissions -->
+  <!-- Operability -->
+  <!-- Category Titles -->
+  <!-- Visuals -->
+  <!-- Navigiation Slider -->
+  <!-- Themes -->
+  <!-- Notifications dropdown -->
+  <!-- Font size -->
+  <!-- Load images -->
+  <!-- Screen rotation -->
+  <!-- Proxy -->
+  <!-- Chrome custom tabs -->
+  <!-- Diaspora Settings -->
+  <!-- More -->
+  <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000..9626eba5
--- /dev/null
+++ b/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">הגדרות</string>
+    <string name="search">חפש</string>
+    <string name="changelog">רשימת שינויים</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">עוד</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">הסתר שורת מצב</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">מראה</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">כללי</string>
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">שנה את שפת האפליקציה. אתחל את האפליקציה בכדי שהשינויים יכנסו לתוקף</string>
+    <string name="language">שפה</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">ברירת מחדל</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="miscellaneous">שונות</string>
+    <string name="about">אודות</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">תורמים</string>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e6969344..5c8c52ea 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">ナビゲーションドロワーを開く</string>
+    <string name="close_navdrawer">ナビゲーションドロワーを閉じる</string>
     <string name="reload">再読み込み</string>
+    <string name="close">閉じる</string>
+    <string name="cancel">キャンセル</string>
     <!-- Common Words -->
     <string name="settings">設定</string>
     <string name="notifications">通知</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">シェア…</string>
     <string name="by_tags">タグ別</string>
     <string name="by_people">人別</string>
     <string name="please_add_a_name">名前を追加してください</string>
@@ -75,48 +79,7 @@
     <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>
-    <string name="debugging">デバッグ</string>
-    <string name="application">アプリケーション</string>
-    <string name="device">デバイス</string>
-    <string name="diaspora_pod__appspecific">ダイアスポラ* ポッド</string>
-    <string name="debug_log">デバッグログ</string>
-    <string name="debug_log_verbose">デバッグ ログ (詳細)</string>
-    <string name="app_version_with_arg">アプリバージョン: %1$s</string>
-    <string name="android_version_witharg">Android バージョン: %1$s</string>
-    <string name="device_name_witharg">デバイス名: %1$s</string>
-    <string name="code_name_witharg">コード名: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">ポッドプロファイル名: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">ポッドドメイン: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">デバッグログをクリップボードにコピーしました</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* は、ソーシャル ネットワーク diaspora* をブラウジングするためのコンパニオン アプリです。便利なツールバーや Tor のようなプロキシ サーバーのサポートなどの機能を追加して、ソーシャル体験することができます。</string>
-    <string name="contribute_code">コードを貢献!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* は自由にフリーで開発され、diaspora* プロジェクトのアイデアをフォローしています。貢献したい場合は、どうぞ! 現在私たちは、非常に小規模なチームなので、あらゆる種類の支援に感謝申し上げます!</string>
-    <string name="get_the_source">ソースを取得</string>
-    <string name="translate_the_app">アプリを翻訳!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">アプリがお使いの言語で利用できませんか? それを変更することができます! 翻訳して私たちを支援しませんか? Crowdin プラットフォームを使用して、誰でもアプリケーションを翻訳できるようにしています。</string>
-    <string name="let_me_translate">翻訳させてください</string>
-    <string name="give_feedback">フィードバックする!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* はまだ開発中なので、提案や何かフィードバックがあれば、私たちのバグ追跡システムにご連絡ください!</string>
-    <string name="report_bugs">バグを報告</string>
-    <string name="spread_the_word">みんなに広めよう!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください!</string>
-    <string name="share_the_app">アプリを共有</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">やあ! #dandelion をチェックしてください! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">メンテナンススタッフ</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">現在、このアプリは以下の人によって開発およびメンテナンスされています &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">貢献者</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;ありがとうございます!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+ ライセンス</string>
-    <string name="show_third_party_licenses">サードパーティ ライブラリー</string>
-    <string name="the_following_libraries_are_used">以下のライブラリーが使用されます:</string>
-    <string name="inspiration_from_leafpic__appspecific">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
-    <string name="tell_me_more">さらに詳しく</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="launcher_shortcut">ランチャーのショートカット</string>
     <!-- Operability -->
     <string name="top_toolbar_loads_stream__appsp">上部ツールバーでストリームを読み込み</string>
     <string name="click_empty_space_top_toolbar_load_stream__appspecific">上部ツールバーの空白部分をクリックして、ストリームを開きます。</string>
@@ -144,7 +107,7 @@
     <!-- Notifications dropdown -->
     <string name="extended_notifications">拡張通知</string>
     <string name="extendend_notifications_bell_description__appspecific">通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します</string>
-    <string name="language_change_restart_description">このアプリの言語を変更します。アプリを再起動すると変更を反映します</string>
+    <string name="language_change_restart_description">このアプリの言語を変更します。 変更を反映するにはアプリを再起動します</string>
     <string name="language">言語</string>
     <string name="system_language">システム言語</string>
     <!-- Font size -->
@@ -197,4 +160,48 @@
     <string name="wipe_settings_warning__appspecific">これはアプリの変更された設定をすべてデフォルトにリセットして、すべてのポッドからログアウトします。ダウンロードした画像はそのまま残ります。続行してもよろしいですか?</string>
     <string name="enable_basic_adblocker_description">基本 AdBlocker を有効にします。広告は、埋め込みビューなどに含まれることがあります</string>
     <string name="block_advertisments">広告をブロック</string>
+    <string name="about">情報</string>
+    <string name="license">ライセンス</string>
+    <string name="debugging">デバッグ</string>
+    <string name="application">アプリケーション</string>
+    <string name="device">デバイス</string>
+    <string name="diaspora_pod__appspecific">ダイアスポラ* ポッド</string>
+    <string name="debug_log">デバッグログ</string>
+    <string name="debug_log_verbose">デバッグ ログ (詳細)</string>
+    <string name="app_version_with_arg">アプリバージョン: %1$s</string>
+    <string name="android_version_witharg">Android バージョン: %1$s</string>
+    <string name="device_name_witharg">デバイス名: %1$s</string>
+    <string name="code_name_witharg">コード名: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">ポッドプロファイル名: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">ポッドドメイン: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">デバッグログをクリップボードにコピーしました</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* は、ソーシャル ネットワーク diaspora* をブラウジングするためのコンパニオン アプリです。便利なツールバーや Tor のようなプロキシ サーバーのサポートなどの機能を追加して、ソーシャル体験することができます。</string>
+    <string name="contribute_code">コードを貢献!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* は自由にフリーで開発され、diaspora* プロジェクトのアイデアをフォローしています。貢献したい場合は、どうぞ! 現在私たちは、非常に小規模なチームなので、あらゆる種類の支援に感謝申し上げます!</string>
+    <string name="get_the_source">ソースを取得</string>
+    <string name="translate_the_app">アプリを翻訳!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">アプリがお使いの言語で利用できませんか? それを変更することができます! 翻訳して私たちを支援しませんか? Crowdin プラットフォームを使用して、誰でもアプリケーションを翻訳できるようにしています。</string>
+    <string name="let_me_translate">翻訳させてください</string>
+    <string name="give_feedback">フィードバックする!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* はまだ開発中なので、提案や何かフィードバックがあれば、私たちのバグ追跡システムにご連絡ください!</string>
+    <string name="report_bugs">バグを報告</string>
+    <string name="spread_the_word">みんなに広めよう!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください!</string>
+    <string name="share_the_app">アプリを共有</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">やあ! #dandelion をチェックしてください! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">メンテナンススタッフ</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">現在、このアプリは以下の人によって開発およびメンテナンスされています &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">貢献者</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;ありがとうございます!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ ライセンス</string>
+    <string name="show_third_party_licenses">サードパーティ ライブラリー</string>
+    <string name="the_following_libraries_are_used">以下のライブラリーが使用されます:</string>
+    <string name="inspiration_from_leafpic__appspecific">LeafPic からいくつかのインスピレーションとコードを得ました。チェックしてみてください。同様のフリーソフトウェアです!</string>
+    <string name="tell_me_more">さらに詳しく</string>
+    <string name="enable_to_open_youtube_links_on_external_app">外部アプリで Youtube のリンクを開くことができます</string>
+    <string name="youtube_links">Youtube のリンク</string>
+    <string name="change_the_theme_of_your_account">アカウントのテーマを変更</string>
+    <string name="pull_to_refresh">引き下げて更新</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">ページの上から下に引き下げて更新します。\n変更を反映するため、アプリを再起動する必要があります。</string>
 </resources>
diff --git a/app/src/main/res/values-jw/strings.xml b/app/src/main/res/values-jw/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-jw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index a0be52a2..5d824099 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Ldi umuɣ n tunigin</string>
+    <string name="close_navdrawer">Ffer umuɣ n tunigin</string>
     <string name="reload">Smiren</string>
     <!-- Common Words -->
     <string name="settings">Iɣewwaṛen</string>
@@ -48,7 +50,7 @@
     <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="share_dotdotdot">Bḍu…</string>
     <string name="by_tags">s tebzimin</string>
     <string name="by_people">s imdanen</string>
     <string name="please_add_a_name">Rnu isem</string>
@@ -76,48 +78,9 @@
     <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>
-    <string name="debugging">Tamseɣtayt</string>
-    <string name="application">Asnas</string>
-    <string name="device">Ibenk</string>
-    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
-    <string name="debug_log">Aɣmis n temseɣtayt</string>
-    <string name="debug_log_verbose">Aɣmis n temseɣtayt (Verbose)</string>
-    <string name="app_version_with_arg">Lqem n usnas: %1$s</string>
-    <string name="android_version_witharg">Lqem Android: %1$s</string>
-    <string name="device_name_witharg">Isem n yibenk: %1$s</string>
-    <string name="code_name_witharg">Isem n tengalt: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Isem n umaɣnu n upud: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Tansa n upud: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Aɣmis n temseqtayt yettwaneɣlen ɣef afus</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* d asnas-ik amdakel i tunigin deg uẓeṭṭa n tmetti diaspora*. Ad yernu timahilin am ifecka iwulmen akked usefrek n iqeddacen ipṛuksiyen am uẓeṭṭa Tor ar tarimit-ik n tmetti.</string>
-    <string name="contribute_code">Ttekki di tengalt!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* d ilelli, udiɣ yeṭṭafaṛ tiktiwin n useɣzan diaspora*. Ma tebɣiḍ ad tettekkiḍ, Iya-d! Akka tura, nekni d tarbaɛt meẓẓiyen, ihi ad nebɣu yal anaw n tallelt!</string>
-    <string name="get_the_source">Awi aɣbalu</string>
-    <string name="translate_the_app">Suqel asnas!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Asnas ulac-it s tutlayt-ik? Tzemreḍ ad tbeddleḍ ayagi! Acuɣer ur tettmudduḍ ara afus di tsuqilt-is? nseqdac asmel Crowdin akken ad nermed i yal yiwen ad isuqel asnas.</string>
-    <string name="let_me_translate">Eǧǧ-iyi ad suqleɣ</string>
-    <string name="give_feedback">Mudd-d tikti!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* yezga di tneflit, ihi ma ɣur-k isumar neɣ yal tikti, seqdec aneḍfaṛ nneɣ n ibugen akken ad tazneḍ!</string>
-    <string name="report_bugs">Azen ibugen</string>
-    <string name="spread_the_word">Siqeḍ awal!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Meslay i yimdukal-ik akked twacult-ik ɣef diaspora* d #dandelion! Acuɣer ur tettmaeslayeḍ ara deg iblugen ɣef aya? Nebɣa ad nsel kra sɣur-k!</string>
-    <string name="share_the_app">Bḍu asnas</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Senqed #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Wid yettseggimen</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Asnas-agi yezga di tneflit akked useggem sɣru &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Iwiziwen</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Tanemmirt!</string>
-    <string name="gnu_gplv3_license">Turagt GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Tinedlisin tis kraḍ</string>
-    <string name="the_following_libraries_are_used">Tinedlisin-agi ttwaseqdacent:</string>
-    <string name="inspiration_from_leafpic__appspecific">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
-    <string name="tell_me_more">Ini-yid ugar</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="show_title_in_main_view">Sken azwel deg iẓri agejdan.</string>
+    <string name="show_title">Sken azwel</string>
+    <string name="launcher_shortcut">Anegzum n wagdil n umager.</string>
     <!-- Operability -->
     <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>
@@ -145,7 +108,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Snifel tutlayt n usnas-agi. Ales tanekra n usnas akken ad tbeddel tutlayt</string>
+    <string name="language_change_restart_description">Beddel isem n tutlayt n ugrudem. Yessefk ad talseḍ tanekra n usnas akken teddu tutlaut tamaynut</string>
     <string name="language">Tutlayt</string>
     <string name="system_language">Tutlayt n unagraw</string>
     <!-- Font size -->
@@ -198,4 +161,43 @@
     <string name="wipe_settings_warning__appspecific">Ayagi ad yales awennez n ibeddilen meṛṛa ar wazalen-nsen n tazwara sakin ad isuffeɣ si tuqqna akk ipuden. Tugniwin-ik yudren ad qqiment akken llant. Tebɣiḍ ad tkemmleḍ?</string>
     <string name="enable_basic_adblocker_description">Rmd amsewḥal n udellel. Adelle yezmer ad ddunt, m.d. deg tmeẓriyin tusliɣin</string>
     <string name="block_advertisments">Sewḥel adellel</string>
+    <string name="about">Ɣef</string>
+    <string name="license">Turagt</string>
+    <string name="debugging">Tamseɣtayt</string>
+    <string name="application">Asnas</string>
+    <string name="device">Ibenk</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Aɣmis n temseɣtayt</string>
+    <string name="debug_log_verbose">Aɣmis n temseɣtayt (Verbose)</string>
+    <string name="app_version_with_arg">Lqem n usnas: %1$s</string>
+    <string name="android_version_witharg">Lqem Android: %1$s</string>
+    <string name="device_name_witharg">Isem n yibenk: %1$s</string>
+    <string name="code_name_witharg">Isem n tengalt: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Isem n umaɣnu n upud: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Tansa n upud: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Aɣmis n temseqtayt yettwaneɣlen ɣef afus</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* d asnas-ik amdakel i tunigin deg uẓeṭṭa n tmetti diaspora*. Ad yernu timahilin am ifecka iwulmen akked usefrek n iqeddacen ipṛuksiyen am uẓeṭṭa Tor ar tarimit-ik n tmetti.</string>
+    <string name="contribute_code">Ttekki di tengalt!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* d ilelli, udiɣ yeṭṭafaṛ tiktiwin n useɣzan diaspora*. Ma tebɣiḍ ad tettekkiḍ, Iya-d! Akka tura, nekni d tarbaɛt meẓẓiyen, ihi ad nebɣu yal anaw n tallelt!</string>
+    <string name="get_the_source">Awi aɣbalu</string>
+    <string name="translate_the_app">Suqel asnas!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Asnas ulac-it s tutlayt-ik? Tzemreḍ ad tbeddleḍ ayagi! Acuɣer ur tettmudduḍ ara afus di tsuqilt-is? nseqdac asmel Crowdin akken ad nermed i yal yiwen ad isuqel asnas.</string>
+    <string name="let_me_translate">Eǧǧ-iyi ad suqleɣ</string>
+    <string name="give_feedback">Mudd-d tikti!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* yezga di tneflit, ihi ma ɣur-k isumar neɣ yal tikti, seqdec aneḍfaṛ nneɣ n ibugen akken ad tazneḍ!</string>
+    <string name="report_bugs">Azen ibugen</string>
+    <string name="spread_the_word">Siqeḍ awal!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Meslay i yimdukal-ik akked twacult-ik ɣef diaspora* d #dandelion! Acuɣer ur tettmaeslayeḍ ara deg iblugen ɣef aya? Nebɣa ad nsel kra sɣur-k!</string>
+    <string name="share_the_app">Bḍu asnas</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Senqed #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Wid yettseggimen</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Asnas-agi yezga di tneflit akked useggem sɣru &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Imttekkiyen</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Tanemmirt!</string>
+    <string name="gnu_gplv3_license">Turagt GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Tinedlisin tis kraḍ</string>
+    <string name="the_following_libraries_are_used">Tinedlisin-agi ttwaseqdacent:</string>
+    <string name="inspiration_from_leafpic__appspecific">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
+    <string name="tell_me_more">Ini-yid ugar</string>
 </resources>
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000..2deb9a26
--- /dev/null
+++ b/app/src/main/res/values-kn/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <!-- Application -->
+    <string name="reload">ಮತ್ತೋಮ್ಮೆ ಲೋಡ್ ಮಾಡಿ</string>
+    <!-- Common Words -->
+    <string name="settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+    <string name="liked">ಇಷ್ಟವಾದ</string>
+    <string name="public_">ಸಾರ್ವಜನಿಕ</string>
+    <string name="search">ಹುಡುಕಿ</string>
+    <!-- Notifications dropdown menu -->
+    <string name="deleteme_____1">ಇಷ್ಟವಾದ</string>
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="new_post">ಹೊಸ ಪೊಸ್ಟ್</string>
+    <string name="go_to_top">ಮೇಲಕ್ಕೆ ಹೋಗಿ</string>
+    <string name="share_dotdotdot">ಹಂಚಿಕೊಳ್ಳಿ…</string>
+    <string name="share_link_address">ಕೊಂಡಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="save_image">ಚಿತ್ರವನ್ನು ಉಳಿಸಿ</string>
+    <string name="share_image">ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="copy_link_adress_to_clipboard">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಕೊಂಡಿಯನ್ನು ನಕಲಿಸಿ</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="license">ಪರವಾನಿಗೆ</string>
+    <string name="debug_log_verbose">Debug Log (Verbose)</string>
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000..a7989702
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">사이드 메뉴 열기</string>
+    <string name="close_navdrawer">사이드 메뉴 닫기</string>
+    <string name="reload">새로고침</string>
+    <!-- Common Words -->
+    <string name="settings">설정</string>
+    <string name="notifications">알림</string>
+    <string name="conversations">대화</string>
+    <string name="stream">스트림</string>
+    <string name="profile">프로필</string>
+    <string name="aspects">화면비율</string>
+    <string name="activities">활동</string>
+    <string name="liked">좋아하는</string>
+    <string name="commented">댓글단</string>
+    <string name="mentions">멘션</string>
+    <string name="public_">공개</string>
+    <string name="search">검색</string>
+    <string name="contacts">연락처</string>
+    <string name="changelog">변경사항</string>
+    <string name="statistics">상태</string>
+    <!-- Notifications dropdown menu -->
+    <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="could_not_retrieve_list_of_pods__appspecific">오류: 포드 목록을 검색하지 못했습니다!</string>
+    <string name="sorry_need_to_be_connected_to_internet">해당 작업을 실행하려면 인터넷에 연결되어 있어야 합니다.</string>
+    <string name="confirmation">확인</string>
+    <string name="do_you_want_to_exit">종료하시겠어요?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <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">링크 주소를 복사했습니다 …</string>
+    <string name="new_post">새 게시물</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">공유…</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">다른 브라우저에서 열기…</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="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="custom_pod">사용자 정의 포드</string>
+    <string name="pod_name">포드 이름</string>
+    <string name="protocol">프로토콜</string>
+    <string name="pod_address">포드 주소</string>
+    <string name="missing_value">값이 없습니다</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">스트림의 마지막 방문 페이지로 이동합니까?</string>
+    <!-- Operability -->
+    <string name="top_toolbar_loads_stream__appsp">상단 툴바에서 스트림 읽기</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">상단 툴바의 빈 부분을 클릭해 스트림 열기</string>
+    <!-- Category Titles -->
+    <string name="appearance">모양</string>
+    <string name="network">네트워크</string>
+    <string name="pod_settings__appspecfic">포드 설정</string>
+    <string name="operability">운용성</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <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="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>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">확장된 알림</string>
+    <string name="extendend_notifications_bell_description__appspecific">알림 카테고리를 나타내는 드롭 다운 메뉴에서 알림 벨을 확장합니다</string>
+    <string name="language_change_restart_description">언어 변경하기. 재시작이 필요합니다.</string>
+    <string name="language">언어</string>
+    <string name="system_language">시스템 언어</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">웹뷰 글자 크기 변경</string>
+    <string name="font_size">폰트 사이즈</string>
+    <string name="normal">일반</string>
+    <string name="large">크게</string>
+    <string name="huge">더 크게</string>
+    <!-- Load images -->
+    <string name="load_images">이미지 로드 여부</string>
+    <string name="toggle_image_loading_to_save_mobile_data">이미지 로드 여부를 변경합니다. 예) 모바일 데이터를 아끼기 위해</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">화면 회전</string>
+    <string name="control_screen_rotation">자동 화면회전 여부를 변경합니다</string>
+    <string name="default_">기본값</string>
+    <string name="sensor_ignore_system_settings">센서\n(시스템 설정 무시)</string>
+    <string name="portrait">세로</string>
+    <string name="landscape">가로</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">토르 프리셋 로드</string>
+    <string name="load_proxy_settins_for_tor">토르 (Orbot) 프록시 설정을 로드</string>
+    <string name="proxy">프록시</string>
+    <string name="enable_proxy">프록시를 사용하도록 설정</string>
+    <string name="proxy_dandelion_traffic__appspecific">Dandelion* 트래픽이 방화벽을 우회하도록 설정합니다.\n재시작이 필요합니다. 몇몇 기기에서는 동작하지 않을 수 있습니다.</string>
+    <string name="host">호스트</string>
+    <string name="port">포트</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">프록시 사용을 해제 하려면 다시 시작해야 합니다</string>
+    <string name="orbot_proxy_preset_loaded">Orbot 프록시 프리셋 로드</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">개인 설정</string>
+    <string name="open_diaspora_account_settings__appspecific">Diaspora* 계정 설정 열기</string>
+    <string name="manage_your_contact_list">연락처 리스트 관리</string>
+    <string name="manage_hashtags">해시태그 관리</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">이미 팔로우된 해시태그 언팔로우</string>
+    <string name="change_account">계정 변경</string>
+    <string name="loug_warning_description__appspecific">로컬 세션 데이터를 지우고, 다른 diaspora* 포드/계정으로 전환</string>
+    <string name="logout_warning_description">모든 쿠키 및 세션 데이터를 지웁니다. 계정을 변경합니까?</string>
+    <string name="clear_cache">캐시 삭제</string>
+    <string name="clear_webview_cache">WebView 캐시 지우기</string>
+    <string name="intellihide_toolbars__appspecific">스크롤 하는 동안 위쪽 및 아래쪽 툴바 자동으로 숨기기</string>
+    <string name="intellihide_toolbars">Intellihide 툴바</string>
+    <string name="append_shared_by_notice">꼬릿말 붙이기</string>
+    <string name="append_shared_by_notice__appspecific">어플리케이션 꼬릿말을 붙입니다: [via #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">기타</string>
+    <string name="full_reset">전체 리셋</string>
+    <string name="wipe_settings_and_logout">모든 계정에서 로그아웃 하고 응용 프로그램에 관련된 모든 로컬 설정을 삭제</string>
+    <string name="wipe_settings_warning__appspecific">이 어플리케이션의 모든 변경 된 설정은 기본값으로 재설정 되며 모든 포드에서 로그아웃 됩니다. 다운로드 된 이미지는 그대로 있을 것입니다. 계속합니까?</string>
+    <string name="about">이 앱에 대해서..</string>
+    <string name="license">라이선스</string>
+    <string name="debugging">디버깅</string>
+    <string name="application">어플리케이션</string>
+    <string name="device">기기</string>
+    <string name="diaspora_pod__appspecific">diaspora* 포드</string>
+    <string name="debug_log">디버그 로그</string>
+    <string name="debug_log_verbose">디버그 로그 (자세한 정보)</string>
+    <string name="app_version_with_arg">앱 버전: %1$s</string>
+    <string name="android_version_witharg">안드로이드 버전: %1$s</string>
+    <string name="device_name_witharg">기기 이름: %1$s</string>
+    <string name="code_name_witharg">코드네임: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">포드 프로필 이름: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">포드 도메인: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">디버그 로그가 클립보드에 복사되었습니다</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* 은 소셜 네트워크인 diaspora* 의 어플리케이션입니다. 툴바, 토르 등의 프록시서버 지원 등의 유용한 기능들을 포함하고 있습니다.</string>
+    <string name="contribute_code">개발에 도움을 주세요!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* 은 diaspora* 의 자유로움과 아이디어를 따라 개발됩니다. 기여하고 싶으세요? 그럼 해주십시오! 저희는 소규모의 팀으로 운영되고 있으므로 모든 기여활동을 감사히 생각합니다!</string>
+    <string name="get_the_source">소스코드</string>
+    <string name="translate_the_app">앱 번역하기</string>
+    <string name="let_me_translate">번역하기</string>
+    <string name="give_feedback">피드백</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* 은 아직 개발단계입니다. 제안사항이나 피드백이 있으시면 버그 트래커를 이용해 알려주세요!</string>
+    <string name="report_bugs">버그 신고</string>
+    <string name="spread_the_word">당신은 홍보대사</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Diaspora* 와 #dandelion 에 대해 가족들과 친구들에게 이야기해보세요. 혹은 블로그나 인터넷 커뮤니티에 글을 써보시고요. 여러분의 의견을 듣고싶습니다!</string>
+    <string name="share_the_app">앱 공유</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">#dandelion 이거 완전 물건인데요! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">관리자</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">현재 개발 및 관리 주체: &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">기여자</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt; 감사합니다!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ License</string>
+    <string name="show_third_party_licenses">서드파티 라이브러리</string>
+    <string name="the_following_libraries_are_used">다음의 라이브러리들이 사용됬습니다:</string>
+    <string name="inspiration_from_leafpic__appspecific">LeafPic에서 약간의 영감을 받았으며, 코드들도 일부 차용했습니다.
+한번 사용해보세요! 무료 소프트웨어 입니다!</string>
+    <string name="tell_me_more">더 자세히 보기</string>
+</resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-mk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index a38bf313..2f9811b6 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Application -->
     <string name="reload">വീണ്ടും ലോഡ് ചെയ്യുക</string>
+    <string name="cancel">റദ്ദാക്കുക</string>
     <!-- Common Words -->
     <string name="settings">ക്രമീകരണങ്ങൾ</string>
     <string name="notifications">അറിയിപ്പുകൾ</string>
@@ -48,7 +49,7 @@
     <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="share_dotdotdot">പങ്കുവയ്ക്കുക…</string>
     <string name="by_tags">ടാഗുകളെ</string>
     <string name="by_people">ആളുകളെ</string>
     <string name="please_add_a_name">പേര് ചേർക്കുക</string>
@@ -71,25 +72,6 @@
     <string name="pod_address">പോഡ് വിലാസം</string>
     <string name="missing_value">കാണാതായ മൂല്യം</string>
     <string name="jump_to_last_visited_page_in_stream__appspecific">സ്ട്രീമിലെ അവസാനമായി സന്ദർശിച്ച പേജിലേക്ക് പോകുക?</string>
-
-    <string name="about">കുറിച്ച്</string>
-    <string name="license">ലൈസൻസ്</string>
-    <string name="debugging">തെറ്റു കണ്ടുപിടിക്കുക</string>
-    <string name="application">ആപ്പ്ളിക്കേഷൻ</string>
-    <string name="device">ഉപകരണം</string>
-    <string name="diaspora_pod__appspecific">diaspora* പോഡ്</string>
-    <string name="debug_log">തിരുത്തിയ തെറ്റുകളുടെ പട്ടിക</string>
-    <string name="debug_log_verbose">തിരുത്തിയ തെറ്റുകൾ (വേർബോസ്)</string>
-    <string name="app_version_with_arg">ആപ്പ് വേർഷൻ: %1$s</string>
-    <string name="android_version_witharg">ആൻഡ്രോയ്ഡ് വേർഷൻ: %1$s</string>
-    <string name="device_name_witharg">ഉപകരണത്തിന്റെ പേര്:%1$s</string>
-    <string name="code_name_witharg">കോഡ്നെയിം: %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="the_following_libraries_are_used">താഴെ പറഞ്ഞിരിക്കുന്ന ലൈബ്രറികൾ ഉപയോഗിച്ചിരിക്കുന്നു:</string>
-    <string name="inspiration_from_leafpic__appspecific">ഞങ്ങൾ ചില കോഡുകൾ കടമെടുത്തതും പ്രചോദനമായതും ലീഫ്പിക് ഇൽ നിന്നാണ്. ഒന്നു പരിശോധിക്കൂ.. അതും സ്വതന്ത്ര സോഫ്റ്റ്‌വേർ ആണ്!</string>
-    <string name="tell_me_more">വിശദീകരിക്കുക</string>
-
-    <!-- Key Names (Untranslatable) -->
     <!-- Operability -->
     <string name="top_toolbar_loads_stream__appsp">മുകളിലെ ടൂൾബാർ സ്‌ട്രീം ലോഡ് ചെയ്യുന്നു</string>
     <string name="click_empty_space_top_toolbar_load_stream__appspecific">ടൂൾബാറിലെ ഒഴിഞ്ഞ സ്ഥലത്തു ക്ലിക്ക് ചെയ്തു സ്‌ട്രീം തുറക്കുക</string>
@@ -156,8 +138,30 @@
     <string name="unfollow_already_followed_hashtags__appspecific">പിന്തുടർന്ന് വന്ന ഹാഷ്ടാഗുകൾ പിന്തുടരാതിരിക്കുക</string>
     <string name="change_account">അക്കൗണ്ട് മാറ്റുക</string>
     <string name="loug_warning_description__appspecific">പ്രാദേശികമായ സെഷൻ ഡാറ്റ മായ്ച്ച ശേഷം മറ്റൊരു ഡയസ്പോറ* പോഡ്/അക്കൗണ്ട് ലേക്ക് മാറുക</string>
+    <string name="logout_warning_description">ഇത് താങ്കളുടെ കുക്കികളും സെഷൻ ഡാറ്റയും തുടച്ചുനീക്കും. താങ്കൾക്ക് അക്കൗണ്ട് മാറ്റണമെന്ന് ഉറപ്പുണ്ടോ?</string>
+    <string name="clear_cache">കാഷ് തുടച്ചുനീക്കുക</string>
+    <string name="clear_webview_cache">വെബ്വ്യൂ കാഷ് തുടച്ചുനീക്കുക</string>
     <string name="intellihide_toolbars__appspecific">മുകളിലെയും ചുവട്ടിലെയും ടൂൾബാറുകൾ സ്ക്രോൾ ചെയ്യുമ്പോൾ താനേ അപ്രത്യക്ഷമാക്കുക</string>
+    <string name="intellihide_toolbars">ടൂൾബാറുകൾ ഇന്റലിഹൈഡ് ചെയ്യുക</string>
+    <string name="append_shared_by_notice">അറിയിപ്പാൽ പങ്കുവച്ചത് എന്ന് കൂട്ടിച്ചേർക്കുക</string>
     <!-- More -->
     <string name="enable_basic_adblocker_description">ലളിതമായ ആഡ്ബ്ലോക്കർ സജ്ജമാക്കുക. പരസ്യങ്ങൾ ചിലപ്പോൾ ഉൾപ്പെടാം. ഉദാ: എംബെഡ്ഡ് ചെയ്‌ത കാഴ്ചയിൽ</string>
     <string name="block_advertisments">പരസ്യങ്ങൾ തടയുക</string>
+    <string name="about">കുറിച്ച്</string>
+    <string name="license">ലൈസൻസ്</string>
+    <string name="debugging">തെറ്റു കണ്ടുപിടിക്കുക</string>
+    <string name="application">ആപ്പ്ളിക്കേഷൻ</string>
+    <string name="device">ഉപകരണം</string>
+    <string name="diaspora_pod__appspecific">diaspora* പോഡ്</string>
+    <string name="debug_log">തിരുത്തിയ തെറ്റുകളുടെ പട്ടിക</string>
+    <string name="debug_log_verbose">തിരുത്തിയ തെറ്റുകൾ (വേർബോസ്)</string>
+    <string name="app_version_with_arg">ആപ്പ് വേർഷൻ: %1$s</string>
+    <string name="android_version_witharg">ആൻഡ്രോയ്ഡ് വേർഷൻ: %1$s</string>
+    <string name="device_name_witharg">ഉപകരണത്തിന്റെ പേര്:%1$s</string>
+    <string name="code_name_witharg">കോഡ്നെയിം: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">പോഡിന്റെ അഡ്രസ്:%1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="the_following_libraries_are_used">താഴെ പറഞ്ഞിരിക്കുന്ന ലൈബ്രറികൾ ഉപയോഗിച്ചിരിക്കുന്നു:</string>
+    <string name="inspiration_from_leafpic__appspecific">ഞങ്ങൾ ചില കോഡുകൾ കടമെടുത്തതും പ്രചോദനമായതും ലീഫ്പിക് ഇൽ നിന്നാണ്. ഒന്നു പരിശോധിക്കൂ.. അതും സ്വതന്ത്ര സോഫ്റ്റ്‌വേർ ആണ്!</string>
+    <string name="tell_me_more">വിശദീകരിക്കുക</string>
 </resources>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-mr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
new file mode 100644
index 00000000..19084ead
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Åpne navigasjonsskuff</string>
+    <string name="close_navdrawer">Lukk navigasjonsskuff</string>
+    <!-- Common Words -->
+    <string name="settings">Innstillinger</string>
+    <string name="search">Søk</string>
+    <string name="changelog">Endringslogg</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Mor</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">Skjul statusfelt</string>
+    <string name="show_title">Vis tittel</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Utseende</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="general">Hovedinnstillinger</string>
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Endre programmets språk. Omstart kreves før endringer trer i effekt</string>
+    <string name="language">Språk</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">Forvalg</string>
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="miscellaneous">Ymse</string>
+    <string name="about">Om</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Bidragsytere</string>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dd618cc7..41ef2f93 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Open navigatiemenu</string>
+    <string name="close_navdrawer">Sluit navigatiemenu</string>
     <string name="reload">Herladen</string>
+    <string name="close">Sluit</string>
+    <string name="cancel">Annuleren</string>
     <!-- Common Words -->
     <string name="settings">Instellingen</string>
     <string name="notifications">Meldingen</string>
@@ -43,12 +47,12 @@
     <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="new_post">Nieuw bericht</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="exit_app">Afsluiten</string>
     <string name="toggle_mobile_desktop_view">Desktop weergave in-/uitschakelen</string>
-    <string name="share_dotdotdot">Delen&#8230;</string>
+    <string name="share_dotdotdot">Delen…</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>
@@ -71,48 +75,11 @@
     <string name="pod_address">Pod adres</string>
     <string name="missing_value">Ontbrekende waarde</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>
-    <string name="debugging">Foutopsporing</string>
-    <string name="application">Applicatie</string>
-    <string name="device">Apparaat</string>
-    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
-    <string name="debug_log">Foutoplossing</string>
-    <string name="debug_log_verbose">Foutoplossing (Verbose)</string>
-    <string name="app_version_with_arg">App Versie: %1$s</string>
-    <string name="android_version_witharg">Android Versie: %1$s</string>
-    <string name="device_name_witharg">Apparaatnaam: %1$s</string>
-    <string name="code_name_witharg">Codenaam: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Pod Profielnaam: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Pod Domein: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Debuglog gekopieerd naar klembord</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* is jouw bedrijfsapp om te surfen op het sociale netwerk diaspora*. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Netwerk aan uw sociale ervaringen.</string>
-    <string name="contribute_code">Code bijdragen!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* is vrij zoals in vrijheid ontwikkeld en volgt de ideeën van het diaspora* project. Als u iets wilt bijdragen, gaat uw gang! Op dit moment zijn we een erg klein team, dus we waarderen elke vorm van hulp!</string>
-    <string name="get_the_source">Krijg de bron</string>
-    <string name="translate_the_app">Vertaal deze App!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">De app niet beschikbaar in jouw taal? Jij kan dat veranderen! Waarom zou u niet helpen met vertalen? We gebruiken het crowdin platform zodat iedereen kan helpen met vertalen.</string>
-    <string name="let_me_translate">Laat me vertalen</string>
-    <string name="give_feedback">Geef Feedback!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* is nog in ontwikkeling, dus heeft u suggesties of enige vorm van feedback, gebruik dan onze bug tracker om ons te laten weten!</string>
-    <string name="report_bugs">Bugs melden</string>
-    <string name="spread_the_word">Vertel het verder!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Vertel uw vrienden en familie over diaspora* en #dandelion! Waarom blogt u niet over uw ervaringen? We willen graag uw ervaringen horen!</string>
-    <string name="share_the_app">Deel deze app</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Bekijk #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Onderhouders</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Deze app wordt momenteel ontwikkeld en onderhouden door &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="contributors">Bijdragers</string>
-    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; dank u!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3 + licentie</string>
-    <string name="show_third_party_licenses">3rd Party Bibliotheken</string>
-    <string name="the_following_libraries_are_used">De volgende bibliotheken worden gebruikt:</string>
-    <string name="inspiration_from_leafpic__appspecific">We zijn geïnspireerd door LeafPic en lenen er code van. Ga kijken, deze vrije software is het proberen waard!</string>
-    <string name="tell_me_more">Vertel me meer</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="hide_statusbar_in_mainview">Verberg statusbalk op hoofdweergave</string>
+    <string name="hide_statusbar">Verberg statusbalk</string>
+    <string name="show_title_in_main_view">Toon titel in de hoofdweergave</string>
+    <string name="show_title">Toon titel</string>
+    <string name="launcher_shortcut">Launcher snelkoppeling</string>
     <!-- Operability -->
     <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>
@@ -193,4 +160,48 @@
     <string name="wipe_settings_warning__appspecific">Dit zal alle instellingen terugzetten en je uitloggen bij elke pod. Je gedownloade afbeeldingen blijven onaangeraakt. Weet je zeker dat je door wilt gaan?</string>
     <string name="enable_basic_adblocker_description">Simpele AdBlocker inschakelen. Advertenties kunnen bijvoorbeeld bij ingesloten weergaven erbij zitten</string>
     <string name="block_advertisments">Blokkeer advertenties</string>
+    <string name="about">Over</string>
+    <string name="license">Licentie</string>
+    <string name="debugging">Foutopsporing</string>
+    <string name="application">Applicatie</string>
+    <string name="device">Apparaat</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Foutoplossing</string>
+    <string name="debug_log_verbose">Foutoplossing (Verbose)</string>
+    <string name="app_version_with_arg">App Versie: %1$s</string>
+    <string name="android_version_witharg">Android Versie: %1$s</string>
+    <string name="device_name_witharg">Apparaatnaam: %1$s</string>
+    <string name="code_name_witharg">Codenaam: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profielnaam: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Domein: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Debuglog gekopieerd naar klembord</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* is jouw bedrijfsapp om te surfen op het sociale netwerk diaspora*. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Netwerk aan uw sociale ervaringen.</string>
+    <string name="contribute_code">Code bijdragen!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* is vrij zoals in vrijheid ontwikkeld en volgt de ideeën van het diaspora* project. Als u iets wilt bijdragen, gaat uw gang! Op dit moment zijn we een erg klein team, dus we waarderen elke vorm van hulp!</string>
+    <string name="get_the_source">Krijg de bron</string>
+    <string name="translate_the_app">Vertaal deze App!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">De app niet beschikbaar in jouw taal? Jij kan dat veranderen! Waarom zou u niet helpen met vertalen? We gebruiken het crowdin platform zodat iedereen kan helpen met vertalen.</string>
+    <string name="let_me_translate">Laat me vertalen</string>
+    <string name="give_feedback">Geef Feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* is nog in ontwikkeling, dus heeft u suggesties of enige vorm van feedback, gebruik dan onze bug tracker om ons te laten weten!</string>
+    <string name="report_bugs">Bugs melden</string>
+    <string name="spread_the_word">Vertel het verder!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Vertel uw vrienden en familie over diaspora* en #dandelion! Waarom blogt u niet over uw ervaringen? We willen graag uw ervaringen horen!</string>
+    <string name="share_the_app">Deel deze app</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey! Bekijk #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Onderhouders</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Deze app wordt momenteel ontwikkeld en onderhouden door &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Bijdragers</string>
+    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; dank u!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3 + licentie</string>
+    <string name="show_third_party_licenses">3rd Party Bibliotheken</string>
+    <string name="the_following_libraries_are_used">De volgende bibliotheken worden gebruikt:</string>
+    <string name="inspiration_from_leafpic__appspecific">We zijn geïnspireerd door LeafPic en lenen er code van. Ga kijken, deze vrije software is het proberen waard!</string>
+    <string name="tell_me_more">Vertel me meer</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Inschakelen om Youtube links te openen op externe app</string>
+    <string name="youtube_links">Youtube links</string>
+    <string name="change_the_theme_of_your_account">Wijzig het thema van uw account</string>
+    <string name="pull_to_refresh">Trek om te vernieuwen</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Trek omlaag op de bovenkant van de pagina om te vernieuwen.\nU moet de app opnieuw opstarten om wijzigingen door te voeren.</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no/strings.xml
similarity index 64%
rename from app/src/main/res/values-no-rNO/strings.xml
rename to app/src/main/res/values-no/strings.xml
index 40dd0a60..e56fc1d8 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Key Names (Untranslatable) -->
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">Innstillinger</string>
+    <string name="search">Søk</string>
+    <string name="changelog">Endringslogg</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Mer</string>
+    <string name="share_dotdotdot">Del…</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
     <!-- Operability -->
     <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>
@@ -25,11 +36,19 @@
     <string name="color_of_progressbar">Fremgangslinjefarge</string>
     <string name="amoled_mode">AMOLED-modus</string>
     <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Bytt språket for denne appen og omstart slik at endringen kan ta sted</string>
+    <string name="language">Språk</string>
     <!-- Font size -->
     <!-- Load images -->
     <!-- Screen rotation -->
     <!-- Proxy -->
     <!-- Chrome custom tabs -->
     <!-- Diaspora Settings -->
+    <string name="clear_cache">Tøm hurtigminne</string>
     <!-- More -->
+    <string name="miscellaneous">Forskjellig</string>
+    <string name="about">Om</string>
+    <string name="license">Lisens</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Medvirkende</string>
 </resources>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
new file mode 100644
index 00000000..91176dc2
--- /dev/null
+++ b/app/src/main/res/values-or/strings.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">ନେଭିଗେସନ୍ ଡ୍ରୟର୍ ଖୋଲନ୍ତୁ</string>
+    <string name="close_navdrawer">ନେଭିଗେସନ୍ ଡ୍ରୟର୍ ବନ୍ଦ କରନ୍ତୁ</string>
+    <string name="reload">ପୁନଃଲୋଡ୍ କରନ୍ତୁ</string>
+    <string name="close">ବନ୍ଦ କରନ୍ତୁ</string>
+    <string name="cancel">ବାତିଲ୍ କର</string>
+    <!-- Common Words -->
+    <string name="settings">ସେଟିଂସମୂହ</string>
+    <string name="notifications">ବିଜ୍ଞପ୍ତି</string>
+    <string name="conversations">ବାର୍ତ୍ତାଳାପ</string>
+    <string name="profile">ପ୍ରୋଫାଇଲ୍</string>
+    <string name="search">ସନ୍ଧାନ କରନ୍ତୁ</string>
+    <string name="changelog">ପରିବର୍ତ୍ତନ ଲଗ୍</string>
+    <string name="statistics">ପରିସଂଖ୍ୟାନ</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">ସବୁ ବିଜ୍ଞପ୍ତି</string>
+    <!-- Pod Activity -->
+    <string name="confirmation">ନିଶ୍ଚିତକରଣ</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">ଅଧିକ</string>
+    <string name="help_license">ବିଷୟରେ | ସହାୟତା</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="link_adress_copied">ଲିଙ୍କ୍ ଠିକଣା କପି ହୋଇଛି …</string>
+    <string name="go_to_top">ଶୀର୍ଷକୁ ଯାଆନ୍ତୁ</string>
+    <string name="exit_app">ଆପ୍ ବାହାରକୁ ଯାଆନ୍ତୁ</string>
+    <string name="toggle_mobile_desktop_view">ମୋବାଇଲ୍/ଡେସ୍କଟପ୍ ଦର୍ଶନ ଟୋଗଲ୍ କରନ୍ତୁ</string>
+    <string name="share_dotdotdot">ଅଂଶୀଦାର…</string>
+    <string name="please_add_a_name">ଦୟାକରି ଏକ ନାମ ଯୋଡ଼ନ୍ତୁ</string>
+    <string name="share_link_address">ଲିଙ୍କ୍ ଠିକଣା ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="save_image">ପ୍ରତିଛବି ସଞ୍ଚୟ କରନ୍ତୁ</string>
+    <string name="share_image">ପ୍ରତିଛବି ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">ପ୍ରତିଛବି ଲୋଡ୍ କରିବାରେ ଅସମର୍ଥ</string>
+    <!-- Permissions -->
+    <string name="protocol">ପ୍ରୋଟୋକଲ୍</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="launcher_shortcut">ଉନ୍ମୋଚକ ସର୍ଟକଟ୍</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">ରୂପ</string>
+    <string name="network">ନେଟୱର୍କ</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="user">ଉପଭୋକ୍ତା</string>
+    <string name="general">ସାଧାରଣ</string>
+    <string name="admin">ବ୍ୟବସ୍ଥାପକ</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">ଥିମ୍ ଏବଂ ରଙ୍ଗ</string>
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">ଏହି ଆପ୍ ର ଭାଷା ବଦଳାନ୍ତୁ। ପରିବର୍ତ୍ତନଗୁଡ଼ିକ କାର୍ଯ୍ୟକାରୀ ହେବା ପାଇଁ ଆପ୍ ପୁନଃଆରମ୍ଭ କରନ୍ତୁ</string>
+    <string name="language">ଭାଷା</string>
+    <string name="system_language">ସିଷ୍ଟମ୍ ଭାଷା</string>
+    <!-- Font size -->
+    <string name="font_size">ଫଣ୍ଟ ଆକାର</string>
+    <string name="normal">ସାଧାରଣ</string>
+    <string name="large">ବଡ଼</string>
+    <string name="huge">ବିରାଟ</string>
+    <!-- Load images -->
+    <string name="load_images">ପ୍ରତିଛବିଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">ସ୍କ୍ରିନ୍ ଘୂର୍ଣ୍ଣନ</string>
+    <string name="default_">ଡିଫଲ୍ଟ</string>
+    <string name="portrait">ପୋର୍ଟ୍ରେଟ୍</string>
+    <string name="landscape">ଲ୍ୟାଣ୍ଡସ୍କେପ୍</string>
+    <!-- Proxy -->
+    <string name="proxy">ପ୍ରକ୍ସି</string>
+    <string name="enable_proxy">ପ୍ରକ୍ସି ସକ୍ଷମ କରନ୍ତୁ</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="change_account">ଆକାଉଣ୍ଟ୍ ବଦଳାନ୍ତୁ</string>
+    <string name="logout_warning_description">ଏହା ସମସ୍ତ କୁକୀ ଏବଂ ଅଧିବେଶନ ଡାଟା ଲିଭାଇଦେବ। ଆପଣ ପ୍ରକୃତରେ ଆପଣଙ୍କ ଆକାଉଣ୍ଟ୍ ପରିବର୍ତ୍ତନ କରିବାକୁ ଚାହାଁନ୍ତି କି?</string>
+    <!-- More -->
+    <string name="miscellaneous">ଵିଵିଧ</string>
+    <string name="full_reset">ପୂର୍ଣ୍ଣ ପୁନଃସେଟ୍</string>
+    <string name="enable_basic_adblocker_description">ମୌଳିକ AdBlocker ସକ୍ଷମ କରନ୍ତୁ। ବିଜ୍ଞାପନଗୁଡ଼ିକ ଗ୍ରଥିତ ଦର୍ଶନରେ ଅନ୍ତର୍ଭୁକ୍ତ ହୋଇପାରେ</string>
+    <string name="block_advertisments">ବିଜ୍ଞାପନଗୁଡ଼ିକୁ ଅବରୋଧ କରନ୍ତୁ</string>
+    <string name="about">ବିଷୟରେ</string>
+    <string name="license">ଲାଇସେନ୍ସ</string>
+    <string name="application">ଆପ୍ଲିକେସନ୍</string>
+    <string name="device">ଡିଭାଇସ୍</string>
+    <string name="app_version_with_arg">ଆପ୍ ସଂସ୍କରଣ: %1$s</string>
+    <string name="android_version_witharg">ଆଣ୍ଡ୍ରଏଡ୍ ସଂସ୍କରଣ: %1$s</string>
+    <string name="device_name_witharg">ଡିଭାଇସ୍ ନାମ: %1$s</string>
+    <string name="code_name_witharg">କୋଡ୍ ନାମ: %1$s</string>
+    <string name="get_the_source">ଉତ୍ସ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+    <string name="translate_the_app">ଆପ୍ ଅନୁବାଦ କରନ୍ତୁ!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">ଆପ୍ ଆପଣଙ୍କ ଭାଷାରେ ଉପଲବ୍ଧ ନାହିଁ କି? ଆପଣ ଏହା ବଦଳାଇପାରିବେ! ଆପଣ ଏହାକୁ ଅନୁବାଦ କରି ଆମକୁ କାହିଁକି ସାହାଯ୍ୟ କରୁନାହାଁନ୍ତି? ଆପ୍ ଅନୁବାଦ କରିବାରେ ଯେକୌଣସି ବ୍ୟକ୍ତିଙ୍କୁ ସକ୍ଷମ କରିବା ପାଇଁ ଆମେ Crowdin ବ୍ୟବହାର କରୁ।</string>
+    <string name="let_me_translate">ମୋତେ ଅନୁବାଦ କରିବାକୁ ଦିଅ</string>
+    <string name="give_feedback">ମତାମତ ଦିଅନ୍ତୁ!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* ଏପର୍ଯ୍ୟନ୍ତ ବିକାଶରେ ଅଛି, ତେଣୁ ଯଦି ଆପଣଙ୍କର ପରାମର୍ଶ କିମ୍ୱା କୌଣସି ପ୍ରକାରର ମତାମତ ରହିଛି, ତେବେ ଦୟାକରି ଆମକୁ ଜଣାଇବା ପାଇଁ ଆମର ବଗ୍ ଟ୍ରାକର୍ ବ୍ୟବହାର କରନ୍ତୁ!</string>
+    <string name="report_bugs">ବଗ୍‌ ରିପୋର୍ଟ୍‌ କରନ୍ତୁ</string>
+    <string name="spread_the_word">ଶବ୍ଦ ବିସ୍ତାର କରନ୍ତୁ!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">diaspora* ଏବଂ #dandelion ବିଷୟରେ ଆପଣଙ୍କ ବନ୍ଧୁ ଏବଂ ପରିବାରକୁ କୁହନ୍ତୁ! ଆପଣ ଆପଣଙ୍କର ଅନୁଭୂତି ବିଷୟରେ କାହିଁକି ବ୍ଲଗ୍ କରୁନାହଁ? ଆମେ ଆପଣଙ୍କଠାରୁ ଶୁଣିବାକୁ ପସନ୍ଦ କରିବୁ!</string>
+    <string name="share_the_app">ଆପ୍ ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">ଆଜ୍ଞା! #dandelion କୁ ଥରେ ଦେଖିଯାଆନ୍ତୁ! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">ରକ୍ଷଣାବେକ୍ଷଣକାରୀ</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">ଏହି ଆପ୍ ବର୍ତ୍ତମାନ &lt;br&gt;&lt;br&gt;%1$sଙ୍କ ଦ୍ୱାରା ବିକାଶ ଓ ରକ୍ଷଣାବେକ୍ଷଣ କରାଯାଉଛି</string>
+    <string name="contributors">ଯୋଗଦାନକାରୀ</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;ଧନ୍ୟବାଦ!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ ଲାଇସେନ୍ସ</string>
+    <string name="show_third_party_licenses">ତୃତୀୟ-ପକ୍ଷ ଲାଇବ୍ରେରୀ</string>
+    <string name="the_following_libraries_are_used">ନିମ୍ନଲିଖିତ ଲାଇବ୍ରେରୀଗୁଡ଼ିକ ବ୍ୟବହାର ହୋଇଛି:</string>
+    <string name="inspiration_from_leafpic__appspecific">ଆମେ LeafPic ରୁ କିଛି ପ୍ରେରଣା ଏବଂ କୋଡ୍ ନେଇଛୁ। ଯାଆନ୍ତୁ ଏହାକୁ ଥରେ ଦେଖି ଆସନ୍ତୁ, ଏହା ବି ଏକ ମାଗଣା ସଫ୍ଟୱେର୍!</string>
+    <string name="tell_me_more">ମୋତେ ଆହୁରି କୁହନ୍ତୁ</string>
+    <string name="enable_to_open_youtube_links_on_external_app">ବାହ୍ୟ ଆପରେ YouTube ଲିଙ୍କ୍ ଖୋଲିବା ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ</string>
+    <string name="youtube_links">YouTube ଲିଙ୍କଗୁଡ଼ିକ</string>
+    <string name="change_the_theme_of_your_account">ଆପଣଙ୍କ ଆକାଉଣ୍ଟର ଥିମ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
+    <string name="pull_to_refresh">ସତେଜ କରିବାକୁ ଟାଣନ୍ତୁ</string>
+</resources>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-pa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 92373216..520b2632 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Otwórz panel nawigacyjny</string>
+    <string name="close_navdrawer">Zamknij panel nawigacyjny</string>
     <string name="reload">Przeładuj</string>
+    <string name="close">Zamknij</string>
+    <string name="cancel">Anuluj</string>
     <!-- Common Words -->
     <string name="settings">Ustawienia</string>
     <string name="notifications">Powiadomienia</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">Udostępnij…</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>
@@ -73,48 +77,9 @@
     <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>
-    <string name="debugging">Debugowanie</string>
-    <string name="application">Aplikacja</string>
-    <string name="device">Urządzenie</string>
-    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
-    <string name="debug_log">Log debugowania</string>
-    <string name="debug_log_verbose">Log debugowania (rozszerzony)</string>
-    <string name="app_version_with_arg">Wersja aplikacji: %1$s</string>
-    <string name="android_version_witharg">Wersja systemu Android: %1$s</string>
-    <string name="device_name_witharg">Nazwa urządzenia: %1$s</string>
-    <string name="code_name_witharg">Nazwa kodowa: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Alias Poda: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Domena Poda: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Log debugowania został skopiowany do schowka</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* to Twój cyfrowy towarzysz umożliwiający korzystanie z sieci społecznościowej diaspora*. Aplikacja posiada użyteczne paski narzędzi oraz obsługę serwerów proxy takich jak Tor, aby korzystanie z diaspory* było jeszcze przyjemniejsze.</string>
-    <string name="contribute_code">Wesprzyj nas kodem!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* to wolne, w sensie wolności, oprogramowanie, zgodne z ideami projektu diaspora*. Jeśli chcesz nam pomóc w rozwoju, zapraszamy! Jesteśmy bardzo małym zespołem i ogromnie doceniamy każdą formę pomocy!</string>
-    <string name="get_the_source">Pobierz kod źródłowy</string>
-    <string name="translate_the_app">Przetłumacz aplikację!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Aplikacja nie jest dostępna w Twoim języku? Możesz to zmienić, pomagając nam w tłumaczeniu! Dzięki platformie crowdin każdy może pomóc w tłumaczeniu aplikacji.</string>
-    <string name="let_me_translate">Chcę pomóc w tłumaczeniu</string>
-    <string name="give_feedback">Wyślij feedback!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* jest ciągle w fazie rozwoju, więc jeśli masz jakiekolwiek sugestie lub chciałbyś podzielić się swoją opinią zrób to za pomocą naszego systemu zgłaszania błędów!</string>
-    <string name="report_bugs">Zgłoś błąd</string>
-    <string name="spread_the_word">Powiedz innym o aplikacji!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Powiedz swoim znajomym i rodzinie o diaspora* oraz #dandelion! Dlaczego miałbyś nie opisać swoich doświadczeń na blogu? Byłoby nam miło usłyszeć, co masz do powiedzenia!</string>
-    <string name="share_the_app">Udostępnij aplikację</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Cześć! Wypróbuj #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Twórcy aplikacji</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Rozwojem i utrzymaniem aplikacji aktualnie zajmują się &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Wnieśli wkład</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Wielkie dzięki!</string>
-    <string name="gnu_gplv3_license">Licencja GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Biblioteki zewnętrzne</string>
-    <string name="the_following_libraries_are_used">Zostały użyte następujące biblioteki zewnętrzne:</string>
-    <string name="inspiration_from_leafpic__appspecific">Zaczerpnęliśmy kilka pomysłów oraz trochę kodu z aplikacji LeafPic. Wypróbuj ją, to także wolne oprogramowanie!</string>
-    <string name="tell_me_more">Chcę wiedzieć więcej</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="show_title_in_main_view">Pokaż tytuł w widoku głównym</string>
+    <string name="show_title">Pokaż tytuł</string>
+    <string name="launcher_shortcut">Skrót dla launchera</string>
     <!-- Operability -->
     <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>
@@ -142,7 +107,7 @@
     <!-- 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>
-    <string name="language_change_restart_description">Zmień język aplikacji. Uruchom ponownie aplikację, aby zobaczyć zmiany</string>
+    <string name="language_change_restart_description">Zmienia język aplikacji. Zrestartuj żeby wprowadzić zmiany</string>
     <string name="language">Język</string>
     <string name="system_language">Język systemowy</string>
     <!-- Font size -->
@@ -195,4 +160,47 @@
     <string name="wipe_settings_warning__appspecific">Ta operacja przywróci wszystkie zmodyfikowane przez Ciebie ustawienia aplikacji do ich domyślnych wartości i wyloguje Cię ze wszystkich Podów. Na pewno chcesz to zrobić?</string>
     <string name="enable_basic_adblocker_description">Włącz prosty AdBlocker. Reklamy mogą znajdować się m.in. w osadzonych widokach</string>
     <string name="block_advertisments">Blokuj reklamy</string>
+    <string name="about">Informacje</string>
+    <string name="license">Licencja</string>
+    <string name="debugging">Debugowanie</string>
+    <string name="application">Aplikacja</string>
+    <string name="device">Urządzenie</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Log debugowania</string>
+    <string name="debug_log_verbose">Log debugowania (rozszerzony)</string>
+    <string name="app_version_with_arg">Wersja aplikacji: %1$s</string>
+    <string name="android_version_witharg">Wersja systemu Android: %1$s</string>
+    <string name="device_name_witharg">Nazwa urządzenia: %1$s</string>
+    <string name="code_name_witharg">Nazwa kodowa: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Alias Poda: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domena Poda: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Log debugowania został skopiowany do schowka</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* to Twój cyfrowy towarzysz umożliwiający korzystanie z sieci społecznościowej diaspora*. Aplikacja posiada użyteczne paski narzędzi oraz obsługę serwerów proxy takich jak Tor, aby korzystanie z diaspory* było jeszcze przyjemniejsze.</string>
+    <string name="contribute_code">Wesprzyj nas kodem!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* to wolne, w sensie wolności, oprogramowanie, zgodne z ideami projektu diaspora*. Jeśli chcesz nam pomóc w rozwoju, zapraszamy! Jesteśmy bardzo małym zespołem i ogromnie doceniamy każdą formę pomocy!</string>
+    <string name="get_the_source">Pobierz kod źródłowy</string>
+    <string name="translate_the_app">Przetłumacz aplikację!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Aplikacja nie jest dostępna w Twoim języku? Możesz to zmienić, pomagając nam w tłumaczeniu! Dzięki platformie crowdin każdy może pomóc w tłumaczeniu aplikacji.</string>
+    <string name="let_me_translate">Chcę pomóc w tłumaczeniu</string>
+    <string name="give_feedback">Wyślij feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* jest ciągle w fazie rozwoju, więc jeśli masz jakiekolwiek sugestie lub chciałbyś podzielić się swoją opinią zrób to za pomocą naszego systemu zgłaszania błędów!</string>
+    <string name="report_bugs">Zgłoś błąd</string>
+    <string name="spread_the_word">Powiedz innym o aplikacji!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Powiedz swoim znajomym i rodzinie o diaspora* oraz #dandelion! Dlaczego miałbyś nie opisać swoich doświadczeń na blogu? Byłoby nam miło usłyszeć, co masz do powiedzenia!</string>
+    <string name="share_the_app">Udostępnij aplikację</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Cześć! Wypróbuj #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Twórcy aplikacji</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Rozwojem i utrzymaniem aplikacji aktualnie zajmują się &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Współautorzy</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Wielkie dzięki!</string>
+    <string name="gnu_gplv3_license">Licencja GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Biblioteki zewnętrzne</string>
+    <string name="the_following_libraries_are_used">Zostały użyte następujące biblioteki zewnętrzne:</string>
+    <string name="inspiration_from_leafpic__appspecific">Zaczerpnęliśmy kilka pomysłów oraz trochę kodu z aplikacji LeafPic. Wypróbuj ją, to także wolne oprogramowanie!</string>
+    <string name="tell_me_more">Chcę wiedzieć więcej</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Włącz aby otwierać linki do YouTube w zewnętrznej aplikacji</string>
+    <string name="youtube_links">Linki YouTube</string>
+    <string name="change_the_theme_of_your_account">Zmień motyw konta</string>
+    <string name="pull_to_refresh">Pociągnij aby odświeżyć</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 83c6738f..682ddefd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -4,11 +4,13 @@
     <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>
+    <string name="close">Fechar</string>
+    <string name="cancel">Cancelar</string>
     <!-- Common Words -->
     <string name="settings">Configurações</string>
     <string name="notifications">Notificações</string>
     <string name="conversations">Conversas</string>
-    <string name="stream">Stream</string>
+    <string name="stream">Transmissão</string>
     <string name="profile">Perfil</string>
     <string name="aspects">Aspectos</string>
     <string name="activities">Atividades</string>
@@ -48,9 +50,9 @@
     <string name="new_post">Nova postagem</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="exit_app">Sair do app</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="share_dotdotdot">Compartilhar…</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>
@@ -72,23 +74,8 @@
     <string name="missing_value">Sem dado</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>
-    <string name="debugging">Depurando</string>
-    <string name="application">Aplicação</string>
-    <string name="device">Dispositivo</string>
-    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
-    <string name="debug_log">Histórico de Depuração</string>
-    <string name="debug_log_verbose">Histórico de depuração (detalhado)</string>
-    <string name="app_version_with_arg">Versão do App: %1$s</string>
-    <string name="android_version_witharg">Versão do Android: %1$s</string>
-    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Domínio do Pod: %1$s</string>
-    <!-- License & help (large amount of text) -->
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="hide_statusbar">Esconder barra de status</string>
+    <string name="show_title">Mostrar título</string>
     <!-- Operability -->
     <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>
@@ -103,7 +90,7 @@
     <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>
+    <string name="admin">Administrador</string>
     <!-- Themes -->
     <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>
@@ -114,7 +101,7 @@
     <string name="amoled_mode">Modo AMOLED</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Notificações estendidas</string>
-    <string name="language_change_restart_description">Alterar o idioma deste aplicativo. Reinicie o aplicativo para as mudanças terem efeito</string>
+    <string name="language_change_restart_description">Muda o idioma do aplicativo. Reinicie o aplicativo para que as alterações entrem em vigor</string>
     <string name="language">Idioma</string>
     <string name="system_language">Idioma do sistema</string>
     <!-- Font size -->
@@ -154,7 +141,10 @@
     <string name="loug_warning_description__appspecific">Apagar dados de sessão local e mudar para outro usuário de outro Pod diaspora*</string>
     <string name="logout_warning_description">Isto apagará todos os dados de sessão e cookies. Você quer realmente mudar sua conta?</string>
     <string name="clear_cache">Limpar cache</string>
+    <string name="clear_webview_cache">Limpar o cache do WebView</string>
     <string name="intellihide_toolbars__appspecific">Ocultar as barras de ferramentas superior e inferior automaticamente durante a rolagem</string>
+    <string name="intellihide_toolbars">Barras de ferramentas auto ocultante</string>
+    <string name="append_shared_by_notice">Acrescentar compartilhado-por-aviso</string>
     <string name="append_shared_by_notice__appspecific">Acrescentar referência a este aplicativo aos textos compartilhados: [via #dandelion]</string>
     <!-- More -->
     <string name="miscellaneous">Diversos</string>
@@ -163,4 +153,25 @@
     <string name="wipe_settings_warning__appspecific">Isto irá retornar todas as configurações alteradas do aplicativo para seus valores padrão e encerrar as sessões de todos os pods. Suas imagens baixadas permanecerão intactas. Tem certeza que deseja prosseguir?</string>
     <string name="enable_basic_adblocker_description">Habilite AdBlocker básico. Anúncios incorporados, p.ex., podem ser vistos</string>
     <string name="block_advertisments">Bloquear anúncios</string>
+    <string name="about">Sobre</string>
+    <string name="license">Licença</string>
+    <string name="debugging">Depurando</string>
+    <string name="application">Aplicação</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Histórico de Depuração</string>
+    <string name="debug_log_verbose">Histórico de depuração (detalhado)</string>
+    <string name="app_version_with_arg">Versão do App: %1$s</string>
+    <string name="android_version_witharg">Versão do Android: %1$s</string>
+    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
+    <string name="code_name_witharg">Codinome: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domínio do Pod: %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Mantenedores</string>
+    <string name="contributors">Colaboradores</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Obrigado!</string>
+    <string name="gnu_gplv3_license">Licença GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Bibliotecas de Terceiros</string>
+    <string name="the_following_libraries_are_used">São usadas as seguintes bibliotecas:</string>
+    <string name="tell_me_more">Conte-me mais</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000..a0b80c09
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Abrir menu de navegação</string>
+    <string name="close_navdrawer">Fechar menu de navegação</string>
+    <string name="reload">Recarregar</string>
+    <string name="close">Fechar</string>
+    <string name="cancel">Cancelar</string>
+    <!-- Common Words -->
+    <string name="settings">Definições</string>
+    <string name="notifications">Notificações</string>
+    <string name="conversations">Conversas</string>
+    <string name="stream">Fluxo</string>
+    <string name="profile">Perfil</string>
+    <string name="aspects">Aspetos</string>
+    <string name="activities">Atividades</string>
+    <string name="liked">Gostou</string>
+    <string name="commented">Comentou</string>
+    <string name="mentions">Menções</string>
+    <string name="public_">Público</string>
+    <string name="search">Pesquisar</string>
+    <string name="contacts">Contactos</string>
+    <string name="changelog">Alterações</string>
+    <string name="statistics">Estatísticas</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">Todas as notificações</string>
+    <string name="also_commented">Também comentou</string>
+    <string name="comment_on_post">Comentar publicação</string>
+    <string name="deleteme_____1">Gostou</string>
+    <string name="mentioned">Mencionou</string>
+    <string name="reshared">Partilhou</string>
+    <string name="started_sharing">Partilha iniciada</string>
+    <!-- Pod Activity -->
+    <string name="could_not_retrieve_list_of_pods__appspecific">Erro: não foi possível obter a lista de pods!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Tem que haver uma ligação à Internet para continuar</string>
+    <string name="confirmation">Confirmação</string>
+    <string name="do_you_want_to_exit">Deseja sair?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Mais</string>
+    <string name="help_license">Acerca | Ajuda</string>
+    <string name="followed_tags">Etiquetas seguidas</string>
+    <string name="public_activities">Atividade pública</string>
+    <string name="reports">Relatórios</string>
+    <string name="share_link_as_text">Partilhar ligação como texto</string>
+    <string name="share_screenshot_of_webpage">Partilhar imagem da página web</string>
+    <string name="take_screenshot_of_webpage">Obter imagem da página web</string>
+    <string name="saving_image_to">Guardar imagem em</string>
+    <string name="saving_screenshot_as">Guardar imagem como:</string>
+    <string name="link_adress_copied">Ligação copiada…</string>
+    <string name="new_post">Nova publicação</string>
+    <string name="go_to_top">Ir para o topo</string>
+    <string name="search_by_tags_or_persons__appspecific">Pesquisar por etiquetas ou por pessoas</string>
+    <string name="exit_app">Sair</string>
+    <string name="toggle_mobile_desktop_view">Alternar entre vista móvel/desktop</string>
+    <string name="share_dotdotdot">Partilhar…</string>
+    <string name="by_tags">por etiquetas</string>
+    <string name="by_people">por pessoa</string>
+    <string name="please_add_a_name">Por favor adicione um nome</string>
+    <string name="share_link_address">Partilhar ligação</string>
+    <string name="save_image">Guardar imagem</string>
+    <string name="share_image">Partilhar imagem</string>
+    <string name="open_in_external_browser">Abrir no navegador externo…</string>
+    <string name="copy_link_adress_to_clipboard">Copiar ligação para área de transferência</string>
+    <string name="copy_image_address_to_clipboard">Copiar endereço da imagem para a área de transferência</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">Não foi possível carregar a imagem</string>
+    <!-- Permissions -->
+    <string name="permission_denied">Permissão recusada.</string>
+    <string name="permission_granted_try_again">Permissão concedida. Tente novamente.</string>
+    <string name="custom_pod">Pod personalizado</string>
+    <string name="pod_name">Nome do Pod</string>
+    <string name="protocol">Protocolo</string>
+    <string name="pod_address">Endereço do Pod</string>
+    <string name="missing_value">Valor em falta</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Ir para a última página visitada no fluxo?</string>
+    <string name="hide_statusbar_in_mainview">Ocultar barra de estado na vista principal</string>
+    <string name="hide_statusbar">Ocultar 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">Atalho para o lançador</string>
+    <!-- Operability -->
+    <string name="top_toolbar_loads_stream__appsp">Barra de ferramentas superior carrega o fluxo</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">Clique num espaço vazio da barra de ferramentas superior para abrir o fluxo</string>
+    <!-- Category Titles -->
+    <string name="appearance">Aparência</string>
+    <string name="network">Rede</string>
+    <string name="pod_settings__appspecfic">Definições do Pod</string>
+    <string name="operability">Operacionalidade</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="navigation_drawer">Controlo de navegação</string>
+    <string name="control_visibility_of_entries_nav_drawer">Controlar exibição das entradas no menu de navegação</string>
+    <string name="user">Utilizador</string>
+    <string name="general">Geral</string>
+    <string name="admin">Administrador</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">Tema e cores</string>
+    <string name="control_which_colors_are_used_in_app">Controlar as cores utilizadas na aplicação</string>
+    <string name="primary_colors">Cor principal</string>
+    <string name="colors_of_toolbars">Cor das barras de ferramentas</string>
+    <string name="accent_color">Cor secundária</string>
+    <string name="color_of_progressbar">Cor da barra de progresso</string>
+    <string name="amoled_mode">Modo AMOLED</string>
+    <string name="amoled_mode_description__app_specific">Substitua as cores com o AMOLED exibe preto amigável em muitas partes do aplicativo. Você precisa reiniciar para alternar esta configuração. Para navegar em diaspora* no escuro, você também precisa ativar o tema escuro, que pode ser encontrado nas configurações da sua conta pessoal diaspora*.</string>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">Notificações expandidas</string>
+    <string name="extendend_notifications_bell_description__appspecific">Estenda o sinal de notificações com um menu suspenso que mostra as categorias de notificação</string>
+    <string name="language_change_restart_description">Altera o idioma da aplicação. Tem que reiniciar a aplicação para aplicar as alterações</string>
+    <string name="language">Idioma</string>
+    <string name="system_language">Idioma do sistema</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">Controlar tamanho do texto na WebView</string>
+    <string name="font_size">Tamanho do tipo de letra</string>
+    <string name="normal">Normal</string>
+    <string name="large">Grande</string>
+    <string name="huge">Enorme</string>
+    <!-- Load images -->
+    <string name="load_images">Carregar imagens</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Alternar carregamento de imagens para poupar dados móveis</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">Rotação do ecrã</string>
+    <string name="control_screen_rotation">Controlar automaticamente a rotação do ecrã</string>
+    <string name="default_">Padrão</string>
+    <string name="sensor_ignore_system_settings">Sensor\n(ignorar definições do sistema)</string>
+    <string name="portrait">Vertical</string>
+    <string name="landscape">Horizontal</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">Carregar predefinição Tor</string>
+    <string name="load_proxy_settins_for_tor">Carregar definições de proxy para Tor (Orbot) Proxy HTTP</string>
+    <string name="proxy">Proxy</string>
+    <string name="enable_proxy">Ativar proxy</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy dandelion*\'s para contornar firewalls.\nPode ser necessário reiniciar e pode não funcionar em alguns telefones.</string>
+    <string name="host">Servidor</string>
+    <string name="port">Porta</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Tem que reiniciar a aplicação para aplicar a alteração</string>
+    <string name="orbot_proxy_preset_loaded">Predefinição de proxy Orbot carregada</string>
+    <!-- Chrome custom tabs -->
+    <string name="open_external_links_with_chrome_custom_tabs_description">Abra links externos com abas personalizadas do Chrome. Chromium, Firefox ou Google Chrome precisa ser instalado para usar este recurso. \nNOTA IMPORTANTE: Guias personalizadas do Chrome não usam servidores proxy configurados!</string>
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">Definições pessoais</string>
+    <string name="open_diaspora_account_settings__appspecific">Abra suas definições da sua conta diaspora*</string>
+    <string name="manage_your_contact_list">Gerir lista de contactos</string>
+    <string name="manage_hashtags">Gerir \'hashtags\'</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Não seguir hashtags já seguidas</string>
+    <string name="change_account">Mudar de conta</string>
+    <string name="loug_warning_description__appspecific">Apagar dados de sessão local e mudar para outro pod/conta diaspora*</string>
+    <string name="logout_warning_description">Isto irá apagar todos os dados de cookies e da sessão. Tem a certeza de que deseja alterar sua conta?</string>
+    <string name="clear_cache">Limpar cache</string>
+    <string name="clear_webview_cache">Limpar cache WebView</string>
+    <string name="intellihide_toolbars__appspecific">Ocultar automaticamente as barras de ferramentas superior e inferior durante a rolagem</string>
+    <string name="intellihide_toolbars">Barra Intellihide</string>
+    <string name="append_shared_by_notice">Anexar compartilhado-por-aviso</string>
+    <string name="append_shared_by_notice__appspecific">Acrescentar uma referência a este aplicativo a textos compartilhados: [via #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">Diversos</string>
+    <string name="full_reset">Resetar tudo</string>
+    <string name="wipe_settings_and_logout">Localmente limpar todas as configurações relacionadas ao aplicativo e sair de todas as contas</string>
+    <string name="wipe_settings_warning__appspecific">Isto irá redefinir todas as configurações alteradas do aplicativo para seus valores padrão e sair de todos os servidores. Suas imagens baixadas permanecerão intactas. Tem certeza que deseja continuar?</string>
+    <string name="enable_basic_adblocker_description">Habilitar o AdBlocker básico. Anúncios podem ser incluídos, por exemplo, em visualizações incorporadas</string>
+    <string name="block_advertisments">Bloquear anúncios</string>
+    <string name="about">Acerca</string>
+    <string name="license">Licença</string>
+    <string name="debugging">Depuração</string>
+    <string name="application">Aplicação</string>
+    <string name="device">Dispositivo</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Registo de depuração</string>
+    <string name="debug_log_verbose">Registo de depuração (detalhado)</string>
+    <string name="app_version_with_arg">Versão: %1$s</string>
+    <string name="android_version_witharg">Versão Android: %1$s</string>
+    <string name="device_name_witharg">Nome do dispositivo: %1$s</string>
+    <string name="code_name_witharg">Nome de código: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nome do perfil Pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domínio Pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Dados copiados para a área de transferência</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* é seu aplicativo companheiro para navegar pela diaspora*. Ele adiciona recursos como barras de ferramentas úteis e suporte para servidores de proxy como a Tor Network para sua experiência social.</string>
+    <string name="contribute_code">Contribua com código!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* é desenvolvido gratuitamente como na Liberdade e segue as ideias do projeto diaspora*. Se você quiser contribuir, vá em frente! Atualmente somos uma equipe muito pequena, então nós apreciamos muito qualquer tipo de ajuda!</string>
+    <string name="get_the_source">Obter o código fonte</string>
+    <string name="translate_the_app">Traduzir a aplicação!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">O aplicativo não está disponível em seu idioma? Você pode alterar isso! Por que você não nos ajuda traduzindo-lo? Nós usamos Stringlate para permitir que alguém traduza o aplicativo.</string>
+    <string name="let_me_translate">Quero participar</string>
+    <string name="give_feedback">Dar Feedback!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* ainda está em desenvolvimento, então se você tiver sugestões ou algum tipo de feedback, por favor, use nosso bug tracker para nos informar!</string>
+    <string name="report_bugs">Reportar erros</string>
+    <string name="spread_the_word">Passe a palavra!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Conte aos seus amigos e familiares sobre diaspora* e #dandelion! Por que você não blog sobre suas experiências? Nós adoraríamos ouvir de você!</string>
+    <string name="share_the_app">Partilhar plicação</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Ei! Confira #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Desenvolvimento</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Esta aplicação está a ser desenvolvida e mantida por &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Colaboradores</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Obrigado!</string>
+    <string name="gnu_gplv3_license">Licença GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Bibliotecas de terceiros</string>
+    <string name="the_following_libraries_are_used">Utilizamos as seguintes bibliotecas:</string>
+    <string name="inspiration_from_leafpic__appspecific">Demos alguma inspiração e código do LeafPic. Vá conferir, é também software livre!</string>
+    <string name="tell_me_more">Saber mais</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Ative para abrir as ligações YouTube na aplicação externa</string>
+    <string name="youtube_links">Ligações YouTube</string>
+    <string name="change_the_theme_of_your_account">Altera o tema da sua conta</string>
+    <string name="pull_to_refresh">Puxar para atualizar</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Deslize de cima para baixo para recarregar.\nTem que reiniciar a aplicação para aplicar as alterações.</string>
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000..b14cad56
--- /dev/null
+++ b/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="reload">Reîncarcă</string>
+    <!-- Common Words -->
+    <string name="settings">Setări</string>
+    <string name="notifications">Notificări</string>
+    <string name="conversations">Conversații</string>
+    <string name="stream">Stream</string>
+    <string name="profile">Profil</string>
+    <string name="aspects">Aspecte</string>
+    <string name="activities">Activități</string>
+    <string name="liked">Apreciate</string>
+    <string name="commented">Comentate</string>
+    <string name="mentions">Mențiuni</string>
+    <string name="public_">Public</string>
+    <string name="search">Căutare</string>
+    <string name="contacts">Contacte</string>
+    <string name="changelog">Jurnalul modificărilor</string>
+    <string name="statistics">Statistici</string>
+    <!-- Notifications dropdown menu -->
+    <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="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="do_you_want_to_exit">Doriţi să ieşiţi?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <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="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…</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 -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Schimbă limba acestei aplicații. Restartează aplicația pentru ca schimbările să ia efect</string>
+    <string name="language">Limbă</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="clear_cache">Goliți memoria cache</string>
+    <!-- More -->
+    <string name="miscellaneous">Diverse</string>
+    <string name="about">Despre</string>
+    <string name="license">Licenţă</string>
+    <string name="debugging">Depanare</string>
+    <string name="application">Aplicaţie</string>
+    <string name="device">Dispozitiv</string>
+    <string name="diaspora_pod__appspecific">Pod diaspora*</string>
+    <string name="debug_log">Jurnal Depanare</string>
+    <string name="debug_log_verbose">Jurnal Depanare (Detaliat)</string>
+    <string name="app_version_with_arg">Versiune aplicație: %1$s</string>
+    <string name="android_version_witharg">Versiune Android: %1$s</string>
+    <string name="device_name_witharg">Nume Dispozitiv: %1$s</string>
+    <string name="code_name_witharg">Nume de cod: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Nume Profil Pod: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Domeniu Pod: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Jurnal Depanare copiat în clipboard</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* este companionul tau pentru navigarea reţelei sociale diaspora *. Adaugă caracteristici cum ar fi utilele bare de instrumente şi suport pentru proxy servere ca Tor Network pentru experienţa ta socială.</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Contribuitori</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8d81bdc5..4aa33db5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Открыть панель навигации</string>
+    <string name="close_navdrawer">Закрыть панель навигации</string>
     <string name="reload">Обновить</string>
+    <string name="close">Закрыть</string>
+    <string name="cancel">Отмена</string>
     <!-- Common Words -->
     <string name="settings">Настройки</string>
     <string name="notifications">Уведомления</string>
@@ -42,13 +46,13 @@
     <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="link_adress_copied">Адрес ссылки скопирован …</string>
     <string name="new_post">Новый пост</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="share_dotdotdot">Поделиться…</string>
     <string name="by_tags">по тегам</string>
     <string name="by_people">по людям</string>
     <string name="please_add_a_name">Пожалуйста, добавьте имя</string>
@@ -74,49 +78,8 @@
     <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>
-    <string name="debugging">Отладка</string>
-    <string name="application">Приложение</string>
-    <string name="device">Устройство</string>
-    <string name="diaspora_pod__appspecific">Под diaspora*</string>
-    <string name="debug_log">Журнал отладки</string>
-    <string name="debug_log_verbose">Журнал отладки (подробный)</string>
-    <string name="app_version_with_arg">Версия приложения: %1$s</string>
-    <string name="android_version_witharg">Версия Android: %1$s</string>
-    <string name="device_name_witharg">Имя устройства: %1$s</string>
-    <string name="code_name_witharg">Кодовое имя: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Имя профиля пода: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Домен пода: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Журнал отладки скопирован в буфер обмена</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* - это приложение-компаньон для социальной сети Диаспора*. Приложение добавляет такие функции как полезные панели инструментов и поддержку прокси-серверов (таких как Tor).</string>
-    <string name="contribute_code">Сделайте свой вклад!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* разрабатывается как свободное ПО и следует идеям проекта Диаспора*. Если вы хотите помочь - вперёд! В настоящее время мы является очень небольшой командой, поэтому мы высоко ценим любые виды помощи!</string>
-    <string name="get_the_source">Получить исходный код</string>
-    <string name="translate_the_app">Переведите приложение!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Приложение недоступно на вашем языке? Вы можете это изменить! Почему бы вам не помочь нам перевести его? Мы используем платформу crowdin, чтобы позволить любому сделать это.</string>
-    <string name="let_me_translate">Перейти к переводу</string>
-    <string name="give_feedback">Оставьте отзыв!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* всё ещё находится в разработке, так что, если у вас есть предложения или пожелания, пожалуйста, воспользуйтесь нашим трекером ошибок, чтобы сообщить нам об этом!</string>
-    <string name="report_bugs">Сообщить об ошибках</string>
-    <string name="spread_the_word">Расскажите друзьям!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Расскажите вашим друзьям и семье о Диаспоре* и #dandelion! Почему бы вам не разместить запись о вашем опыте в блоге? Мы будем рады услышать об этом!</string>
-    <string name="share_the_app">Рассказать о приложении</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Эй! Зацените #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Мейнтейнеры</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Это приложение в настоящее время разрабатывается и поддерживается следующими людьми: &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Участники</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Спасибо вам!</string>
-    <string name="gnu_gplv3_license">Лицензия GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Сторонние библиотеки</string>
-    <string name="the_following_libraries_are_used">Используются следующие библиотеки:</string>
-    <string name="inspiration_from_leafpic__appspecific">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
-    <string name="tell_me_more">Расскажите мне больше</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="show_title">Показать заголовок</string>
+    <string name="launcher_shortcut">Ярлык лаунчера</string>
     <!-- Operability -->
     <string name="top_toolbar_loads_stream__appsp">Верхняя панель инструментов загружает Поток</string>
     <string name="click_empty_space_top_toolbar_load_stream__appspecific">Нажмите на пустое пространство на верхней панели инструментов, чтобы открыть Поток</string>
@@ -197,4 +160,48 @@
     <string name="wipe_settings_warning__appspecific">Это сбросит все изменённые параметры приложения на значения по умолчанию и выйдет из аккаунтов на всех подах. Ваши загруженные изображения останутся нетронутыми. Вы уверены, что хотите продолжить?</string>
     <string name="enable_basic_adblocker_description">Включить простой блокировщик рекламы. Реклама может быть во встроенных элементах страницы</string>
     <string name="block_advertisments">Блокировать рекламу</string>
+    <string name="about">О программе</string>
+    <string name="license">Лицензия</string>
+    <string name="debugging">Отладка</string>
+    <string name="application">Приложение</string>
+    <string name="device">Устройство</string>
+    <string name="diaspora_pod__appspecific">Под diaspora*</string>
+    <string name="debug_log">Журнал отладки</string>
+    <string name="debug_log_verbose">Журнал отладки (подробный)</string>
+    <string name="app_version_with_arg">Версия приложения: %1$s</string>
+    <string name="android_version_witharg">Версия Android: %1$s</string>
+    <string name="device_name_witharg">Имя устройства: %1$s</string>
+    <string name="code_name_witharg">Кодовое имя: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Имя профиля пода: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Домен пода: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Журнал отладки скопирован в буфер обмена</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* - это приложение-компаньон для социальной сети Диаспора*. Приложение добавляет такие функции как полезные панели инструментов и поддержку прокси-серверов (таких как Tor).</string>
+    <string name="contribute_code">Сделайте свой вклад!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* разрабатывается как свободное ПО и следует идеям проекта Диаспора*. Если вы хотите помочь - вперёд! В настоящее время мы является очень небольшой командой, поэтому мы высоко ценим любые виды помощи!</string>
+    <string name="get_the_source">Получить исходный код</string>
+    <string name="translate_the_app">Переведите приложение!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Приложение недоступно на вашем языке? Вы можете это изменить! Почему бы вам не помочь нам перевести его? Мы используем платформу crowdin, чтобы позволить любому сделать это.</string>
+    <string name="let_me_translate">Перейти к переводу</string>
+    <string name="give_feedback">Оставьте отзыв!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* всё ещё находится в разработке, так что, если у вас есть предложения или пожелания, пожалуйста, воспользуйтесь нашим трекером ошибок, чтобы сообщить нам об этом!</string>
+    <string name="report_bugs">Сообщить об ошибках</string>
+    <string name="spread_the_word">Расскажите друзьям!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Расскажите вашим друзьям и семье о Диаспоре* и #dandelion! Почему бы вам не разместить запись о вашем опыте в блоге? Мы будем рады услышать об этом!</string>
+    <string name="share_the_app">Рассказать о приложении</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Эй! Зацените #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Мейнтейнеры</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Это приложение в настоящее время разрабатывается и поддерживается следующими людьми: &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Поддержавшие проект</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Спасибо вам!</string>
+    <string name="gnu_gplv3_license">Лицензия GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Сторонние библиотеки</string>
+    <string name="the_following_libraries_are_used">Используются следующие библиотеки:</string>
+    <string name="inspiration_from_leafpic__appspecific">Мы вдохновлялись и взяли немного кода из LeafPic. Попробуйте это приложение, оно тоже является свободным ПО!</string>
+    <string name="tell_me_more">Расскажите мне больше</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Открывать ссылки на Youtube во внешних приложениях</string>
+    <string name="youtube_links">Ссылки на Youtube</string>
+    <string name="change_the_theme_of_your_account">Изменить тему вашей учётной записи</string>
+    <string name="pull_to_refresh">Потяните для обновления</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Потяните вниз, чтобы обновить страницу.\nВам нужно перезапустить приложение, чтобы изменения вступили в силу.</string>
 </resources>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 52cbce59..d16b663e 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -4,7 +4,8 @@
     <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>
-
+    <string name="close">Serra</string>
+    <string name="cancel">Annulla</string>
     <!-- Common Words -->
     <string name="settings">Impostatziones</string>
     <string name="notifications">Notìficas</string>
@@ -21,7 +22,6 @@
     <string name="contacts">Cuntatos</string>
     <string name="changelog">Registru de sas modìficas</string>
     <string name="statistics">Istatìsticas</string>
-
     <!-- Notifications dropdown menu -->
     <string name="all_notifications">Totu sas notìficas</string>
     <string name="also_commented">Àteros cummentos</string>
@@ -30,54 +30,40 @@
     <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="could_not_retrieve_list_of_pods__appspecific">Errore: Impossìbile recuperare sa lista de sos pods!</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="do_you_want_to_exit">Cheres essire?</string>
-
-
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
     <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_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="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="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="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="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>
@@ -94,8 +80,89 @@
     <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>
-
-
+    <!-- Operability -->
+    <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="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="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="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="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>
+    <string name="extendend_notifications_bell_description__appspecific">Ismànnia su butone de sas notìficas cun unu menù chi ammustrat sas categorias de sas notìficas</string>
+    <string name="language_change_restart_description">Càmbia sa limba de custa aplicatzione. Torra·la a allùghere pro fàghere tènnere efetu a su cambiamentu</string>
+    <string name="language">Limba</string>
+    <string name="system_language">Limba de sistema</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">Controlla sa mannària de su testu de sa vista web</string>
+    <string name="font_size">Mannària de su testu</string>
+    <string name="normal">Normale</string>
+    <string name="large">Mannu</string>
+    <string name="huge">Mannu meda</string>
+    <!-- Load images -->
+    <string name="load_images">Iscàrriga sas immàgines</string>
+    <string name="toggle_image_loading_to_save_mobile_data">Allughe/istuda su carrigamentu de sas immàgines pro risparmiare sos datos mòbiles</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">Rotatzione de s\'ischermu</string>
+    <string name="control_screen_rotation">Controlla sa rotatzione automàtica de s\'ischermu</string>
+    <string name="default_">Predefinidu</string>
+    <string name="sensor_ignore_system_settings">Sensore\n
+    (ignora sas impostatziones de sistema)</string>
+    <string name="portrait">Verticale</string>
+    <string name="landscape">Orizontale</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">Càrriga sos valores predefinidos de Tor</string>
+    <string name="load_proxy_settins_for_tor">Càrriga sas impostatziones pro su sèrver intermèdiu HTTP de Tor (Orbot)</string>
+    <string name="proxy">Server intermèdiu (Proxy)</string>
+    <string name="enable_proxy">Abìlita unu server intermèdiu</string>
+    <string name="proxy_dandelion_traffic__appspecific">Faghe colare su tràficu de dandelion* in unu server intermèdiu pro isfrancare sos firewalls.\n
+    Diat pòdere èssere netzessàriu a torrare a allùghere s\'aplicatzione. Diat pòdere non funtzionare pro carchi telèfono.</string>
+    <string name="host">Host</string>
+    <string name="port">Ghenna</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Depes torrare a allùghere s\'aplicatzione pro istudare s\'impreu de su server intermediàriu</string>
+    <string name="orbot_proxy_preset_loaded">Impostatziones de su server de Orbot carrigadas</string>
+    <!-- Chrome custom tabs -->
+    <string name="open_external_links_with_chrome_custom_tabs_description">Aberi sos ligàmenes esternos cun sas ischedas personalizadas de Chrome. Chromium o Google Chrome depent èssere installados pro lu pòdere fàghere. \n
+    NOTA DE IMPORTU: sas ischedas personalizadas de Chrome no impreant sos servers intermediàrios configurados!</string>
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">Impostatziones personales</string>
+    <string name="open_diaspora_account_settings__appspecific">Aberi sas impostatziones de su contu de diaspora* tuo</string>
+    <string name="manage_your_contact_list">Amministra sa lista de sos contatos tuos</string>
+    <string name="manage_hashtags">Amministra sas etichetas</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Acaba·la de sighire sas etichetas sighidas</string>
+    <string name="change_account">Càmbia contu</string>
+    <string name="loug_warning_description__appspecific">Iscantzella sos datos de sa sessione locale e cola a un\'àteru contu o pod de diaspora*</string>
+    <string name="logout_warning_description">Custu at a iscantzellare totu sos cookies e sos datos de sa sessione. Seguru ses de chèrrere cambiare su contu tuo?</string>
+    <string name="clear_cache">Iscantzella sa cache</string>
+    <string name="clear_webview_cache">Iscantzella sa cache de sa vista web</string>
+    <string name="intellihide_toolbars__appspecific">Istichi automaticamente sas barras superiores e inferiores cando ses iscurrende sa pàgina</string>
+    <string name="intellihide_toolbars">Barras chi s\'istichint intelligentemente</string>
+    <string name="append_shared_by_notice">Annanghe un\'avisu de s\'aplicatzione</string>
+    <string name="append_shared_by_notice__appspecific">Annanghe unu riferimentu a custa aplicatzione a sos testos cumpartzidos: [via #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">Vàriu</string>
+    <string name="full_reset">Reimpostatzione intrea</string>
+    <string name="wipe_settings_and_logout">Iscantzella localmente totu sos datos relativos a s\'aplicatzione e essi dae totu sos contos</string>
+    <string name="wipe_settings_warning__appspecific">Custu at a fàghere torrare totu sas impostatziones de s\'aplicatzione a sos valores predefinidos e t\'at a fàghere essire dae totu sos pods. Sas immàgines iscarrigadas dae tie no ant a èssere tocadas. Seguru ses de chèrrere sighire?</string>
+    <string name="enable_basic_adblocker_description">Abìlita su blocadore de publitzidade de base. Sa publitzidade diat pòdere èssere incluida, pro esèmpiu, in sas visualizatziones incorporadas</string>
+    <string name="block_advertisments">Bloca sa publitzidade</string>
     <string name="about">Informatziones</string>
     <string name="license">Litzèntzia</string>
     <string name="debugging">Depuratzione dae sos errores</string>
@@ -111,27 +178,20 @@
     <string name="pod_profile_name_witharg__appspecific">Nùmene de profilu de su pod: %1$s</string>
     <string name="pod_domain_witharg__appspecific">Domìniu de su pod: %1$s</string>
     <string name="debug_log_copied_to_clipboard">Registru de depuratzione copiadu in sos apuntos</string>
-
     <string name="dandelion_is_your_companion__appspecific">dandelion* est s\'aplicatzione tua pro s\'esploratzione de sa retza sotziale diaspora*. Annanghet funtzionalidades comente a barras de ainas utilosas e a su suportu pro server intermediàrios (proxies) comente a sa retza Tor pro s\'esperièntzia sotziale tua.</string>
-
     <string name="contribute_code">Contribui a su còdighe!</string>
     <string name="dandelion_is_developed_as_foss__appspecific">dandelion* est iscvilupada liberamente e sighit sas idea de su progetu diaspora*. Si cheres contribuire, faghe·lu! In custu momentu semus unu grupu minore meda, nos diat agradare a tènnere cale si siat casta de agiudu!</string>
     <string name="get_the_source">Otenne su còdighe mitza</string>
-
     <string name="translate_the_app">Tradui s\'aplicatzione!</string>
     <string name="app_not_available_in_your_lang_translate_with_stringlate">S\'aplicatzione no est disponìbile in sa limba tua? Lu podes cambiare! Proite non nos agiudas traduinde·la? Nois impreamus sa prataforma crowdin pro permìtere a totus de traduire s\'aplicatzione.</string>
     <string name="let_me_translate">Faghe·mi traduire</string>
-
     <string name="give_feedback">Lassa·nos s\'opinione tua!</string>
     <string name="dandelion_still_in_development__appspecific">dandelion* est galu in isvilupu. Si tenes impòsitos o cale si siat casta de cosa da sinnalare, pro praghere, faghe·la·nos ischire impreende s\'aina de sinnalatziones de errores nostra!</string>
     <string name="report_bugs">Sinnala errores</string>
-
     <string name="spread_the_word">Cumpartzi sa paràula!</string>
     <string name="tell_your_friends_about_diaspora__appspecific">Faghe connòschere diaspora* e #dandelion a sos amigos e a sa familia tua! Proite no iscries carchi cosa a pitzu de sas esperièntzias tuas? Noas diat agradare meda a ischire ite nde pensas!</string>
     <string name="share_the_app">Cumpartzi s\'aplicatzione</string>
     <string name="hey_checkout_dandelion_tag__appspecific">Ei! Dae un\'ograda a #dandelion! %1$s</string>
-
-
     <!-- License & help (large amount of text) -->
     <string name="maintainers">Manutentores</string>
     <string name="this_app_is_currently_developed_and_maintained_by_witharg">Custa aplicatzione est beninde isvilupada e manutentada dae &lt;br&gt;&lt;br&gt;%1$s</string>
@@ -142,113 +202,9 @@
     <string name="the_following_libraries_are_used">Sunt impreadas custas librerias:</string>
     <string name="inspiration_from_leafpic__appspecific">Amus pigadu ispiratzione e parte de su còdighe dae LeafPic. Abbistade·bos·lu, est fintzas cussu unu programma lìberu!</string>
     <string name="tell_me_more">Àteras informatziones</string>
-
-    <!-- Key Names (Untranslatable) -->
-
-    <!-- Operability -->
-    <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="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="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="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="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>
-    <string name="extendend_notifications_bell_description__appspecific">Ismànnia su butone de sas notìficas cun unu menù chi ammustrat sas categorias de sas notìficas</string>
-
-    <string name="language_change_restart_description">Càmbia sa limba de custa aplicatzione. Torra·la a allùghere pro fàghere tènnere efetu a su cambiamentu</string>
-    <string name="language">Limba</string>
-    <string name="system_language">Limba de sistema</string>
-
-    <!-- Font size -->
-    <string name="control_textsize_of_webview">Controlla sa mannària de su testu de sa vista web</string>
-    <string name="font_size">Mannària de su testu</string>
-    <string name="normal">Normale</string>
-    <string name="large">Mannu</string>
-    <string name="huge">Mannu meda</string>
-
-    <!-- Load images -->
-    <string name="load_images">Iscàrriga sas immàgines</string>
-    <string name="toggle_image_loading_to_save_mobile_data">Allughe/istuda su carrigamentu de sas immàgines pro risparmiare sos datos mòbiles</string>
-
-    <!-- Screen rotation -->
-    <string name="screen_rotation">Rotatzione de s\'ischermu</string>
-    <string name="control_screen_rotation">Controlla sa rotatzione automàtica de s\'ischermu</string>
-    <string name="default_">Predefinidu</string>
-    <string name="sensor_ignore_system_settings">Sensore\n
-    (ignora sas impostatziones de sistema)</string>
-    <string name="portrait">Verticale</string>
-    <string name="landscape">Orizontale</string>
-
-    <!-- Proxy -->
-    <string name="load_tor_preset">Càrriga sos valores predefinidos de Tor</string>
-    <string name="load_proxy_settins_for_tor">Càrriga sas impostatziones pro su sèrver intermèdiu HTTP de Tor (Orbot)</string>
-    <string name="proxy">Server intermèdiu (Proxy)</string>
-    <string name="enable_proxy">Abìlita unu server intermèdiu</string>
-    <string name="proxy_dandelion_traffic__appspecific">Faghe colare su tràficu de dandelion* in unu server intermèdiu pro isfrancare sos firewalls.\n
-    Diat pòdere èssere netzessàriu a torrare a allùghere s\'aplicatzione. Diat pòdere non funtzionare pro carchi telèfono.</string>
-    <string name="host">Host</string>
-    <string name="port">Ghenna</string>
-    <string name="app_needs_restart_to_disable_proxy_usage">Depes torrare a allùghere s\'aplicatzione pro istudare s\'impreu de su server intermediàriu</string>
-    <string name="orbot_proxy_preset_loaded">Impostatziones de su server de Orbot carrigadas</string>
-
-
-    <!-- Chrome custom tabs -->
-    <string name="open_external_links_with_chrome_custom_tabs_description">Aberi sos ligàmenes esternos cun sas ischedas personalizadas de Chrome. Chromium o Google Chrome depent èssere installados pro lu pòdere fàghere. \n
-    NOTA DE IMPORTU: sas ischedas personalizadas de Chrome no impreant sos servers intermediàrios configurados!</string>
-
-    <!-- Diaspora Settings -->
-    <string name="personal_settings">Impostatziones personales</string>
-    <string name="open_diaspora_account_settings__appspecific">Aberi sas impostatziones de su contu de diaspora* tuo</string>
-    <string name="manage_your_contact_list">Amministra sa lista de sos contatos tuos</string>
-
-    <string name="manage_hashtags">Amministra sas etichetas</string>
-    <string name="unfollow_already_followed_hashtags__appspecific">Acaba·la de sighire sas etichetas sighidas</string>
-
-    <string name="change_account">Càmbia contu</string>
-    <string name="loug_warning_description__appspecific">Iscantzella sos datos de sa sessione locale e cola a un\'àteru contu o pod de diaspora*</string>
-    <string name="logout_warning_description">Custu at a iscantzellare totu sos cookies e sos datos de sa sessione. Seguru ses de chèrrere cambiare su contu tuo?</string>
-
-    <string name="clear_cache">Iscantzella sa cache</string>
-    <string name="clear_webview_cache">Iscantzella sa cache de sa vista web</string>
-
-
-    <string name="intellihide_toolbars__appspecific">Istichi automaticamente sas barras superiores e inferiores cando ses iscurrende sa pàgina</string>
-    <string name="intellihide_toolbars">Barras chi s\'istichint intelligentemente</string>
-
-    <string name="append_shared_by_notice">Annanghe un\'avisu de s\'aplicatzione</string>
-    <string name="append_shared_by_notice__appspecific">Annanghe unu riferimentu a custa aplicatzione a sos testos cumpartzidos: [via #dandelion]</string>
-
-    <!-- More -->
-    <string name="miscellaneous">Vàriu</string>
-
-    <string name="full_reset">Reimpostatzione intrea</string>
-    <string name="wipe_settings_and_logout">Iscantzella localmente totu sos datos relativos a s\'aplicatzione e essi dae totu sos contos</string>
-
-    <string name="wipe_settings_warning__appspecific">Custu at a fàghere torrare totu sas impostatziones de s\'aplicatzione a sos valores predefinidos e t\'at a fàghere essire dae totu sos pods. Sas immàgines iscarrigadas dae tie no ant a èssere tocadas. Seguru ses de chèrrere sighire?</string>
-
-    <string name="enable_basic_adblocker_description">Abìlita su blocadore de publitzidade de base. Sa publitzidade diat pòdere èssere incluida, pro esèmpiu, in sas visualizatziones incorporadas</string>
-    <string name="block_advertisments">Bloca sa publitzidade</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Abìlita pro abèrrere sos ligàmenes de Youtube in un\'aplicatzione esterna</string>
+    <string name="youtube_links">Ligàmenes de Youtube</string>
+    <string name="change_the_theme_of_your_account">Muda su tema de su contu tuo</string>
+    <string name="pull_to_refresh">Tira cara a bassu pro annoare</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Tira cara a bassu pro annoare sa pàgina.\nDepes torrare a allùghere s\'aplicatzione pro fàghere in modu chi sas modìficas tèngiant efetu.</string>
 </resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
new file mode 100644
index 00000000..45159998
--- /dev/null
+++ b/app/src/main/res/values-si/strings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="reload">නැවත පූරණය</string>
+    <string name="close">වසන්න</string>
+    <string name="cancel">අවලංගු</string>
+    <!-- Common Words -->
+    <string name="settings">සැකසුම්</string>
+    <string name="notifications">දැනුම්දීම්</string>
+    <string name="conversations">සංවාද</string>
+    <string name="profile">පැතිකඩ</string>
+    <string name="activities">ක්‍රියාකාරකම්</string>
+    <string name="commented">අදහස් දැක්විණි</string>
+    <string name="mentions">සැඳහුම්</string>
+    <string name="public_">ප්‍රසිද්ධ</string>
+    <string name="search">සොයන්න</string>
+    <string name="contacts">සබඳතා</string>
+    <string name="statistics">සංඛ්‍යාලේඛන</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">සියළුම දැනුම්දීම්</string>
+    <string name="also_commented">එවගේම අදහස් දැක්විණි</string>
+    <!-- Pod Activity -->
+    <string name="do_you_want_to_exit">ඔබට පිටවීමට ඇවැසිද?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">තව</string>
+    <string name="help_license">පිළිබඳව | උපකාර</string>
+    <string name="public_activities">ප්‍රසිද්ධ ක්‍රියාකාරකම්</string>
+    <string name="reports">වාර්තා</string>
+    <string name="share_screenshot_of_webpage">වියමන පිටුවෙහි තිරසේයාවක් බෙදාගන්න</string>
+    <string name="take_screenshot_of_webpage">වියමන පිටුවෙහි තිර සේයාවක් අරගන්න</string>
+    <string name="saving_screenshot_as">ලෙස තිරසේයාව සුරකින්න:</string>
+    <string name="link_adress_copied">සබැඳියේ ලිපිනය පිටපත් විය…</string>
+    <string name="exit_app">යෙදුමෙන් පිටවන්න</string>
+    <string name="share_dotdotdot">බෙදාගන්න…</string>
+    <string name="please_add_a_name">නමක් එකතු කරන්න</string>
+    <string name="share_link_address">සබැඳියේ ලිපිනය බෙදාගන්න</string>
+    <string name="open_in_external_browser">බාහිර අතිරික්සුවකින් විවෘත කරන්න…</string>
+    <string name="copy_link_adress_to_clipboard">සබැඳිය පසුරුපුවරුවට පිටපත් කරන්න</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="protocol">කෙටුම්පත</string>
+    <string name="show_title">සිරැසිය පෙන්වන්න</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="network">ජාලය</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="user">පරිශීලක</string>
+    <string name="admin">පරිපාලක</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">තේමාව සහ වර්ණ</string>
+    <!-- Notifications dropdown -->
+    <string name="language">භාෂාව</string>
+    <string name="system_language">පද්ධතියේ භාෂාව</string>
+    <!-- Font size -->
+    <string name="font_size">මුද්‍රණඅකුරේ ප්‍රමාණය</string>
+    <string name="normal">සාමාන්‍ය</string>
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">පෙරනිමි</string>
+    <!-- Proxy -->
+    <string name="proxy">පෙරකලාසිය</string>
+    <string name="enable_proxy">පෙරකලාසිය සබල කරන්න</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="change_account">ගිණුම වෙනස් කරන්න</string>
+    <!-- More -->
+    <string name="about">පිලිබඳව</string>
+    <string name="license">බලපත්‍රය</string>
+    <string name="application">යෙදුම</string>
+    <string name="device">උපාංගය</string>
+    <string name="android_version_witharg">ඇන්ඩ්‍රොයිඩ් අනුවාදය: %1$s</string>
+    <string name="device_name_witharg">උපාංගයේ නම: %1$s</string>
+    <string name="code_name_witharg">කේතනාමය: %1$s</string>
+    <string name="get_the_source">මූලාශ්‍රය ගන්න</string>
+    <string name="translate_the_app">යෙදුම පරිවර්තනය කරන්න!</string>
+    <string name="share_the_app">යෙදුම බෙදාගන්න</string>
+    <!-- License & help (large amount of text) -->
+    <string name="gnu_gplv3_license">ජීඑන්යූ ජීපීඑල්v3+ බලපත්‍රය</string>
+    <string name="youtube_links">යූටියුබ් සබැඳිය</string>
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-sr-rRS/strings.xml b/app/src/main/res/values-sr-rRS/strings.xml
new file mode 100644
index 00000000..422fd22e
--- /dev/null
+++ b/app/src/main/res/values-sr-rRS/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">Otvori navigacioni panel</string>
+    <string name="close_navdrawer">Yatvori navigacioni panel</string>
+    <!-- Common Words -->
+    <string name="settings">Podesavanja</string>
+    <string name="changelog">Lista promena</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">Sakrij status</string>
+    <string name="show_title">Prikaži naziv</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Izgled</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Promijeni jezik ove aplikacije. Restartuj apikaciju da bi podešavanja dobila efekat.</string>
+    <string name="language">Jezik</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="miscellaneous">Ostalo</string>
+    <string name="about">O ovom</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Pomo\'nici</string>
+    <string name="gnu_gplv3_license">Prikazi GNU GPLv3 licence</string>
+    <string name="show_third_party_licenses">Prikaz licence trecih lica</string>
+</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000..543f0196
--- /dev/null
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">Поставке</string>
+    <string name="search">тражи</string>
+    <string name="changelog">Дневник измена</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">још</string>
+    <string name="share_dotdotdot">Подели…</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">Sakrij status</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Izgled</string>
+    <string name="network">Мрежа</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">Промените језик апликације. Поново покрените након тога</string>
+    <string name="language">Језик</string>
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="clear_cache">Обриши кеш</string>
+    <!-- More -->
+    <string name="miscellaneous">разно</string>
+    <string name="about">О програму</string>
+    <string name="license">Лиценца</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Програмери</string>
+    <string name="contributors">Сарадници</string>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 79576339..7c42e701 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Öppna navigeringslådan</string>
+    <string name="close_navdrawer">Stäng navigeringslådan</string>
     <string name="reload">Ladda om</string>
+    <string name="close">Avsluta</string>
+    <string name="cancel">Avbryt</string>
     <!-- Common Words -->
     <string name="settings">Inställningar</string>
     <string name="notifications">Notiser</string>
@@ -42,20 +46,20 @@
     <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="link_adress_copied">Länkadressen kopierades ...</string>
     <string name="new_post">Nytt inlägg</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="share_dotdotdot">Dela…</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="open_in_external_browser">Öppna i en extern webbläsare...</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 -->
@@ -77,48 +81,11 @@
     <string name="pod_address">Podadress</string>
     <string name="missing_value">Värde saknas</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>
-    <string name="debugging">Avlusning</string>
-    <string name="application">Program</string>
-    <string name="device">Enhet</string>
-    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
-    <string name="debug_log">Avlusningslogg</string>
-    <string name="debug_log_verbose">Avlusningslogg (detaljerad)</string>
-    <string name="app_version_with_arg">Programversion: %1$s</string>
-    <string name="android_version_witharg">Androidversion: %1$s</string>
-    <string name="device_name_witharg">Enhetens namn: %1$s</string>
-    <string name="code_name_witharg">Kodnamn: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Podprofilens namn: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Poddomän: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Texten kopierad till urklippen</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* är en kompletterande app till att använda det sociala nätverket diaspora*. Den lägger till funktioner såsom användbara verktyg and stöd för proxyservrar såsom Tor.</string>
-    <string name="contribute_code">Bidrag med kod!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* är utvecklat för att vara fritt som i frihet och lyder under samma filosofi som diaspora*-projektet. Om du vill bidra, är det fritt fram! I dagsläget är vi få, så uppskattar öppenhjärtigt all hjälp!</string>
-    <string name="get_the_source">Hämta källkoden</string>
-    <string name="translate_the_app">Översätt appen!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Är appen inte tillgänglig på ditt mål? Det kan du ändra på! Hjälp oss översätta! Vi använder oss av plattformen Crowdin så att alla kan hjälpa till att översätta appen.</string>
-    <string name="let_me_translate">Jag vill översätta</string>
-    <string name="give_feedback">Lämna respons!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* utvecklas fortfarande, så har du några förslag eller annan återkoppling, använd vårt buggrapporteringssystem!</string>
-    <string name="report_bugs">Rapportera buggar</string>
-    <string name="spread_the_word">Berätta om oss!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Berätta för dina närmaste om diaspora* och #dandelion! Blogga om dina erfarenheter! Vi vill gärna veta vad du tycker!</string>
-    <string name="share_the_app">Dela appen</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hallå! Kolla in #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Utvecklare</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Denna app utvecklas för närvarande och underhålls av &lt; br &gt;&lt; br &gt;%1$s</string>
-    <string name="contributors">Bidragsgivare</string>
-    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; Tack så hjärtligt!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Tredjepartsbibliotek</string>
-    <string name="the_following_libraries_are_used">Följande bibliotek används:</string>
-    <string name="inspiration_from_leafpic__appspecific">Vi hämtade inspiration och kod från LeafPic. Kika på det, det är också fri programvara!</string>
-    <string name="tell_me_more">Berätta mer</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="hide_statusbar_in_mainview">Dölj statusfältet vid huvudvyn</string>
+    <string name="hide_statusbar">Dölj statusfältet</string>
+    <string name="show_title_in_main_view">Göm titeln i huvudvyn</string>
+    <string name="show_title">Visa titel</string>
+    <string name="launcher_shortcut">Programstartargenväg</string>
     <!-- Operability -->
     <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>
@@ -199,4 +166,48 @@
     <string name="wipe_settings_warning__appspecific">Detta kommer att återställa alla ändrade inställningarna på appen till deras standardvärden och loggar ut dig från alla poddar. Dina nedladdade bilder förblir orörda. Är du säker på att du vill fortsätta?</string>
     <string name="enable_basic_adblocker_description">Använd lätt reklamblockering. Reklam finns bland annat i inbyggda vyer</string>
     <string name="block_advertisments">Blockera reklam</string>
+    <string name="about">Om</string>
+    <string name="license">Licens</string>
+    <string name="debugging">Avlusning</string>
+    <string name="application">Program</string>
+    <string name="device">Enhet</string>
+    <string name="diaspora_pod__appspecific">diaspora*-pod</string>
+    <string name="debug_log">Avlusningslogg</string>
+    <string name="debug_log_verbose">Avlusningslogg (detaljerad)</string>
+    <string name="app_version_with_arg">Programversion: %1$s</string>
+    <string name="android_version_witharg">Androidversion: %1$s</string>
+    <string name="device_name_witharg">Enhetens namn: %1$s</string>
+    <string name="code_name_witharg">Kodnamn: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Podprofilens namn: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Poddomän: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Texten kopierad till urklippen</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* är en kompletterande app till att använda det sociala nätverket diaspora*. Den lägger till funktioner såsom användbara verktyg and stöd för proxyservrar såsom Tor.</string>
+    <string name="contribute_code">Bidrag med kod!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* är utvecklat för att vara fritt som i frihet och lyder under samma filosofi som diaspora*-projektet. Om du vill bidra, är det fritt fram! I dagsläget är vi få, så uppskattar öppenhjärtigt all hjälp!</string>
+    <string name="get_the_source">Hämta källkoden</string>
+    <string name="translate_the_app">Översätt appen!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Är appen inte tillgänglig på ditt mål? Det kan du ändra på! Hjälp oss översätta! Vi använder oss av plattformen Crowdin så att alla kan hjälpa till att översätta appen.</string>
+    <string name="let_me_translate">Jag vill översätta</string>
+    <string name="give_feedback">Lämna respons!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* utvecklas fortfarande, så har du några förslag eller annan återkoppling, använd vårt buggrapporteringssystem!</string>
+    <string name="report_bugs">Rapportera buggar</string>
+    <string name="spread_the_word">Berätta om oss!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Berätta för dina närmaste om diaspora* och #dandelion! Blogga om dina erfarenheter! Vi vill gärna veta vad du tycker!</string>
+    <string name="share_the_app">Dela appen</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hallå! Kolla in #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Utvecklare</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Denna app utvecklas för närvarande och underhålls av &lt; br &gt;&lt; br &gt;%1$s</string>
+    <string name="contributors">Bidragsgivare</string>
+    <string name="thank_you_witharg">%1$s &lt; br &gt;&lt; br &gt; Tack så hjärtligt!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Tredjepartsbibliotek</string>
+    <string name="the_following_libraries_are_used">Följande bibliotek används:</string>
+    <string name="inspiration_from_leafpic__appspecific">Vi hämtade inspiration och kod från LeafPic. Kika på det, det är också fri programvara!</string>
+    <string name="tell_me_more">Berätta mer</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Aktivera för att öppna Youtube-länkar i en extern app</string>
+    <string name="youtube_links">Youtube-länkar</string>
+    <string name="change_the_theme_of_your_account">Ändra temat för ditt konto</string>
+    <string name="pull_to_refresh">Dra för att uppdatera</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Dra ner på toppen av sidan för att uppdatera.\nDu måste starta om appen för att ändringarna ska träda i kraft.</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-te/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e38e96a9..6c40a2c3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Gezinme çekmecesini aç</string>
+    <string name="close_navdrawer">Gezinme çekmecesini kapat</string>
     <string name="reload">Yeniden Yükle</string>
+    <string name="close">Kapat</string>
+    <string name="cancel">İptal</string>
     <!-- Common Words -->
     <string name="settings">Ayarlar</string>
     <string name="notifications">Bildirimler</string>
@@ -14,7 +18,7 @@
     <string name="commented">Yorumlananlar</string>
     <string name="mentions">Bahsetmeler</string>
     <string name="public_">Herkes</string>
-    <string name="search">Arama</string>
+    <string name="search">Ara</string>
     <string name="contacts">Kişiler</string>
     <string name="changelog">Değişme Günlüğü</string>
     <string name="statistics">İstatistikler</string>
@@ -23,46 +27,59 @@
     <string name="also_commented">Ayrıca Yorumlar</string>
     <string name="comment_on_post">Gönderine Yorumlar</string>
     <string name="deleteme_____1">Beğeniler</string>
+    <string name="mentioned">Bahsedilen</string>
+    <string name="reshared">Yeniden paylaşılan</string>
+    <string name="started_sharing">Paylaşım Başlatıldı</string>
     <!-- Pod Activity -->
+    <string name="could_not_retrieve_list_of_pods__appspecific">Hata: Pod listesi alınamadı!</string>
+    <string name="sorry_need_to_be_connected_to_internet">Üzgünüm, devam etmek için internete bağlı olmalısın.</string>
+    <string name="confirmation">Onayla</string>
+    <string name="do_you_want_to_exit">Çıkmak mı istiyorsun ?</string>
     <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">Daha</string>
+    <string name="help_license">Hakkında | Yardım</string>
+    <string name="followed_tags">Takip Edilen Etiketler</string>
+    <string name="public_activities">Genel etkinlikler</string>
+    <string name="reports">Raporlar</string>
+    <string name="share_link_as_text">Bağlantıyı metin olarak paylaş</string>
+    <string name="share_screenshot_of_webpage">Web sayfasının ekran görüntüsünü paylaş</string>
+    <string name="take_screenshot_of_webpage">Web sayfasının ekran görüntüsünü al</string>
+    <string name="saving_image_to">Görüntüyü şuna kaydet</string>
+    <string name="saving_screenshot_as">Ekran görüntüsü olarak kaydediliyor:</string>
+    <string name="link_adress_copied">Bağlantı adresi kopyalandı…</string>
+    <string name="new_post">Yeni gönderi</string>
+    <string name="go_to_top">Başa dön</string>
+    <string name="search_by_tags_or_persons__appspecific">Etiketlere veya kişilere göre arayın</string>
+    <string name="exit_app">Uygulamadan çık</string>
+    <string name="toggle_mobile_desktop_view">Mobil/masaüstü görünümünü değiştir</string>
+    <string name="share_dotdotdot">Paylaş...</string>
+    <string name="by_tags">Etiket</string>
+    <string name="by_people">Insan</string>
+    <string name="please_add_a_name">Lütfen bir isim ekleyin</string>
+    <string name="share_link_address">Bağlantı adresini paylaş</string>
+    <string name="save_image">Görseli kaydet</string>
+    <string name="share_image">Görsel paylaş</string>
+    <string name="open_in_external_browser">Harici tarayıcıda aç…</string>
+    <string name="copy_link_adress_to_clipboard">Bağlantı adresini panoya kopyala</string>
+    <string name="copy_image_address_to_clipboard">Görsel adresini panoya kopyala</string>
     <!-- More from MainActivity -->
+    <string name="unable_to_load_image">Görsel yüklenemedi</string>
     <!-- Permissions -->
-
-    <string name="about">Hakkında</string>
-    <string name="license">Lisans</string>
-    <string name="debugging">Hata Ayıklama</string>
-    <string name="application">Uygulama</string>
-    <string name="device">Cihaz</string>
-    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
-    <string name="debug_log">Hata Ayıklama Günlükleri</string>
-    <string name="debug_log_verbose">Hata Ayıklama Günlüğü (Detaylı)</string>
-    <string name="app_version_with_arg">Uygulama Sürümü: %1$s</string>
-    <string name="android_version_witharg">Android Sürümü: %1$s</string>
-    <string name="device_name_witharg">Cihaz Adı: %1$s</string>
-    <string name="code_name_witharg">Kod adı: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Pod Profil Adı: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Pod Adresi: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Hata ayıklama günlüğü panoya kopyalandı</string>
-    <string name="contribute_code">Koda katkıda bulun!</string>
-    <string name="get_the_source">Kaynağı al</string>
-    <string name="translate_the_app">Uygulamayı tercüme et!</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Uygulamayı kendi dilinde kullanamıyor musun? Bunu değiştirebilirsin. Neden çeviride bize yardımcı olmuyorsun? Herkesin çeviriye katkıda bulunabilmesi için Crowdin platformunu kullanıyoruz.</string>
-    <string name="let_me_translate">Hadi çevirelim</string>
-    <string name="give_feedback">Geri bildirimde bulun!</string>
-    <string name="report_bugs">Hataları Bildir</string>
-    <string name="spread_the_word">Herkese duyur!</string>
-    <string name="share_the_app">Uygulamayı paylaş</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Hey %1$s ! #dandelion’a bir göz at!</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Yardımcılar</string>
-    <string name="contributors">Katkıda Bulunanlar</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Teşekkürler!</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+ License</string>
-    <string name="show_third_party_licenses">Üçüncü Parti Kütüphaneler</string>
-    <string name="the_following_libraries_are_used">Şu kütüphaneler kullanıldı:</string>
-    <string name="tell_me_more">Daha fazla göster</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="screenshot_permission__appspecific">Görüntüleri kaydetmek/yüklemek için \"Depolama Erişim İzni\" vermeniz gerekir. Sonrasında uygulamayı tamamen kapatmalı veya cihazı yeniden başlatmalısınız. Depoylama erişimine izin vermeyebilirsiniz, ancak daha sonra görüntüleri kaydetmek isterseniz, daha sonra izin verebilirsiniz. İzin vermek için: Sistem Ayarları - Uygulamalar - dandelion* İzinler bölümü \"Depolama Erişim İzni\" verebilirsiniz.</string>
+    <string name="image_permission_description__appspecific">Görüntüleri kaydetmek/yüklemek için \"Depolama Erişim İzni\" vermeniz gerekir. Sonrasında uygulamayı tamamen kapatmalı veya cihazı yeniden başlatmalısınız. Depoylama erişimine izin vermeyebilirsiniz, ancak daha sonra görüntüleri kaydetmek isterseniz, daha sonra izin verebilirsiniz. İzin vermek için: Sistem Ayarları - Uygulamalar - dandelion* İzinler bölümü \"Depolama Erişim İzni\" verebilirsiniz.</string>
+    <string name="permission_denied">İzin reddedildi.</string>
+    <string name="permission_granted_try_again">İzin verildi. Lütfen tekrar deneyin.</string>
+    <string name="custom_pod">Özel Pod</string>
+    <string name="pod_name">Pod adı</string>
+    <string name="protocol">Protokol</string>
+    <string name="pod_address">Pod adresi</string>
+    <string name="missing_value">Eksik değer</string>
+    <string name="jump_to_last_visited_page_in_stream__appspecific">Akışta son ziyaret edilen sayfaya git?</string>
+    <string name="hide_statusbar_in_mainview">Durum çubuğunu ana görünümde gizle</string>
+    <string name="hide_statusbar">Durum çubuğunu gizle</string>
+    <string name="show_title_in_main_view">Başlığı ana görünümde göster</string>
+    <string name="show_title">Başlığı göster</string>
+    <string name="launcher_shortcut">Başlatıcı kısayolu</string>
     <!-- Operability -->
     <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>
@@ -74,6 +91,7 @@
     <!-- Visuals -->
     <!-- Navigiation Slider -->
     <string name="navigation_drawer">Menü Kaydırıcı</string>
+    <string name="control_visibility_of_entries_nav_drawer">Gezinme çekmecesindeki girişlerin görünürlüğünü kontrol et</string>
     <string name="user">Kullanıcı</string>
     <string name="general">Genel</string>
     <string name="admin">Yönetici</string>
@@ -85,8 +103,11 @@
     <string name="accent_color">Vurgu rengi</string>
     <string name="color_of_progressbar">İlerleme çubuğunun rengi</string>
     <string name="amoled_mode">AMOLED Modu</string>
+    <string name="amoled_mode_description__app_specific">Uygulamanın birçok yerinde AMOLED ekrana uyumlu siyah renkleri geçersiz kılın. Bu ayarı değiştirmek için yeniden başlatmanız gerekiyor. Diaspora * \'ya göz atmak için, kişisel diyaspora * hesap ayarlarınızda bulunan Dark temasını da aktive etmeniz gerekir.</string>
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Genişletilmiş Bildirimler</string>
+    <string name="extendend_notifications_bell_description__appspecific">Bildirim zilini, bildirim kategorilerini gösteren bir açılır menü ile genişlet</string>
+    <string name="language_change_restart_description">Bu uygulamanın dilini değiştir. Değişikliklerin etkili olması için uygulamayı yeniden başlatın</string>
     <string name="language">Dil</string>
     <string name="system_language">Sistem dili</string>
     <!-- Font size -->
@@ -102,6 +123,8 @@
     <string name="screen_rotation">Ekran döndürme</string>
     <string name="control_screen_rotation">Otomatik ekran döndürmeyi ayarlayın</string>
     <string name="default_">Varsayılan</string>
+    <string name="sensor_ignore_system_settings">Sensör\n
+  (sistem ayarlarını yok say)</string>
     <string name="portrait">Dikey</string>
     <string name="landscape">Yatay</string>
     <!-- Proxy -->
@@ -109,9 +132,79 @@
     <string name="load_proxy_settins_for_tor">Tor (Orbot) HTTP Proxy için proxy ayarlarını yükle</string>
     <string name="proxy">Proxy</string>
     <string name="enable_proxy">Proxy etkinleştir</string>
+    <string name="proxy_dandelion_traffic__appspecific">Proxy dandelion*\'s traffic to circumvent firewalls.\n
+ May require restart. This might not work on some phones.</string>
     <string name="host">Sunucu</string>
     <string name="port">Port</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">Proxy kullanımını devre dışı bırakmak için uygulamanın yeniden başlatılması gerekiyor</string>
+    <string name="orbot_proxy_preset_loaded">Orbot proxy hazır ayarı yüklendi</string>
     <!-- Chrome custom tabs -->
+    <string name="open_external_links_with_chrome_custom_tabs_description">Chrome Özel Sekmeler ile harici bağlantılar açın. Bu özelliği kullanabilmek için Chromium, Firefox veya Google Chrome\'un yüklü olması gerekir.\n
+  ÖNEMLİ NOT: Chrome Özel Sekmeler, yapılandırılmış proxy sunucuları kullanmaz!</string>
     <!-- Diaspora Settings -->
+    <string name="personal_settings">Kişisel ayarlar</string>
+    <string name="open_diaspora_account_settings__appspecific">diaspora* hesap ayarlarını aç</string>
+    <string name="manage_your_contact_list">Kişi listenizi yönetin</string>
+    <string name="manage_hashtags">Etiketleri yönetin</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">Mevcut takip edilen etiketleri takipten vazgeç</string>
+    <string name="change_account">Hesabı Değiştir</string>
+    <string name="loug_warning_description__appspecific">Yerel oturum verilerini silin ve başka bir diaspora * pod(a)/hesab(a) geçin</string>
+    <string name="logout_warning_description">Bu, tüm çerezleri ve oturum verilerini siler. Gerçekten hesabını değiştirmek istiyor musun?</string>
+    <string name="clear_cache">Önbelleği temizle</string>
+    <string name="clear_webview_cache">WebView önbelleğini temizle</string>
+    <string name="intellihide_toolbars__appspecific">Kaydırma yaparken üst ve alt araç çubuklarını otomatik olarak gizle</string>
+    <string name="intellihide_toolbars">Araç Çubuklarını Otomatik Gizle</string>
+    <string name="append_shared_by_notice">shared-by-notice ekle</string>
+    <string name="append_shared_by_notice__appspecific">Bu uygulamaya, paylaşılan metinlere bir referans ekleyin: [örn #dandelion]</string>
     <!-- More -->
+    <string name="miscellaneous">Çeşitli</string>
+    <string name="full_reset">Tamamen Sıfırlama</string>
+    <string name="wipe_settings_and_logout">Uygulama ile ilgili tüm ayarları yerel olarak sil ve tüm hesaplardan çıkış yap</string>
+    <string name="wipe_settings_warning__appspecific">Bu, uygulamanın tüm değiştirilen ayarlarını varsayılan değerlerine sıfırlar ve tüm podlardan çıkar. İndirdiğiniz görüntülere donulmaz. Devam etmek istediğine emin misin?</string>
+    <string name="enable_basic_adblocker_description">Temel reklam engelleyiciyi etkinleştirin. Reklamlar yerleşik görünümlere dahil edilebilir</string>
+    <string name="block_advertisments">Reklamları engelle</string>
+    <string name="about">Hakkında</string>
+    <string name="license">Lisans</string>
+    <string name="debugging">Hata Ayıklama</string>
+    <string name="application">Uygulama</string>
+    <string name="device">Cihaz</string>
+    <string name="diaspora_pod__appspecific">diaspora* Pod</string>
+    <string name="debug_log">Hata Ayıklama Günlükleri</string>
+    <string name="debug_log_verbose">Hata Ayıklama Günlüğü (Detaylı)</string>
+    <string name="app_version_with_arg">Uygulama Sürümü: %1$s</string>
+    <string name="android_version_witharg">Android Sürümü: %1$s</string>
+    <string name="device_name_witharg">Cihaz Adı: %1$s</string>
+    <string name="code_name_witharg">Kod adı: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Pod Profil Adı: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Pod Adresi: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Hata ayıklama günlüğü panoya kopyalandı</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* is your companion app for browsing the social network diaspora*. Yararlı araç çubukları ve Tor Ağı gibi proxy sunucularıyla sosyal deneyimlerinize destek sağlar.</string>
+    <string name="contribute_code">Koda katkıda bulun!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* özgürlük için özgürce geliştirilir ve diaspora* projesinin fikirlerini takip eder. Katkıda bulunmak istiyorsanız, devam edin! Şu anda çok küçük bir takımız, bu yüzden her türlü yardımı çok takdir ediyoruz!</string>
+    <string name="get_the_source">Kaynağı al</string>
+    <string name="translate_the_app">Uygulamayı tercüme et!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Uygulamayı kendi dilinde kullanamıyor musun? Bunu değiştirebilirsin. Neden çeviride bize yardımcı olmuyorsun? Herkesin çeviriye katkıda bulunabilmesi için Crowdin platformunu kullanıyoruz.</string>
+    <string name="let_me_translate">Hadi çevirelim</string>
+    <string name="give_feedback">Geri bildirimde bulun!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* hala geliştirme aşamasındadır, bu yüzden önerileriniz veya herhangi bir geri bildiriminiz varsa, lütfen bize haber vermek için hata izleyicimizi kullanın!</string>
+    <string name="report_bugs">Hataları Bildir</string>
+    <string name="spread_the_word">Herkese duyur!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Arkadaşlarınıza ve ailenize diaspora* ve #dandelion hakkında bilgi verin! Neden deneyimleriniz hakkında blog yazmıyorsunuz? Sizden duymak isteriz!</string>
+    <string name="share_the_app">Uygulamayı paylaş</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Hey %1$s ! #dandelion’a bir göz at!</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Yardımcılar</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Bu uygulamayı şu anda geliştiren ve devam ettiren &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Katkıda bulunanlar</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Teşekkürler!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ License</string>
+    <string name="show_third_party_licenses">Üçüncü Parti Kütüphaneler</string>
+    <string name="the_following_libraries_are_used">Şu kütüphaneler kullanıldı:</string>
+    <string name="inspiration_from_leafpic__appspecific">LeafPic\'ten biraz ilham ve kod aldık. Göz atabilirsiniz, özgür bir yazılım!</string>
+    <string name="tell_me_more">Daha fazla göster</string>
+    <string name="enable_to_open_youtube_links_on_external_app">YouTube linklerini harici uygulamada açmak için etkinleştir</string>
+    <string name="youtube_links">YouTube linkleri</string>
+    <string name="change_the_theme_of_your_account">Hesabınızın temasını değiştirin</string>
+    <string name="pull_to_refresh">Yenilemek için çek</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Yenilemek için sayfanın üst kısmından çekin\nDeğişikliklerin geçerli olması için uygulamayı yeniden başlat.</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8494c969..19fb0794 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">Відкрити панель навігації</string>
+    <string name="close_navdrawer">Закрити панель навігації</string>
     <string name="reload">Перезавантажити</string>
+    <string name="close">Закрити</string>
+    <string name="cancel">Скасувати</string>
     <!-- Common Words -->
     <string name="settings">Налаштування</string>
     <string name="notifications">Сповіщення</string>
@@ -48,14 +52,14 @@
     <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="share_dotdotdot">Поширити…</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="open_in_external_browser">Відкрити у зовнішньому браузері…</string>
     <string name="copy_link_adress_to_clipboard">Копіювати адресу посилання у буфер обміну</string>
     <string name="copy_image_address_to_clipboard">Копіювати зображення у буфер обміну</string>
     <!-- More from MainActivity -->
@@ -77,48 +81,11 @@
     <string name="pod_address">Адреса поду</string>
     <string name="missing_value">Відсутнє значення</string>
     <string name="jump_to_last_visited_page_in_stream__appspecific">Перейти на останню відвідану сторінку в потоці?</string>
-
-    <string name="about">Про нас</string>
-    <string name="license">Ліцензія</string>
-    <string name="debugging">Налагодження</string>
-    <string name="application">Програма</string>
-    <string name="device">Пристрій</string>
-    <string name="diaspora_pod__appspecific">Под Діаспора*</string>
-    <string name="debug_log">Журнал налагодження</string>
-    <string name="debug_log_verbose">Журнал налагодження (детальний)</string>
-    <string name="app_version_with_arg">Версія програми: %1$s</string>
-    <string name="android_version_witharg">Версія Android: %1$s</string>
-    <string name="device_name_witharg">Назва пристрою: %1$s</string>
-    <string name="code_name_witharg">Кодова назва: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">Назва профілю поду: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">Домен поду: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">Журнал налагодження скопійовано в буфер обміну</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* — це ваша програмка для перегляду соціальної мережі Діаспора*. Для зручності, застосунок додає такі функції, як використання панелей інструментів і підримку проксі-серверів на зразок мережі Tor.</string>
-    <string name="contribute_code">Зробіть внесок у код!</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* розробляється як вільне програмне забезпечення і слідує ідеям проекту Діаспора*. Якщо ви хочете зробити внесок, приєднуйтеся! Зараз ми дуже маленька команда, тож будемо раді будь-якій допомозі!</string>
-    <string name="get_the_source">Отримати вихідний код</string>
-    <string name="translate_the_app">Перекласти цю програмку</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">Цей застосунок недоступний вашою мовою? Ви можете це змінити! Чому б не допомогти нам, переклавши його? Ми використовуємо платформу crowdin, де будь-хто може перекласти програмку.</string>
-    <string name="let_me_translate">Хочу перекладати</string>
-    <string name="give_feedback">Залишіть відгук!</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* все ще перебуває у розробці, тому якщо у вас є побажання або відгуки, будь ласка, скористайтеся нашим баг-трекером, щоб ми знали!</string>
-    <string name="report_bugs">Повідомити про помилку</string>
-    <string name="spread_the_word">Поділіться з друзями!</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">Розкажіть про Діаспору і #dandelion друзям і родині! Чому б не написати у блог про свій досвід? Будемо раді почути вашу думку!</string>
-    <string name="share_the_app">Поділитися застосунком</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">Привіт! Спробуй #dandelion! %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">Розробники</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Зараз цю програмку розробляють і підтримують &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">Учасники</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Дякуємо!</string>
-    <string name="gnu_gplv3_license">Ліцензія GNU GPLv3+</string>
-    <string name="show_third_party_licenses">Сторонні бібліотеки</string>
-    <string name="the_following_libraries_are_used">Використовуються такі бібліотеки:</string>
-    <string name="inspiration_from_leafpic__appspecific">Ми взяли трохи натхнення і коду з LeafPic. Це також вільне програмне забезпечення, тож користуйтеся!</string>
-    <string name="tell_me_more">Хочу знати більше</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <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="launcher_shortcut">Створити ярлик</string>
     <!-- Operability -->
     <string name="top_toolbar_loads_stream__appsp">Верхня панель завантажує потік</string>
     <string name="click_empty_space_top_toolbar_load_stream__appspecific">Натисніть на вільному місці верхньої панелі, щоб відкрити потік</string>
@@ -146,7 +113,7 @@
     <!-- Notifications dropdown -->
     <string name="extended_notifications">Розширені сповіщення</string>
     <string name="extendend_notifications_bell_description__appspecific">Додати до дзвоника сповіщень випадне меню з категоріями сповіщень</string>
-    <string name="language_change_restart_description">Змінити мову цієї програмки. Перезавантажте застосунок, щоб зміни запрацювали</string>
+    <string name="language_change_restart_description">Змінити мову додатку. Перезапустіть додаток для застосування змін.</string>
     <string name="language">Мова</string>
     <string name="system_language">Мова системи</string>
     <!-- Font size -->
@@ -199,4 +166,48 @@
     <string name="wipe_settings_warning__appspecific">Це зітре усі змінені налаштування застосунку до їхніх значень за замовчуванням і вилогінить вас з усіх подів. Ваші завантажені зображення залишаться на міці. Бажаєте продовжити?</string>
     <string name="enable_basic_adblocker_description">Увімкнути базовий AdBlocker. Реклама може зберегтися, напр., у вбудованих переглядах</string>
     <string name="block_advertisments">Блокувати рекламу</string>
+    <string name="about">Про Markor</string>
+    <string name="license">Ліцензія</string>
+    <string name="debugging">Налагодження</string>
+    <string name="application">Програма</string>
+    <string name="device">Пристрій</string>
+    <string name="diaspora_pod__appspecific">Под Діаспора*</string>
+    <string name="debug_log">Журнал налагодження</string>
+    <string name="debug_log_verbose">Журнал налагодження (детальний)</string>
+    <string name="app_version_with_arg">Версія програми: %1$s</string>
+    <string name="android_version_witharg">Версія Android: %1$s</string>
+    <string name="device_name_witharg">Назва пристрою: %1$s</string>
+    <string name="code_name_witharg">Кодова назва: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">Назва профілю поду: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">Домен поду: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">Журнал налагодження скопійовано в буфер обміну</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* — це ваша програмка для перегляду соціальної мережі Діаспора*. Для зручності, застосунок додає такі функції, як використання панелей інструментів і підримку проксі-серверів на зразок мережі Tor.</string>
+    <string name="contribute_code">Зробіть внесок у код!</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* розробляється як вільне програмне забезпечення і слідує ідеям проекту Діаспора*. Якщо ви хочете зробити внесок, приєднуйтеся! Зараз ми дуже маленька команда, тож будемо раді будь-якій допомозі!</string>
+    <string name="get_the_source">Отримати вихідний код</string>
+    <string name="translate_the_app">Перекласти цю програмку</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">Цей застосунок недоступний вашою мовою? Ви можете це змінити! Чому б не допомогти нам, переклавши його? Ми використовуємо платформу crowdin, де будь-хто може перекласти програмку.</string>
+    <string name="let_me_translate">Хочу перекладати</string>
+    <string name="give_feedback">Залишіть відгук!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* все ще перебуває у розробці, тому якщо у вас є побажання або відгуки, будь ласка, скористайтеся нашим баг-трекером, щоб ми знали!</string>
+    <string name="report_bugs">Повідомити про помилку</string>
+    <string name="spread_the_word">Поділіться з друзями!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">Розкажіть про Діаспору і #dandelion друзям і родині! Чому б не написати у блог про свій досвід? Будемо раді почути вашу думку!</string>
+    <string name="share_the_app">Поділитися застосунком</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">Привіт! Спробуй #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">Розробники</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">Зараз цю програмку розробляють і підтримують &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">Автори</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;Дякуємо!</string>
+    <string name="gnu_gplv3_license">Ліцензія GNU GPLv3+</string>
+    <string name="show_third_party_licenses">Сторонні бібліотеки</string>
+    <string name="the_following_libraries_are_used">Використовуються такі бібліотеки:</string>
+    <string name="inspiration_from_leafpic__appspecific">Ми взяли трохи натхнення і коду з LeafPic. Це також вільне програмне забезпечення, тож користуйтеся!</string>
+    <string name="tell_me_more">Хочу знати більше</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Увімкнути для відкриття посилань Youtube у зовнішньому застосунку</string>
+    <string name="youtube_links">Youtube посилання</string>
+    <string name="change_the_theme_of_your_account">Змінити тему вашого облікового запису</string>
+    <string name="pull_to_refresh">Потягніть, щоб оновити</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Потягніть сторінку згори вниз, щоб оновити.\nВам потрібно перезавантажити застосунок, щоб зміни набрали сили.</string>
 </resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 00000000..43d88f4b
--- /dev/null
+++ b/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000..c38cc780
--- /dev/null
+++ b/app/src/main/res/values-vi/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <string name="settings">Cài đặt</string>
+    <string name="search">Tìm kiếm</string>
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="hide_statusbar">Ẩn thanh trạng thái</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">Xuất hiện</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <string name="about">Trong khoảng</string>
+    <!-- License & help (large amount of text) -->
+    <string name="contributors">Những người đóng góp</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..d1b2cd37
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">打开导航栏</string>
+    <string name="close_navdrawer">隐藏导航栏</string>
+    <string name="reload">刷新</string>
+    <string name="close">关闭</string>
+    <string name="cancel">取消</string>
+    <!-- Common Words -->
+    <string name="settings">设置</string>
+    <string name="notifications">通知</string>
+    <string name="conversations">对话</string>
+    <string name="stream">串流</string>
+    <string name="profile">资料</string>
+    <string name="aspects">方面</string>
+    <string name="activities">活动</string>
+    <string name="liked">已赞</string>
+    <string name="commented">已评论</string>
+    <string name="mentions">提及</string>
+    <string name="public_">公共</string>
+    <string name="search">搜索</string>
+    <string name="contacts">联系人</string>
+    <string name="changelog">更新日志</string>
+    <string name="statistics">统计</string>
+    <!-- Notifications dropdown menu -->
+    <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="could_not_retrieve_list_of_pods__appspecific">错误：无法检索播客列表！</string>
+    <string name="sorry_need_to_be_connected_to_internet">抱歉，您必须连接到互联网</string>
+    <string name="confirmation">确认</string>
+    <string name="do_you_want_to_exit">您是否想要退出？</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <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">已复制链接地址</string>
+    <string name="new_post">新文章</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">共享。。。</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">在外部浏览器中打开</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="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="custom_pod">自定义 Pod</string>
+    <string name="pod_name">Pod 名称</string>
+    <string name="protocol">协议</string>
+    <string name="pod_address">Pod 地址</string>
+    <string name="missing_value">缺失值</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="launcher_shortcut">启动器快捷方式</string>
+    <!-- Operability -->
+    <string name="top_toolbar_loads_stream__appsp">顶级工具栏负载流</string>
+    <string name="click_empty_space_top_toolbar_load_stream__appspecific">点击顶部工具栏的空间打开流流</string>
+    <!-- Category Titles -->
+    <string name="appearance">外观</string>
+    <string name="network">网络</string>
+    <string name="pod_settings__appspecfic">播客设置</string>
+    <string name="operability">可操作性</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <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="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="amoled_mode_description__app_specific">在 AMOLED 中显示友好的黑色。您需要重启切换此设置。在暗中浏览散居地* 也需要激活暗色主题，您可以在您的个人散居地* 帐户设置中找到。</string>
+    <!-- Notifications dropdown -->
+    <string name="extended_notifications">扩展通知</string>
+    <string name="extendend_notifications_bell_description__appspecific">通过显示通知类别的辍学菜单扩展通知铃声</string>
+    <string name="language_change_restart_description">更改语言（重启应用后生效）</string>
+    <string name="language">语言</string>
+    <string name="system_language">系统语言</string>
+    <!-- Font size -->
+    <string name="control_textsize_of_webview">控制WebView文本大小</string>
+    <string name="font_size">字体大小</string>
+    <string name="normal">正常</string>
+    <string name="large">大</string>
+    <string name="huge">巨大</string>
+    <!-- Load images -->
+    <string name="load_images">加载图像</string>
+    <string name="toggle_image_loading_to_save_mobile_data">切换图像加载到例如保存移动数据</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">屏幕旋转</string>
+    <string name="control_screen_rotation">控制自动旋转屏幕</string>
+    <string name="default_">默认</string>
+    <string name="sensor_ignore_system_settings">传感器\n(忽略系统设置)</string>
+    <string name="portrait">肖像</string>
+    <string name="landscape">横向</string>
+    <!-- Proxy -->
+    <string name="load_tor_preset">加载 Tor 预设</string>
+    <string name="load_proxy_settins_for_tor">为 Tor (Orbot) HTTP 代理加载代理设置</string>
+    <string name="proxy">代理</string>
+    <string name="enable_proxy">启用代理</string>
+    <string name="proxy_dandelion_traffic__appspecific">代理 dandelion*，来规避防火墙。\n可能需要重启。这可能无法在某些手机上运行。</string>
+    <string name="host">主机</string>
+    <string name="port">端口</string>
+    <string name="app_needs_restart_to_disable_proxy_usage">应用需要重新启动以禁用代理使用</string>
+    <string name="orbot_proxy_preset_loaded">加载轨道代理预设</string>
+    <!-- Chrome custom tabs -->
+    <string name="open_external_links_with_chrome_custom_tabs_description">使用 Chrome 自定义标签打开外部链接。Chromium、Firefox 或 Google Chrome 需要安装才能使用此功能。 \nImportant：Chrome 自定义标签不使用配置的代理服务器！</string>
+    <!-- Diaspora Settings -->
+    <string name="personal_settings">个人设置</string>
+    <string name="open_diaspora_account_settings__appspecific">打开 Diaspora* 帐户设置</string>
+    <string name="manage_your_contact_list">管理您的联系人列表</string>
+    <string name="manage_hashtags">管理哈希标签</string>
+    <string name="unfollow_already_followed_hashtags__appspecific">取消关注已经跟随哈希</string>
+    <string name="change_account">更改帐户</string>
+    <string name="loug_warning_description__appspecific">擦除本地会话数据并切换到另一个 Diaspora* pod/帐户</string>
+    <string name="logout_warning_description">这将删除所有 cookie 和会话数据。您真的想要更改您的帐户吗？</string>
+    <string name="clear_cache">清除缓存</string>
+    <string name="clear_webview_cache">清除WebView缓存</string>
+    <string name="intellihide_toolbars__appspecific">滚动时自动隐藏顶部和底部工具栏</string>
+    <string name="intellihide_toolbars">智能隐藏工具栏</string>
+    <string name="append_shared_by_notice">附加共享通知</string>
+    <string name="append_shared_by_notice__appspecific">将此应用添加到共享文本：[通过 #dandelion]</string>
+    <!-- More -->
+    <string name="miscellaneous">杂项</string>
+    <string name="full_reset">完全重置</string>
+    <string name="wipe_settings_and_logout">本地擦除应用程序的所有设置，注销所有账户</string>
+    <string name="wipe_settings_warning__appspecific">这将重置应用程序的所有更改设置为默认值，并从所有讲台上注销。您下载的图像将保持不变。您确定要继续吗？</string>
+    <string name="enable_basic_adblocker_description">启用基本的 AdBlocker。广告可能包括在内部的视图中</string>
+    <string name="block_advertisments">屏蔽广告</string>
+    <string name="about">关于</string>
+    <string name="license">许可</string>
+    <string name="debugging">调试</string>
+    <string name="application">适用范围</string>
+    <string name="device">设备</string>
+    <string name="diaspora_pod__appspecific">散居者*播客</string>
+    <string name="debug_log">调试日志</string>
+    <string name="debug_log_verbose">调试日志(Verbose)</string>
+    <string name="app_version_with_arg">应用版本: %1$s</string>
+    <string name="android_version_witharg">Android 版本: %1$s</string>
+    <string name="device_name_witharg">设备名称： %1$s</string>
+    <string name="code_name_witharg">代码名: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">播客资料名称: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">播客域: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">调试日志已复制到剪贴板</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* 是您浏览社交网络 diaspora* 的配套应用。它添加了一些功能，例如有用的工具栏和支持Tor网络等代理服务器。</string>
+    <string name="contribute_code">贡献代码！</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* 像自由一样自由发展，遵循 diaspora* 项目的想法。如果你想作出贡献，继续前进！目前我们是一个非常小的团队，因此我们非常感谢任何帮助！</string>
+    <string name="get_the_source">获取源</string>
+    <string name="translate_the_app">翻译应用！</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">应用程序不可用您的语言？您可以更改它！为什么你没有帮助我们翻译它？我们使用Stringlate来让任何人能够翻译这个应用。</string>
+    <string name="let_me_translate">让我翻译</string>
+    <string name="give_feedback">提供反馈！</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* 仍在开发中，所以如果您有任何建议或任何反馈，请使用我们的错误追踪器让我们知道！</string>
+    <string name="report_bugs">报告错误</string>
+    <string name="spread_the_word">传播单词！</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">告诉你的朋友和家人关于 Diaspora* 和 #dandelion! 为什么你没有关于你的经历的博客? 我们很喜欢听到你的声音!</string>
+    <string name="share_the_app">分享应用</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">嘿！看看 #dandelion! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">维护者</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">此应用目前正在开发和维持 &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">贡献者</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;谢谢！</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ 授权</string>
+    <string name="show_third_party_licenses">第三方图书馆</string>
+    <string name="the_following_libraries_are_used">使用下列图书馆：</string>
+    <string name="inspiration_from_leafpic__appspecific">我们从LeafPic获得了一些灵感和代码。去检查它，也是免费的软件！</string>
+    <string name="tell_me_more">告诉我更多</string>
+    <string name="enable_to_open_youtube_links_on_external_app">启用在外部应用打开 Youtube 链接</string>
+    <string name="youtube_links">YouTube链接</string>
+    <string name="change_the_theme_of_your_account">更改您的帐户的主题</string>
+    <string name="pull_to_refresh">下拉刷新</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">在页面顶部下拉刷新。\n您需要重新启动应用程序以使更改生效。</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fdbdc7ad..22866bc8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Application -->
+    <string name="open_navdrawer">開啟側邊導覽選單</string>
+    <string name="close_navdrawer">關閉側邊導覽選單</string>
     <string name="reload">重新下載</string>
+    <string name="close">關閉</string>
+    <string name="cancel">取消</string>
     <!-- Common Words -->
     <string name="settings">設定</string>
     <string name="notifications">通知</string>
@@ -48,7 +52,7 @@
     <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="share_dotdotdot">分享…</string>
     <string name="by_tags">找標籤</string>
     <string name="by_people">找人</string>
     <string name="please_add_a_name">請輸入名稱</string>
@@ -75,48 +79,7 @@
     <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>
-    <string name="debugging">除錯</string>
-    <string name="application">應用程式</string>
-    <string name="device">裝置</string>
-    <string name="diaspora_pod__appspecific">diaspora* 豆莢</string>
-    <string name="debug_log">除錯紀錄</string>
-    <string name="debug_log_verbose">除錯紀錄(詳細版)</string>
-    <string name="app_version_with_arg">應用程式版本: %1$s</string>
-    <string name="android_version_witharg">Android 版本: %1$s</string>
-    <string name="device_name_witharg">裝置名稱: %1$s</string>
-    <string name="code_name_witharg">代號: %1$s</string>
-    <string name="pod_profile_name_witharg__appspecific">豆莢設定名稱: %1$s</string>
-    <string name="pod_domain_witharg__appspecific">豆莢網址: %1$s</string>
-    <string name="debug_log_copied_to_clipboard">已經複製除錯紀錄到剪貼簿了</string>
-    <string name="dandelion_is_your_companion__appspecific">dandelion* (蒲公英*) 是你瀏覽 diaspora* 社交網站的好朋友。它讓你的體驗增加了好用的工具列，並且支援像是 Tor 之類的代理伺服器服務。</string>
-    <string name="contribute_code">貢獻程式碼！</string>
-    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* 是自由軟體開發專案，並且追隨 diaspora* 專案的信念。想要貢獻你的心力嗎？那就來吧！目前我們還只是個很小的團隊，任何形式的幫忙都會讓我們足感心！</string>
-    <string name="get_the_source">取得源碼</string>
-    <string name="translate_the_app">翻譯應用程式！</string>
-    <string name="app_not_available_in_your_lang_translate_with_stringlate">應用程式沒有你使用語言的版本嗎？你可以改變現狀！何不來幫忙我們翻譯呢？我們使用 crowdin 平台，好讓每個人都能夠參與應用程式的翻譯工作。</string>
-    <string name="let_me_translate">我來翻譯</string>
-    <string name="give_feedback">意見回饋！</string>
-    <string name="dandelion_still_in_development__appspecific">dandelion* 還在開發階段，所以如果你有任何建議，或是有其他的意見要回饋，請使用我們的臭蟲追蹤網站來讓我們知道！</string>
-    <string name="report_bugs">回報臭蟲</string>
-    <string name="spread_the_word">報給人知！</string>
-    <string name="tell_your_friends_about_diaspora__appspecific">告訴你的朋友和家人有 #dandelion 這個好東西！何不部落格一下你的使用經驗呢？我們期待聽聽你的故事！</string>
-    <string name="share_the_app">分享應用程式</string>
-    <string name="hey_checkout_dandelion_tag__appspecific">哇！看看 #dandelion 這套應用程式！ %1$s</string>
-    <!-- License & help (large amount of text) -->
-    <string name="maintainers">維護人員</string>
-    <string name="this_app_is_currently_developed_and_maintained_by_witharg">目前這套應用程式是由以下人員開發與維護： &lt;br&gt;&lt;br&gt;%1$s</string>
-    <string name="contributors">貢獻人</string>
-    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;感謝你們！</string>
-    <string name="gnu_gplv3_license">GNU GPLv3+ 授權條款</string>
-    <string name="show_third_party_licenses">第三方程式庫</string>
-    <string name="the_following_libraries_are_used">我們使用了下列程式庫：</string>
-    <string name="inspiration_from_leafpic__appspecific">我們從 LeafPic 應用程式得到一些啟發以及程式碼。去看看吧，它也是自由軟體喔！</string>
-    <string name="tell_me_more">再多說一些</string>
-
-    <!-- Key Names (Untranslatable) -->
+    <string name="launcher_shortcut">桌面捷徑</string>
     <!-- Operability -->
     <string name="top_toolbar_loads_stream__appsp">上方工具列可載入流水帳</string>
     <string name="click_empty_space_top_toolbar_load_stream__appspecific">可以點上方工具列的空白區域來進入流水帳</string>
@@ -198,4 +161,48 @@
     <string name="wipe_settings_warning__appspecific">將要重設此應用程式的所有設定為預設值，並登出你在所有豆莢的帳號。不過不會變動已經下載了的圖片。確定要繼續嗎？</string>
     <string name="enable_basic_adblocker_description">開啟基本的廣告封鎖器。廣告可能會出現在嵌入式視圖之類的地方。</string>
     <string name="block_advertisments">廣告封鎖</string>
+    <string name="about">說明</string>
+    <string name="license">授權條款</string>
+    <string name="debugging">除錯</string>
+    <string name="application">應用程式</string>
+    <string name="device">裝置</string>
+    <string name="diaspora_pod__appspecific">diaspora* 豆莢</string>
+    <string name="debug_log">除錯紀錄</string>
+    <string name="debug_log_verbose">除錯紀錄(詳細版)</string>
+    <string name="app_version_with_arg">應用程式版本: %1$s</string>
+    <string name="android_version_witharg">Android 版本: %1$s</string>
+    <string name="device_name_witharg">裝置名稱: %1$s</string>
+    <string name="code_name_witharg">代號: %1$s</string>
+    <string name="pod_profile_name_witharg__appspecific">豆莢設定名稱: %1$s</string>
+    <string name="pod_domain_witharg__appspecific">豆莢網址: %1$s</string>
+    <string name="debug_log_copied_to_clipboard">已經複製除錯紀錄到剪貼簿了</string>
+    <string name="dandelion_is_your_companion__appspecific">dandelion* (蒲公英*) 是你瀏覽 diaspora* 社交網站的好朋友。它讓你的體驗增加了好用的工具列，並且支援像是 Tor 之類的代理伺服器服務。</string>
+    <string name="contribute_code">貢獻程式碼！</string>
+    <string name="dandelion_is_developed_as_foss__appspecific">dandelion* 是自由軟體開發專案，並且追隨 diaspora* 專案的信念。想要貢獻你的心力嗎？那就來吧！目前我們還只是個很小的團隊，任何形式的幫忙都會讓我們足感心！</string>
+    <string name="get_the_source">取得源碼</string>
+    <string name="translate_the_app">翻譯應用程式！</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">應用程式沒有你使用語言的版本嗎？你可以改變現狀！何不來幫忙我們翻譯呢？我們使用 crowdin 平台，好讓每個人都能夠參與應用程式的翻譯工作。</string>
+    <string name="let_me_translate">我來翻譯</string>
+    <string name="give_feedback">意見回饋！</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* 還在開發階段，所以如果你有任何建議，或是有其他的意見要回饋，請使用我們的臭蟲追蹤網站來讓我們知道！</string>
+    <string name="report_bugs">回報臭蟲</string>
+    <string name="spread_the_word">報給人知！</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">告訴你的朋友和家人有 #dandelion 這個好東西！何不部落格一下你的使用經驗呢？我們期待聽聽你的故事！</string>
+    <string name="share_the_app">分享應用程式</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">哇！看看 #dandelion 這套應用程式！ %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">維護人員</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">目前這套應用程式是由以下人員開發與維護： &lt;br&gt;&lt;br&gt;%1$s</string>
+    <string name="contributors">貢獻人</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;感謝你們！</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ 授權條款</string>
+    <string name="show_third_party_licenses">第三方程式庫</string>
+    <string name="the_following_libraries_are_used">我們使用了下列程式庫：</string>
+    <string name="inspiration_from_leafpic__appspecific">我們從 LeafPic 應用程式得到一些啟發以及程式碼。去看看吧，它也是自由軟體喔！</string>
+    <string name="tell_me_more">再多說一些</string>
+    <string name="enable_to_open_youtube_links_on_external_app">使用其他應用程式來開啟 Youtube 連結</string>
+    <string name="youtube_links">Youtube 連結</string>
+    <string name="change_the_theme_of_your_account">修改帳號的佈景主題</string>
+    <string name="pull_to_refresh">下拉可更新</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">從頁面的上方下拉一下可以更新內容。\n這個設定修改後需要重啟應用程式才會生效。</string>
 </resources>
diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
index aaa5137a..7f67ac27 100644
--- a/app/src/main/res/values/strings-not_translatable.xml
+++ b/app/src/main/res/values/strings-not_translatable.xml
@@ -37,10 +37,6 @@
 
 
     <string name="not_implemented" translatable="false">not_implemented</string>
-    <string name="donate__bitcoin_id" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_message" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_amount" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_url" translatable="false">@string/not_implemented</string>
 
     <!-- Rotation values -->
     <string name="rotation_val_system" translatable="false">auto</string>
@@ -148,4 +144,7 @@
     <string name="pref_key__show_title" translatable="false">pref_key__show_title</string>
     <string name="pdf" translatable="false">PDF</string>
     <string name="gsantner" translatable="false">gsantner</string>
-</resources>
+    <string name="pref_key__open_youtube_external_enabled" translatable="false">pref_key__open_youtube_external_enabled</string>
+    <string name="pref_key__manage_theme" translatable="false">pref_key_manage_theme</string>
+    <string name="pref_key__swipe_refresh_enabled" translatable="false">pref_key__swipe_refresh_enabled</string>
+  </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d61d659c..78bac4bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,6 +4,8 @@
     <string name="open_navdrawer">Open navigation drawer</string>
     <string name="close_navdrawer">Close navigation drawer</string>
     <string name="reload">Reload</string>
+    <string name="close">Close</string>
+    <string name="cancel">Cancel</string>
 
     <!-- Common Words -->
     <string name="settings">Settings</string>
@@ -253,5 +255,10 @@
     <string name="the_following_libraries_are_used">The following libraries are used:</string>
     <string name="inspiration_from_leafpic__appspecific">We took some inspiration and code from LeafPic. Go check it out, it\'s free software as well!</string>
     <string name="tell_me_more">Tell me more</string>
+    <string name="enable_to_open_youtube_links_on_external_app">Enable to open Youtube links on external app</string>
+    <string name="youtube_links">Youtube links</string>
+    <string name="change_the_theme_of_your_account">Change the theme of your account</string>
+    <string name="pull_to_refresh">Pull to refresh</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">Pulling down on top of page to refresh.\nYou need to restart the app for changes to take effect.</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml
index 7bb330f9..c6afd55f 100644
--- a/app/src/main/res/xml/preferences__master.xml
+++ b/app/src/main/res/xml/preferences__master.xml
@@ -73,6 +73,13 @@
             android:summary="@string/open_external_links_with_chrome_custom_tabs_description"
             android:title="@string/pref_title__chrome_custom_tabs_enabled"/>
 
+        <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_open_yt_external_black_24px"
+            android:key="@string/pref_key__open_youtube_external_enabled"
+            android:summary="@string/enable_to_open_youtube_links_on_external_app"
+            android:title="@string/youtube_links"/>
+
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:icon="@drawable/ic_touch_app_black_24px"
@@ -96,6 +103,13 @@
             android:summary="@string/control_screen_rotation"
             android:title="@string/screen_rotation"/>
 
+        <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_touch_app_black_24px"
+            android:key="@string/pref_key__swipe_refresh_enabled"
+            android:title="@string/pull_to_refresh"
+            android:summary="@string/pulling_down_on_top_of_page_to_refresh"/>
+
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
     <!-- Diaspora Pod Settings -->
diff --git a/app/src/main/res/xml/preferences__sub_themes.xml b/app/src/main/res/xml/preferences__sub_themes.xml
index ec5a5e00..aa4bde15 100644
--- a/app/src/main/res/xml/preferences__sub_themes.xml
+++ b/app/src/main/res/xml/preferences__sub_themes.xml
@@ -21,5 +21,12 @@
             android:summary="@string/amoled_mode_description__app_specific"
             android:title="@string/amoled_mode"
             android:icon="@drawable/ic_color_lens_black_24px" />
+
+        <Preference
+            android:icon="@drawable/ic_color_lens_black_24px"
+            android:key="@string/pref_key__manage_theme"
+            android:summary="@string/change_the_theme_of_your_account"
+            android:title="@string/open_diaspora_account_settings__appspecific"/>
+
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4afa4183..75a6ed58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,44 +1,43 @@
 /*#######################################################
-*
-*   Maintained by Gregor Santner, 2017-
-*   https://gsantner.net/
-*
-*   License: Apache 2.0 / Commercial
-*  https://github.com/gsantner/opoc/#licensing
-*  https://www.apache.org/licenses/LICENSE-2.0
-*
+ *
+ * SPDX-FileCopyrightText: 2017-2023 Gregor Santner <gsantner AT mailbox DOT org>
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ *
 #########################################################*/
-import java.text.SimpleDateFormat
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
-    ext.version_setup_compileSdk = 27
-    ext.version_setup_minSdk = 17
-    ext.version_setup_targetSdk = ext.version_setup_compileSdk
-    ext.version_setup_buildTools = "27.0.3" // Specifying optional
+import java.text.SimpleDateFormat
 
-    // https://developer.android.com/studio/releases/gradle-plugin.html
-    ext.version_gradle_tools = "3.1.0"
-    // https://developer.android.com/topic/libraries/support-library/revisions.html
-    ext.version_library_appcompat = "27.1.1"
-    // https://github.com/JakeWharton/butterknife/releases
-    ext.version_library_butterknife = "8.8.1"
-    // https://github.com/guardianproject/NetCipher/releases
-    ext.version_library_netcipher = "2.0.0-alpha1"
-    // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin#LookAtCentral
-    ext.version_plugin_kotlin = "1.2.21"
-    ext.enable_plugin_kotlin = false
+buildscript {
+    ext {
+        version_gradle_tools = "3.6.3"
+        version_plugin_kotlin = "1.3.72"
+        enable_plugin_kotlin = false
+
+        version_compileSdk = 29
+        version_buildTools = "29.0.3"
+        version_minSdk = 17
+
+        // https://developer.android.com/topic/libraries/support-library/
+        version_library_appcompat = "28.0.0" //androidx
+        // https://github.com/JakeWharton/butterknife/releases
+        version_library_butterknife = "8.8.1" //9.0.0-rc2
+        // https://github.com/guardianproject/NetCipher/releases
+        version_library_netcipher = "2.0.0-alpha1"
+    }
 
     repositories {
-        google()
+        maven { url 'https://maven.google.com' }
         jcenter()
+        maven { url "https://jitpack.io" }
+        mavenCentral()
     }
+
     dependencies {
-        classpath "com.android.tools.build:gradle:$version_gradle_tools"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath "com.android.tools.build:gradle:${version_gradle_tools}"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         if (project.enable_plugin_kotlin) {
-            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_plugin_kotlin"
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${version_plugin_kotlin}"
         }
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -48,15 +47,22 @@ buildscript {
 
 allprojects {
     repositories {
-        google()
+        maven { url 'https://maven.google.com' }
         jcenter()
-        mavenCentral()
         maven { url "https://jitpack.io" }
+        mavenCentral()
     }
 
     tasks.matching { task -> task.name.matches('.*generate.*Resources') }.all {
         task -> task.dependsOn copyRepoFiles
     }
+
+    tasks.matching {it instanceof Test}.all { // Enable unit test output, html+xml output
+        testLogging.events "passed", "skipped", "failed", "standardOut", "standardError"
+        testLogging.showStandardStreams = true
+        reports.junitXml.enabled = true
+        reports.html.enabled = true
+    }
 }
 
 task clean(type: Delete) {
@@ -77,7 +83,7 @@ static String findUsedAndroidLocales() {
     Set<String> langs = new HashSet<>()
     new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
         final foldername = it.name
-        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates")) {
+        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates") && !it.canonicalPath.contains("gradle" + File.separator + "daemon")) {
             new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
                 if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
                     langs.add(foldername.replace("values-", ""))
@@ -100,6 +106,7 @@ ext.getGitHash = { ->
         return 'unknown'
     }
 }
+
 @SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection", "GroovyUnusedDeclaration"])
 // Returns the build date in a RFC3339 compatible format. TZ is always converted to UTC
 static String getBuildDate() {
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 35978980..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-###################
-general:
-    artifacts:
-        - /home/ubuntu/dandelion/app/build/outputs/apk/
-    branches:
-        ignore:
-            - gh-pages
-            - l10n_master
-            - crowdin
-
-###################
-machine:
-    java:
-        version: oraclejdk8
-    environment:
-        ANDROID_HOME: /usr/local/android-sdk-linux
-
-###################
-dependencies:
-  pre:
-    # Android SDK Platform
-    - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-26" ]; then echo y | android update sdk --no-ui --all --filter "android-26"; fi
-    # Android SDK Build-tools
-    - if [ ! -d "/usr/local/android-sdk-linux/build-tools/26.0.1" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-26.0.1"; fi
-    # Android Support Repository - deprecated
-    #- if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/26.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi
-    
-
-  cache_directories:
-    - /usr/local/android-sdk-linux/platforms/android-26
-    - /usr/local/android-sdk-linux/build-tools/26.0.1
-    #- /usr/local/android-sdk-linux/extras/android/m2repository
-
-###################
-test:
-    override:
-        - (./gradlew assembleFlavorDefault):
-            timeout: 360
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000..c4ffe7a5
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,70 @@
+# vim: sw=2 ts=2 noexpandtab:
+commit_message: "[ci skip] Update translations (%language%)"
+append_commit_message: false
+files:
+  - source: /app/src/main/res/values/strings.xml
+    translation: /app/src/main/res/values-%android_code%/%original_file_name%
+    languages_mapping:
+      android_code:
+        az: az    # Azerbaijani
+        ckb: ckb  # Sorani (Kurdish)
+        kmr: kmr  # Kurmanji (Kurdish)
+        gl: gl  	# Galician
+        sc: sc  	# Sardinian
+        kab: kab        # Kabyle
+        hi: hi 		# Indian, Hindi
+        ml-IN: ml 	# Indian, Malayalam
+        fa: fa		# Persian
+        nb: nb-rNO 	# Norwegian, Bokmal
+        sv-SE: sv 	# Swedish
+        es-ES: es 	# Espanol
+        de: de 		# German
+        ru: ru 		# Russian
+        pl: pl 		# Polish
+        ja: ja 		# Japanese
+        it: it 		# Italian
+        fr: fr 		# French
+        da: da 		# Danish
+        nl: nl 		# Dutch
+        hu: hu 		# Hungarian
+        cs: cs 		# Czech
+        ko: ko 		# Korean
+        zh-CN: zh-rCN   # Chinese (Simplified on Android)
+        zh-TW: zh-rTW   # Chinese (Traditional on Android)
+        el: el 		# Greek
+        "no": 'no' 	# Norwegian
+        tr: tr 		# Turkish
+        ca: ca 		# Catalan
+        pt-PT: pt 	# Portugese
+        pt-BR: pt-rBR	# Portugese, Brazilian
+        fil: fil	# Filipino
+        uk: uk		# Ukrainian
+        ar: ar		# Arabic
+        fi: fi		# Finnish
+        af: af		# Afrikaans
+        he: iw		# Hebrew
+        ro: ro		# Romanian
+        vi: vi		# Vietnamese
+        bs: bs		# Bosnian
+        sr: sr		# Serbian, Cyrillic
+        sr-CS: sr-rRS	# Serbian, Latin
+        bn: bn # Bengali
+        pa-IN: pa # Punjabi, India
+        jv: jw # Javanese
+        mr: mr # Marathi
+        te: te # Telugu
+        ur-PK: ur # Urdu, Pakistan
+        id: in # Indonesian
+        sk: sk # Slovak
+        kn: kn # Kannada (Asian)
+        ta: ta # Tamil (Asian)
+        sq: sq # Albanian
+        mk: mk # Macedonian
+        si-LK: si # Sinhala (Sri Lanka)
+        eo: eo # Esperanto
+        or: or # Odia/Oriya (India)
+        hr: hr # Croatia
+        bg: bg # Bulgarian
+        et: et # Estonian
+        th: th # Thai
+    translate_attributes: 0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 18a0cf95..505b369a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 08 08:39:15 CEST 2018
+#Fri Jul 26 02:59:10 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
diff --git a/metadata/de/full_description.txt b/metadata/de/full_description.txt
new file mode 100644
index 00000000..5813a487
--- /dev/null
+++ b/metadata/de/full_description.txt
@@ -0,0 +1,23 @@
+Client für das gemeinschaftlich betriebene, verteile soziale Netzwerk diaspora*.
+Verbessere dein Netzwerk-Erlebnis durch nützliche Features:
+
+⚡ Schnellzugriff auf die meisten diaspora* Funktionen
+🎨 Anpassbar an deinen Geschmack
+👉 Teile Inhalte mit und von der App
+🌎 Unterstützung von Proxies (unterstützt Tor/Orbot)
+📰 In-App-Browser zum schnellen lesen von Artikeln
+🌆 Dark/AMOLED Modus zum Energiesparen und Augen schonen
+🈴 Verfügbar in vielen Sprachen
+#️⃣  Durchsuche Tags und Aspekte
+
+🈯 Getrennte App- und Systemsprache. Nutze die App in beliebiger Sprache (zB. Englisch) und behalte deine Systemsprache (zB. Deutsch) bei.
+
+🔐 Du bist noch auf der Suche nach einem Pod um dich zu registrieren? Die App bringt eine große Liste mit und weitere Pods findest du auf <a href="https://diaspora.fediverse.observer/">diaspora.fediverse.observer</a>.
+
+🍻 Mehrere Accounts: Nutze dandelion* und <a href="https://f-droid.org/de/packages/net.gsantner.dandelior/">dandelior*</a> um zwei Accounts auf dem gleichen Gerät zu nutzen. Die Apps besitzen eigene Icons und unterschiedliche Vorgabefarben.
+
+🌍 Hinweis: Die App nutzt Androids WebView Komponente um Inhalte von diaspora* Pods in der mobilen Ansicht anzuzeigen. Für fehlende Features frage bitte auf dem diaspora* Bug Tracker.
+
+<b>Weitere Informationen:</b>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
+
diff --git a/metadata/de/short_description.txt b/metadata/de/short_description.txt
new file mode 100644
index 00000000..71a3004f
--- /dev/null
+++ b/metadata/de/short_description.txt
@@ -0,0 +1 @@
+Client für das Soziale Netzwerk diaspora*
diff --git a/metadata/en b/metadata/en
deleted file mode 120000
index f2b0341f..00000000
--- a/metadata/en
+++ /dev/null
@@ -1 +0,0 @@
-en-US
\ No newline at end of file
diff --git a/metadata/en-US/changelogs/1.txt b/metadata/en-US/changelogs/1.txt
new file mode 100644
index 00000000..d60031cb
--- /dev/null
+++ b/metadata/en-US/changelogs/1.txt
@@ -0,0 +1 @@
+Added to F-Droid
diff --git a/metadata/en-US/featureGraphic.png b/metadata/en-US/featureGraphic.png
index 39038c2f..92105097 100644
Binary files a/metadata/en-US/featureGraphic.png and b/metadata/en-US/featureGraphic.png differ
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index cb8fdf60..e1c445bd 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -12,14 +12,11 @@ It adds useful features to your networking experience:
 
 🈯 Use in any language that the app is translated in - for example in German but have English as system language.
 
-🔐 Looking for a pod to register? The app lists many pods with more being listed at <a href="https://podupti.me/">podupti.me</a>.
+🔐 Looking for a pod to register? The app lists many pods with more being listed at <a href="https://diaspora.fediverse.observer/">diaspora.fediverse.observer</a>.
 
 🍻 Multiple accounts: You can use dandelion* and dandelior* to use two accounts at the same time on one device. They use a different icon and other default colors.
 
 🌍 Notice: The app uses the Android WebView component to display contents of diaspora* pods in the mobile view. For missing features and bugs in mobile view, ask at diaspora* bugtracker.
 
 <b> More information:</b>
-<a href="https://gsantner.net/index.html?project=dandelion&source=fdroid">Project Blog</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
-
-<b>Support the project:</b>
-<a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg">Translate using Stringlate</a> | <a href="https://matrix.to/#/#dandelion:matrix.org">Join discussion on Matrix</a> | <a href="https://github.com/gsantner/dandelion#contributions">Contribution information</a> | <a href="https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=fdroid">Android Contribution Guide</a> | <a href="https://gsantner.net/supportme?project=dandelion&source=fdroid">Support main developer</a>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
diff --git a/metadata/en-US/promoGraphic.png b/metadata/en-US/promoGraphic.png
index a750adc9..186cec0f 100644
Binary files a/metadata/en-US/promoGraphic.png and b/metadata/en-US/promoGraphic.png differ
diff --git a/metadata/zz/full_description.txt b/metadata/zz/full_description.txt
new file mode 100644
index 00000000..8e27be7d
--- /dev/null
+++ b/metadata/zz/full_description.txt
@@ -0,0 +1 @@
+text
diff --git a/metadata/zz/short_description.txt b/metadata/zz/short_description.txt
new file mode 100644
index 00000000..8e27be7d
--- /dev/null
+++ b/metadata/zz/short_description.txt
@@ -0,0 +1 @@
+text
diff --git a/metadata/zz/title.txt b/metadata/zz/title.txt
new file mode 100644
index 00000000..8e27be7d
--- /dev/null
+++ b/metadata/zz/title.txt
@@ -0,0 +1 @@
+text
diff --git a/patches/vanitasvitae-Add-first-image-viewer-design.patch b/patches/vanitasvitae-Add-first-image-viewer-design.patch
new file mode 100644
index 00000000..ffb9ecab
--- /dev/null
+++ b/patches/vanitasvitae-Add-first-image-viewer-design.patch
@@ -0,0 +1,240 @@
+From 90ae580fa732962127156a333b5d879cd4a80d36 Mon Sep 17 00:00:00 2001
+From: vanitasvitae <vanitasvitae@fsfe.org>
+Date: Mon, 10 Apr 2017 21:43:24 +0200
+Subject: [PATCH] Add first image viewer design
+
+---
+ app/build.gradle                              |  1 +
+ .../activity/ImageViewFragment.java           | 77 +++++++++++++++++++
+ .../activity/MainActivity.java                |  4 +
+ .../service/ImageDownloadTask.java            | 17 ++++
+ .../web/ContextMenuWebView.java               | 16 ++++
+ .../main/res/layout/image_view__fragment.xml  | 19 +++++
+ 6 files changed, 134 insertions(+)
+ create mode 100644 app/src/main/java/com/github/dfa/diaspora_android/activity/ImageViewFragment.java
+ create mode 100644 app/src/main/res/layout/image_view__fragment.xml
+
+diff --git a/app/build.gradle b/app/build.gradle
+index 5449e9fc..c46301ed 100644
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -85,6 +85,7 @@ dependencies {
+     compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
+     compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
+     compile 'com.github.DASAR:ShiftColorPicker:v0.5'
++    compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
+     apt 'com.jakewharton:butterknife-compiler:8.0.1'
+ }
+ 
+diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/ImageViewFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ImageViewFragment.java
+new file mode 100644
+index 00000000..164e37ae
+--- /dev/null
++++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ImageViewFragment.java
+@@ -0,0 +1,77 @@
++package com.github.dfa.diaspora_android.activity;
++
++import android.graphics.Bitmap;
++import android.os.Bundle;
++import android.view.LayoutInflater;
++import android.view.Menu;
++import android.view.MenuInflater;
++import android.view.View;
++import android.view.ViewGroup;
++import android.widget.ProgressBar;
++
++import com.davemorrissey.labs.subscaleview.ImageSource;
++import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
++import com.github.dfa.diaspora_android.R;
++import com.github.dfa.diaspora_android.service.ImageDownloadTask;
++import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
++import com.github.dfa.diaspora_android.util.AppLog;
++
++import butterknife.BindView;
++import butterknife.ButterKnife;
++
++/**
++ * Created by vanitas on 10.04.17.
++ */
++
++public class ImageViewFragment extends ThemedFragment {
++    public static final String TAG = "com.github.dfa.diaspora_android.ImageViewFragment";
++    public static final String IMAGE_SOURCE = "IMAGE_SOURCE";
++
++    @BindView(R.id.imageView)
++    SubsamplingScaleImageView imageView;
++    @BindView(R.id.marker_progress)
++    ProgressBar progressBar;
++
++    @Override
++    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
++        AppLog.d(this, "onCreateView()");
++        View view = inflater.inflate(R.layout.image_view__fragment, container, false);
++        ButterKnife.bind(this, view);
++        return view;
++    }
++
++    @Override
++    public void onViewCreated(View view, Bundle savedInstanceState) {
++        super.onViewCreated(view, savedInstanceState);
++        new ImageDownloadTask.ImageViewFragmentDownloadTask(this)
++                .execute(getArguments().getString(IMAGE_SOURCE));
++        imageView.setMaxScale(5);
++        imageView.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
++        imageView.setZoomEnabled(true);
++    }
++
++    @Override
++    protected void applyColorToViews() {
++
++    }
++
++    @Override
++    public String getFragmentTag() {
++        return TAG;
++    }
++
++    @Override
++    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
++
++    }
++
++    @Override
++    public boolean onBackPressed() {
++        return false;
++    }
++
++    public void showBitmap(Bitmap bitmap) {
++        progressBar.setVisibility(View.GONE);
++        imageView.setImage(ImageSource.bitmap(bitmap));
++    }
++}
+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 8019fb6d..031b624f 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
+@@ -321,6 +321,10 @@ protected CustomFragment getFragment(String fragmentTag) {
+                     PodSelectionFragment psf = new PodSelectionFragment();
+                     fm.beginTransaction().add(psf, fragmentTag).commit();
+                     return psf;
++                case ImageViewFragment.TAG:
++                    ImageViewFragment ivf = new ImageViewFragment();
++                    fm.beginTransaction().add(ivf, fragmentTag).commit();
++                    return ivf;
+                 default:
+                     AppLog.e(this, "Invalid Fragment Tag: " + fragmentTag
+                             + "\nAdd Fragments Tag to getFragment()'s switch case.");
+diff --git a/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java b/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java
+index 0834ee95..f11cfb82 100644
+--- a/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java
++++ b/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java
+@@ -24,6 +24,9 @@
+ import android.support.annotation.Nullable;
+ import android.widget.ImageView;
+ 
++import com.davemorrissey.labs.subscaleview.ImageSource;
++import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
++import com.github.dfa.diaspora_android.activity.ImageViewFragment;
+ import com.github.dfa.diaspora_android.util.AppLog;
+ 
+ import java.io.FileOutputStream;
+@@ -95,4 +98,18 @@ protected void onPostExecute(Bitmap result) {
+             imageView.setImageBitmap(result);
+         }
+     }
++
++    public static class ImageViewFragmentDownloadTask extends ImageDownloadTask {
++        ImageViewFragment ivf;
++
++        public ImageViewFragmentDownloadTask(ImageViewFragment imageViewFragment) {
++            super(null, null);
++            this.ivf = imageViewFragment;
++        }
++
++        @Override
++        protected void onPostExecute(Bitmap result) {
++            ivf.showBitmap(result);
++        }
++    }
+ }
+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 c4c0e278..6c8947bd 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
+@@ -30,6 +30,7 @@
+ import android.content.pm.PackageManager;
+ import android.graphics.Bitmap;
+ import android.net.Uri;
++import android.os.Bundle;
+ import android.os.Environment;
+ import android.support.v4.content.LocalBroadcastManager;
+ import android.util.AttributeSet;
+@@ -38,6 +39,7 @@
+ import android.widget.Toast;
+ 
+ import com.github.dfa.diaspora_android.R;
++import com.github.dfa.diaspora_android.activity.ImageViewFragment;
+ import com.github.dfa.diaspora_android.activity.MainActivity;
+ import com.github.dfa.diaspora_android.service.ImageDownloadTask;
+ 
+@@ -53,6 +55,7 @@
+     public static final int ID_SAVE_IMAGE = 10;
+     public static final int ID_IMAGE_EXTERNAL_BROWSER = 11;
+     public static final int ID_COPY_IMAGE_LINK = 15;
++    public static final int ID_VIEW_IMAGE = 16;
+     public static final int ID_COPY_LINK = 12;
+     public static final int ID_SHARE_LINK = 13;
+     public static final int ID_SHARE_IMAGE = 14;
+@@ -82,6 +85,18 @@ public boolean onMenuItemClick(MenuItem item) {
+                 HitTestResult result = getHitTestResult();
+                 String url = result.getExtra();
+                 switch (item.getItemId()) {
++
++                    case ID_VIEW_IMAGE: {
++                        ImageViewFragment ivf = new ImageViewFragment();
++                        Bundle b = new Bundle();
++                        b.putString(ImageViewFragment.IMAGE_SOURCE, url);
++                        ivf.setArguments(b);
++                        ((MainActivity) parentActivity).getSupportFragmentManager().beginTransaction()
++                                .addToBackStack(null)
++                                .replace(R.id.fragment_container, ivf).commit();
++                        break;
++                    }
++
+                     //Save image to external memory
+                     case ID_SAVE_IMAGE: {
+                         boolean writeToStoragePermitted = true;
+@@ -224,6 +239,7 @@ protected void onPostExecute(Bitmap result) {
+             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_VIEW_IMAGE, 0, "View").setOnMenuItemClickListener(handler);
+         } else if (result.getType() == HitTestResult.ANCHOR_TYPE ||
+                 result.getType() == HitTestResult.SRC_ANCHOR_TYPE) {
+             // Menu options for a hyperlink.
+diff --git a/app/src/main/res/layout/image_view__fragment.xml b/app/src/main/res/layout/image_view__fragment.xml
+new file mode 100644
+index 00000000..2b91c501
+--- /dev/null
++++ b/app/src/main/res/layout/image_view__fragment.xml
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="utf-8"?>
++<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
++    android:orientation="vertical" android:layout_width="match_parent"
++    android:layout_height="match_parent">
++    <ProgressBar
++        android:layout_centerVertical="true"
++        android:layout_centerHorizontal="true"
++        android:indeterminate="true"
++        android:id="@+id/marker_progress"
++        style="?android:attr/progressBarStyle"
++        android:layout_height="50dp"
++        android:layout_width="50dp"/>
++    <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
++        android:id="@+id/imageView"
++        android:layout_centerHorizontal="true"
++        android:layout_centerVertical="true"
++        android:layout_width="match_parent"
++        android:layout_height="match_parent"/>
++</RelativeLayout>
+\ No newline at end of file