diff --git a/.atomignore b/.atomignore
new file mode 100644
index 00000000..e915f848
--- /dev/null
+++ b/.atomignore
@@ -0,0 +1,17 @@
+.git
+.github
+.gradle
+.idea
+build
+gradle
+.gitlab-ci.yml
+*.iml
+local.properties
+settings.gradle
+gradlew
+gradlew.bat
+LICENSE.md
+app/build
+app/.gitignore
+app/pom.xml
+app/proguard-rules.pro
diff --git a/.travis.yml b/.travis.yml
index a2e9adaa..c4683a96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ cache:
     - $HOME/.gradle/wrapper/
 script: "./gradlew $TASK"
 env:
-    - TASK="lintFlavorDandelionDebug"
+    - TASK="lintFlavorDefaultDebug"
     - TASK="build check --stacktrace"
 
 branches:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1a6209c..78d10d9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v0.2.4
+- Different icon and color for secondlion
+- Language switcher
+- Handle dia.so links
+- Improve security at internal browser decision
+- More icons for notification dropdown
+- Update gradle build scripts
+- Added CircleCI
+
 # v0.2.3
 - Add Czech translation (thanks @bezcitu)
 - Add option to copy image urls to clipboard
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9b5f3306..77d8f7d3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -18,3 +18,4 @@ pskosinski (email AT pskosinski DOT pl): Polish translation
 SansPseudoFix (https://github.com/SansPseudoFix): French translation
 secitem (secitem AT tuta DOT io): Czech translation
 Zsolt Szakács (maxigaz AT diaspora DOT zone): Hungarian translation
+Danilo Raffaelli (https://crowdin.com/profile/Daraf): Italian translation
diff --git a/app/build.gradle b/app/build.gradle
index 0f6af394..2e5f0cc3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,10 +5,19 @@ android {
     compileSdkVersion 24
     buildToolsVersion "24.0.3"
 
+    def VERSION_CODE = 14
+    def VERSION_NAME = "0.2.4"
+    def APP_NAME = "dandelion*"
+    def APP_PACKAGE = "com.github.dfa.diaspora_android"
+    def APP_ICON = "@drawable/ic_launcher"
+
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 24
 
+        buildConfigField "boolean", "IS_TEST_BUILD", "false"
+        buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
+
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -19,21 +28,31 @@ android {
     }
 
     productFlavors {
-        flavorDandelion {
-            applicationId "com.github.dfa.diaspora_android"
-            manifestPlaceholders = [appName: "dandelion*"]
-            versionCode 13
-            versionName "0.2.3"
+        flavorDefault {
+            applicationId APP_PACKAGE
+            resValue 'string', 'app_name', APP_NAME
+            manifestPlaceholders = [appIcon: APP_ICON]
+            versionCode VERSION_CODE; versionName VERSION_NAME
         }
 
-        flavorSecondlion {
-            applicationId "com.github.dfa.secondlion"
-            manifestPlaceholders = [appName: "secondlion*"]
+        flavorTest {
+            applicationId APP_PACKAGE.replace("diaspora_android", "secondlion")
+            resValue 'string', 'app_name', "secondlion*"
+            manifestPlaceholders = [appIcon: APP_ICON + "_test"]
             versionCode = Integer.parseInt(new Date().format('yyMMdd'))
             versionName = new Date().format('yyMMdd')
+            buildConfigField "boolean", "IS_TEST_BUILD", "true"
         }
-    }
 
+ /*       flavorGplay {
+            applicationId APP_PACKAGE
+            resValue 'string', 'app_name', APP_NAME
+            manifestPlaceholders = [appIcon: APP_ICON]
+            versionCode VERSION_CODE; versionName VERSION_NAME
+            buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
+        }
+*/
+    }
     lintOptions {
         disable 'MissingTranslation'
     }
@@ -96,5 +115,4 @@ task copyRepoFiles(type: Copy) {
         }
     }
 }
-
 tasks.copyRepoFiles.execute()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f7ad6bf..150e8241 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,16 +9,16 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
         android:name="com.github.dfa.diaspora_android.App"
-        android:label="${appName}"
-        android:theme="@style/DiasporaLight" >
+        android:allowBackup="false"
+        android:icon="${appIcon}"
+        android:label="@string/app_name"
+        android:theme="@style/DiasporaLight">
 
         <provider
             android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
             android:authorities="${applicationId}.mainactivity"
-            android:exported="false"/>
+            android:exported="false" />
 
         <service
             android:name="com.github.dfa.diaspora_android.service.FetchPodsService"
@@ -27,24 +27,25 @@
 
         <activity
             android:name="com.github.dfa.diaspora_android.activity.SettingsActivity"
-            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|locale|orientation|screenSize"
-            android:theme="@style/DiasporaLight.NoActionBar"
-            android:label="@string/settings" />
+            android:label="@string/settings"
+            android:launchMode="singleInstance"
+            android:theme="@style/DiasporaLight.NoActionBar" />
 
         <activity
             android:name="com.github.dfa.diaspora_android.activity.AboutActivity"
-            android:label="@string/about_activity__title_about_app"
             android:configChanges="locale"
-            android:theme="@style/DiasporaLight.NoActionBar"/>
+            android:label="@string/about_activity__title_about_app"
+            android:theme="@style/DiasporaLight.NoActionBar" />
 
         <activity
             android:name="com.github.dfa.diaspora_android.activity.MainActivity"
-            android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboardHidden|locale|orientation|screenSize"
+            android:icon="${appIcon}"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
             android:theme="@style/DiasporaLight.NoActionBar"
-            android:label="${appName}">
+            android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -67,12 +68,15 @@
             <!-- Intent from Web Browser / Mail / IM / Clickable Link -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
 
                 <!-- Additional allowed services -->
-                <data android:host="dia.so" android:scheme="https" />
+                <data
+                    android:host="dia.so"
+                    android:scheme="https" />
 
                 <!--@@@ PODLIST START-->
                 <data android:host="joindiaspora.com" android:scheme="https" />
diff --git a/app/src/main/ic_launcher_test.png b/app/src/main/ic_launcher_test.png
new file mode 100755
index 00000000..18e3ea1d
Binary files /dev/null and b/app/src/main/ic_launcher_test.png differ
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 e1b98532..757037ce 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
@@ -59,6 +59,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
@@ -392,6 +393,9 @@ public class MainActivity extends ThemedActivity
                 }
             }
         }
+        else if (BuildConfig.IS_TEST_BUILD){
+            navheaderImage.setImageResource(R.drawable.ic_launcher_test);
+        }
         updateNavigationViewEntryVisibilities();
     }
 
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 db494ca6..9b2cd01b 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
@@ -17,7 +17,10 @@ package com.github.dfa.diaspora_android.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.support.annotation.ColorRes;
+import android.support.v4.content.ContextCompat;
 
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.data.DiasporaAspect;
 import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
@@ -136,6 +139,10 @@ public class AppSettings {
         return pref.getInt(key, defaultColor);
     }
 
+    public int getColorRes(@ColorRes int resColorId){
+        return ContextCompat.getColor(context, resColorId);
+    }
+
     public void registerPrefAppPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
         prefApp.registerOnSharedPreferenceChangeListener(listener);
     }
@@ -445,13 +452,14 @@ public class AppSettings {
 
     public int[] getPrimaryColorSettings() {
         return new int[]{
-                getInt(prefApp, R.string.pref_key__primary_color_base, context.getResources().getColor(R.color.md_blue_500)),
-                getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary))
+                getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)),
+                getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary))
         };
     }
 
     public int getPrimaryColor() {
-        return getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary));
+        return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(
+                BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
     }
 
     public void setAccentColorSettings(int base, int shade) {
@@ -461,13 +469,13 @@ public class AppSettings {
 
     public int[] getAccentColorSettings() {
         return new int[]{
-                getInt(prefApp, R.string.pref_key__accent_color_base, context.getResources().getColor(R.color.md_deep_orange_500)),
-                getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent))
+                getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)),
+                getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent))
         };
     }
 
     public int getAccentColor() {
-        return getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent));
+        return getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent));
     }
 
     public boolean isExtendedNotificationsActivated() {
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test.png b/app/src/main/res/drawable-hdpi/ic_launcher_test.png
new file mode 100644
index 00000000..2e1ab3f5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher_test.png b/app/src/main/res/drawable-ldpi/ic_launcher_test.png
new file mode 100644
index 00000000..a4c4ac0b
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test.png b/app/src/main/res/drawable-mdpi/ic_launcher_test.png
new file mode 100644
index 00000000..7f0dec56
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xhdpi/ic_launcher_test.png
new file mode 100644
index 00000000..066d7f73
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png
new file mode 100644
index 00000000..cb862934
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png
new file mode 100644
index 00000000..dbb8dee8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png differ
diff --git a/app/src/main/res/values-cs/strings-preferences.xml b/app/src/main/res/values-cs/strings-preferences.xml
index 6e9e4a44..da2179cd 100644
--- a/app/src/main/res/values-cs/strings-preferences.xml
+++ b/app/src/main/res/values-cs/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Rozšířené oznámení</string>
   <string name="pref_desc__extended_notifications">Rozšiř oznámení zvonku pomocí výběrového menu, které zobrazuje kategorie oznámení</string>
+  <string name="pref_desc__language">Změnit jazyk aplikace. Restartujte aplikaci, aby mohly být provedeny změny</string>
+  <string name="pref_title__language">Jazyk</string>
+  <string name="language_system">Jazyk systému</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Konfigurovat velikost textu WebViewu</string>
   <string name="pref_title__font_size">Velikost písma</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normální</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Automaticky schovat horní a dolní nástrojovou lištu během scrollování</string>
   <string name="pref_title__intellihide_toolbars">Inteligentně schovat nástrojovou lištu</string>
   <string name="pref_title__append_shared_via_app">Přidej „sdíleno pomocí“-poznámku</string>
-  <string name="pref_desc__append_shared_via_app">Připoj referenci na tuto aplikaci („sdíleno pomocí&#8230;“) ke sdílenému textu</string>
+  <string name="pref_desc__append_shared_via_app">Přidat referenci této aplikace ke sdílenému textu: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Různé</string>
   <string name="pref_title__wipe_settings">Celkový reset</string>
diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml
index a0d42fde..e5510951 100644
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Notificaciones extendidas</string>
   <string name="pref_desc__extended_notifications">Extender la campana de notificaciones con un menú desplegable que muestra categorías de notificación</string>
+  <string name="pref_desc__language">Cambiar el idioma de esta aplicación. Reinicie la aplicación para que los cambios surtan efecto</string>
+  <string name="pref_title__language">Idioma</string>
+  <string name="language_system">Idioma del sistema</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Control del tamaño del texto de la vista Web</string>
   <string name="pref_title__font_size">Tamaño de letra</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Tamaño normal</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Ocultar barras de herramientas superior e inferior automáticamente mientras se desplaza</string>
   <string name="pref_title__intellihide_toolbars">Barras de herramientas Intellihide</string>
   <string name="pref_title__append_shared_via_app">Añadir compartido por aviso</string>
-  <string name="pref_desc__append_shared_via_app">Agregar una referencia a esta aplicación (\"compartida por&#8230;\") a los textos compartidos</string>
+  <string name="pref_desc__append_shared_via_app">Agregar una referencia a esta aplicación en los textos compartidos: [vía #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Diverso</string>
   <string name="pref_title__wipe_settings">Reinicio completo</string>
diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml
index ab5d3aa4..d79fdbab 100644
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Notifications étendues</string>
   <string name="pref_desc__extended_notifications">Étendre la cloche de notifications avec un menu déroulant qui affiche les catégories de notification</string>
+  <string name="pref_desc__language">Change la langue de l\'application. Redémarrez l\'application pour que les changements prennent effet</string>
+  <string name="pref_title__language">Langue</string>
+  <string name="language_system">Langue du système</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Contrôle de la taille du texte pour l\'affichage web</string>
   <string name="pref_title__font_size">Taille de la police</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normal</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Masquer les barres d’outils en haut et en bas automatiquement lors du défilement</string>
   <string name="pref_title__intellihide_toolbars">Masquage intelligent des barres d\'outils</string>
   <string name="pref_title__append_shared_via_app">Ajoutez \"partagé via …\" aux partages</string>
-  <string name="pref_desc__append_shared_via_app">Ajoutez une référence à l\'application (« partagée via &#8230;\") aux textes partagés</string>
+  <string name="pref_desc__append_shared_via_app">Ajouter une référence à cette application aux partages: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Divers</string>
   <string name="pref_title__wipe_settings">Réinitialisation complète</string>
diff --git a/app/src/main/res/values-hu/strings-preferences.xml b/app/src/main/res/values-hu/strings-preferences.xml
index 4ad0e966..c8dad184 100644
--- a/app/src/main/res/values-hu/strings-preferences.xml
+++ b/app/src/main/res/values-hu/strings-preferences.xml
@@ -31,7 +31,10 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Kiterjesztett értesítések</string>
   <string name="pref_desc__extended_notifications">Az értesítések gombra kattintva megjelenik egy gyorsmenü, amely értesítéskategóriákat mutat</string>
+  <string name="pref_title__language">Nyelv</string>
+  <string name="language_system">Rendszernyelv</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">A webnézet szövegméretének módosítása</string>
   <string name="pref_title__font_size">Betűméret</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normál</string>
@@ -73,7 +76,7 @@
   <string name="pref_desc__intellihide_toolbars">A felső és alsó eszköztárak automatikus elrejtése görgetés közben</string>
   <string name="pref_title__intellihide_toolbars">Intelligensen eltűnő eszköztárak</string>
   <string name="pref_title__append_shared_via_app">Használt program megemlítése megosztáskor</string>
-  <string name="pref_desc__append_shared_via_app">Ennek az alkalmazásnak megemlítése megosztott szövegeknél (\"megosztva &#8230; által\")</string>
+  <string name="pref_desc__append_shared_via_app">Hivatkozás erre az alkalmazásra a megosztásokban: [megosztva ezzel: #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Egyéb</string>
   <string name="pref_title__wipe_settings">Teljes visszaállítás eredeti értékekre</string>
diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml
index 14ad7c08..b4a5eeaf 100644
--- a/app/src/main/res/values-it/strings-about.xml
+++ b/app/src/main/res/values-it/strings-about.xml
@@ -18,13 +18,13 @@
   <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
   <string name="fragment_about__about_text">dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social.</string>
   <string name="fragment_about__contribute">Contribuisci al codice!</string>
-  <string name="fragment_about__contribute_text">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se volete contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
+  <string name="fragment_about__contribute_text">dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto!</string>
   <string name="fragment_about__contribute_button">Ottieni il codice sorgente</string>
   <string name="fragment_about__translate">Traduci l\'app!</string>
   <string name="fragment_about__translate_text">L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app.</string>
   <string name="fragment_about__translate_button">Fammi tradurre</string>
   <string name="fragment_about__feedback">Lascia un feedback!</string>
-  <string name="fragment_about__feedback_text">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizzate lo strumento di segnalazione dei bug per dirci la tua!</string>
+  <string name="fragment_about__feedback_text">dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua!</string>
   <string name="fragment_about__feedback_button">Segnala un bug</string>
   <string name="fragment_about__spread_the_word">Passaparola!</string>
   <string name="fragment_about__spread_the_word_text">Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate!</string>
diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml
index 384f2a8a..8afe2c90 100644
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@@ -31,12 +31,16 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Notifiche estese</string>
   <string name="pref_desc__extended_notifications">Estendi il bottone delle notifiche con un menù che mostra le categorie di notifiche</string>
+  <string name="pref_desc__language">Cambia la lingua di questa app. Riavvia l\'app per rendere effettive le modifiche</string>
+  <string name="pref_title__language">Lingua</string>
+  <string name="language_system">Lingua di sistema</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Controllo dimensione testo del WebView</string>
   <string name="pref_title__font_size">Dimensione font</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normale</string>
-  <string name="font_size_large">Grosso</string>
-  <string name="font_size_huge">Immenso</string>
+  <string name="font_size_large">Grande</string>
+  <string name="font_size_huge">Molto grande</string>
   <!-- Load images -->
   <string name="pref_title__load_images">Carica immagini</string>
   <string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
@@ -55,7 +59,7 @@
   <string name="pref_desc__http_proxy_enabled">Usa il proxy con i dati di dandelion* per eludere i firewall.\nPotrebbe essere necessario il riavvio</string>
   <string name="pref_title__http_proxy_host">Host</string>
   <string name="pref_title__http_proxy_port">Porta</string>
-  <string name="toast__proxy_disabled__restart_required">App è necessario riavviare per disattivare l\'utilizzo del proxy</string>
+  <string name="toast__proxy_disabled__restart_required">E\' necessario riavviare l\'app per disattivare l\'utilizzo del proxy</string>
   <string name="toast__proxy_orbot_preset_loaded">Orbot proxy preset caricato</string>
   <!-- Chrome custom tabs -->
   <string name="pref_desc__chrome_custom_tabs_enabled">Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili!</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Nascondi barre superiori e inferiori automaticamente quando scrolli</string>
   <string name="pref_title__intellihide_toolbars">Barre che si nascondono intelligentemente</string>
   <string name="pref_title__append_shared_via_app">Aggiungi avviso dell\'app</string>
-  <string name="pref_desc__append_shared_via_app">Aggiunge un riferimento a quest\'app (\"Condiviso da&#8230;\") nei testi condivisi</string>
+  <string name="pref_desc__append_shared_via_app">Aggiungere un riferimento a questa applicazione ai testi condivisi: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Vario</string>
   <string name="pref_title__wipe_settings">Reset completo</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7a94d176..7ef28d15 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -37,9 +37,9 @@
   <string name="nav_followed_tags">Tag seguiti</string>
   <string name="nav_public_activities">Attività pubbliche</string>
   <string name="nav_reports">Segnalazioni</string>
-  <string name="share__share_link_as_text">Condividi link</string>
-  <string name="share__share_screenshot">Condividi screensot</string>
-  <string name="share__take_screenshot">Fai uno screenshot</string>
+  <string name="share__share_link_as_text">Condividi link come testo</string>
+  <string name="share__share_screenshot">Condividi screenshot della pagina Web</string>
+  <string name="share__take_screenshot">Fai uno screenshot della pagina web</string>
   <string name="share__toast_saved_image_to_location">Salvataggio dell\'immagine in</string>
   <string name="share__toast_screenshot">Salvataggio dello screenshot come:</string>
   <string name="share__toast_link_address_copied">Indirizzo copiato&#8230;</string>
@@ -65,12 +65,12 @@
         chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la 
         funzione degli screenshot più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App -
         dandelion*. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo.</string>
-  <string name="permissions_image">Devi garantire il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi
+  <string name="permissions_image">Devi concedere il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi
         chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi 
-        salvare le immagini più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App -
-        dandelion*. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo.</string>
+        salvare le immagini più avanti, puoi concedere il permesso successivamente. Vai su: Impostazioni - App -
+        dandelion*. Nella sezione dei permessi puoi concedere il permesso per la scrittura sul dispositivo.</string>
   <string name="permission_denied">Permesso negato.</string>
-  <string name="permission_granted_try_again">Permesso garantito. Si prega di riprovare.</string>
+  <string name="permission_granted_try_again">Permesso concesso. Si prega di riprovare.</string>
   <string name="podselection__custom_pod">Pod personalizzato</string>
   <string name="pod_name">Nome del pod</string>
   <string name="http_protocol">Protocollo</string>
diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml
index cea7cb07..ac32453b 100644
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">拡張通知</string>
   <string name="pref_desc__extended_notifications">通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します</string>
+  <string name="pref_desc__language">このアプリの言語を変更します。アプリを再起動すると変更を反映します</string>
+  <string name="pref_title__language">言語</string>
+  <string name="language_system">システム言語</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">WebView のテキストサイズを調整</string>
   <string name="pref_title__font_size">フォントサイズ</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">標準</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">スクロールの間、自動的に上部と下部のツールバーを非表示にします</string>
   <string name="pref_title__intellihide_toolbars">Intellihide ツールバー</string>
   <string name="pref_title__append_shared_via_app">シェア方法の通知を追加</string>
-  <string name="pref_desc__append_shared_via_app">シェアしたテキストに、このアプリへの参照 (\"&#8230;でシェア\") を追加します</string>
+  <string name="pref_desc__append_shared_via_app">共有テキストにこのアプリへの参照を追加します: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">その他</string>
   <string name="pref_title__wipe_settings">完全なリセット</string>
diff --git a/app/src/main/res/values-ml/strings-preferences.xml b/app/src/main/res/values-ml/strings-preferences.xml
index b5d03914..cbb48b95 100644
--- a/app/src/main/res/values-ml/strings-preferences.xml
+++ b/app/src/main/res/values-ml/strings-preferences.xml
@@ -37,7 +37,6 @@
   <string name="pref_desc__intellihide_toolbars">മുകളിലെയും ചുവട്ടിലെയും ടൂൾബാറുകൾ സ്ക്രോൾ ചെയ്യുമ്പോൾ താനേ അപ്രത്യക്ഷമാക്കുക</string>
   <string name="pref_title__intellihide_toolbars">ടൂൾബാറുകൾ ഇന്റലിഹൈഡ് ചെയ്യുക</string>
   <string name="pref_title__append_shared_via_app">അറിയിപ്പാൽ പങ്കുവച്ചത് എന്ന് കൂട്ടിച്ചേർക്കുക</string>
-  <string name="pref_desc__append_shared_via_app">പങ്കുവയ്ക്കുന്ന വാചകങ്ങളിൽ ഈ പ്രയോഗത്തിന്റെ അവലംബം(\"&#8230;പങ്കുവച്ചത്\") എന്ന് കൂട്ടിച്ചേർക്കുക</string>
   <!-- More -->
   <!-- Recently added - Please move to right section-->
   <!-- Sorry -->
diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml
index f8ba0e91..43615641 100644
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Uitgebreide meldingen</string>
   <string name="pref_desc__extended_notifications">Uitbreiden van de meldingsbel met een dropdown menu dat meldingen van Categorieën toont</string>
+  <string name="pref_desc__language">Taal wijzigen van deze app. Opnieuw opstarten om wijzigingen te bevestigen</string>
+  <string name="pref_title__language">Taal</string>
+  <string name="language_system">Systeemtaal gebruiken</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Lettergrootte van WebView instellen</string>
   <string name="pref_title__font_size">Lettergrootte</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normaal</string>
@@ -64,6 +68,7 @@
   <string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora*</string>
   <string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
   <string name="pref_title__manage_tags">Beheren van Hashtags</string>
+  <string name="pref_desc__manage_tags">Gevolgde hashtags ontvolgen</string>
   <string name="pref_title__change_account">Account wijzigen</string>
   <string name="pref_desc__change_account">Lokale sessiegegevens wissen en schakel over naar een andere diaspora* pod/account</string>
   <string name="pref_warning__change_account">Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen?</string>
@@ -72,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen</string>
   <string name="pref_title__intellihide_toolbars">Werkbalken slim wegwerken</string>
   <string name="pref_title__append_shared_via_app">Gedeeld-via-aankondiging toevoegen</string>
-  <string name="pref_desc__append_shared_via_app">Een verwijzing naar deze app (\"gedeeld door&#8230;\") toevoegen aan gedeelde teksten</string>
+  <string name="pref_desc__append_shared_via_app">Verwijzing naar deze app toevoegen aan gedeelde berichten: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Overig</string>
   <string name="pref_title__wipe_settings">Volledige reset</string>
diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml
index 3f6b0e8b..ac63385c 100644
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Rozszerzone powiadomienia</string>
   <string name="pref_desc__extended_notifications">Dodaj do ikony powiadomień menu wyboru kategorii powiadomień</string>
+  <string name="pref_desc__language">Zmień język aplikacji. Uruchom ponownie aplikację by zobaczyć zmianę</string>
+  <string name="pref_title__language">Język</string>
+  <string name="language_system">Język systemowy</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Wybierz rozmiar tekstu WebView</string>
   <string name="pref_title__font_size">Rozmiar czcionki</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Normalny</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania</string>
   <string name="pref_title__intellihide_toolbars">Autoukrywanie pasków narzędzi</string>
   <string name="pref_title__append_shared_via_app">Informacja o użytej aplikacji</string>
-  <string name="pref_desc__append_shared_via_app">Dodawaj do wpisów informację o użytej aplikacji (\"udostępniono za pomocą&#8230;\")</string>
+  <string name="pref_desc__append_shared_via_app">Umieszczaj odnośnik do tej aplikacji na dole udostępnianych wiadomości: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Różne</string>
   <string name="pref_title__wipe_settings">Całkowity restart</string>
diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml
index d036cf5e..7607f980 100644
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@@ -39,7 +39,6 @@
   <string name="pref_desc__intellihide_toolbars">Ocultar as barras de ferramentas superior e inferior automaticamente durante a rolagem</string>
   <string name="pref_title__intellihide_toolbars">Barras de ferramentas auto ocultante</string>
   <string name="pref_title__append_shared_via_app">Acrescentar compartilhado-por-aviso</string>
-  <string name="pref_desc__append_shared_via_app">Acrescentar uma referência (\"compartilhado por&#8230;\") a este app para textos compartilhados</string>
   <!-- More -->
   <!-- Recently added - Please move to right section-->
   <!-- Sorry -->
diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml
index 048d1db8..f4d8f324 100644
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@@ -31,7 +31,11 @@
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Расширенные уведомления</string>
   <string name="pref_desc__extended_notifications">Показывать выпадающее меню с категориями уведомлений при нажатии на иконку уведомлений</string>
+  <string name="pref_desc__language">Изменить язык этого приложения. Перезапустите приложение, чтобы изменения вступили в силу</string>
+  <string name="pref_title__language">Язык</string>
+  <string name="language_system">Язык системы</string>
   <!-- Font size -->
+  <string name="pref_desc__font_size">Управление размером текста WebView</string>
   <string name="pref_title__font_size">Размер шрифта</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <string name="font_size_normal">Нормальный</string>
@@ -73,7 +77,7 @@
   <string name="pref_desc__intellihide_toolbars">Скрывать верхнюю и нижнюю панели инструментов автоматически во время прокрутки</string>
   <string name="pref_title__intellihide_toolbars">Интеллектуальное скрытие панелей инструментов</string>
   <string name="pref_title__append_shared_via_app">Присоединять \"Опубликовано из\" к сообщению</string>
-  <string name="pref_desc__append_shared_via_app">Присоединять ссылку на приложение (\"Опубликовано из&#8230;\") к размещенным записям</string>
+  <string name="pref_desc__append_shared_via_app">Добавлять к сообщениям ссылку на это приложение: [via #dandelion]</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Прочее</string>
   <string name="pref_title__wipe_settings">Полный сброс</string>
diff --git a/app/src/main/res/values-sv/strings-preferences.xml b/app/src/main/res/values-sv/strings-preferences.xml
index 9bfd6a97..6151a71c 100644
--- a/app/src/main/res/values-sv/strings-preferences.xml
+++ b/app/src/main/res/values-sv/strings-preferences.xml
@@ -72,7 +72,6 @@
   <string name="pref_desc__intellihide_toolbars">Dölj automatiskt de övre och undre verktygsfälten när du skrollar</string>
   <string name="pref_title__intellihide_toolbars">Intellihide-verktygsfält</string>
   <string name="pref_title__append_shared_via_app">Lägg till delade-av-meddelande</string>
-  <string name="pref_desc__append_shared_via_app">Lägg till en hänvisning till denna app (\"delas av...\") till delade texter</string>
   <!-- More -->
   <string name="pref_title__sub_miscelaneous">Diverse</string>
   <string name="pref_title__wipe_settings">Total återställning</string>
diff --git a/app/src/main/res/values/strings-about.xml b/app/src/main/res/values/strings-about.xml
index ed04a288..d83c92a8 100644
--- a/app/src/main/res/values/strings-about.xml
+++ b/app/src/main/res/values/strings-about.xml
@@ -16,7 +16,7 @@
     <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
     <string name="fragment_debug__toast_log_copied">Debug log copied to clipboard</string>
 
-    <string name="fragment_about__about" translatable="false">@string/dandelion</string>
+    <string name="fragment_about__about" translatable="false">@string/app_name</string>
     <string name="fragment_about__about_text">dandelion* is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
 
     <string name="fragment_about__contribute">Contribute Code!</string>
@@ -48,7 +48,7 @@
     <string name="fragment_license__contributors_thank_you">%1$s&lt;br>&lt;br>Thank you!</string>
     <string name="fragment_license__license" translatable="false">@string/about_activity__title_about_license</string>
     <string name="fragment_license__license_text" translatable="false">
-        Copyright © 2015-2016
+        Copyright © 2015-2017
         \nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
         \n
         \nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6fe7730..e3b9b855 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,6 @@
     <string name="dandelion" translatable="false">dandelion*</string>
     <string name="diaspora" translatable="false">diaspora*</string>
     <string name="diaspora_for_android" translatable="false">Diaspora for Android</string>
-    <string name="app_name" translatable="false">@string/dandelion</string>
     <string name="app_hashtag" translatable="false">#dandelion</string>
     <string name="app_subtitle" translatable="false">The community-run distributed social network</string>
     <string name="shared_via_app" translatable="false">*[via #dandelion]*</string>
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..8ee4b16e
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,38 @@
+###################
+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-24" ]; then echo y | android update sdk --no-ui --all --filter "android-24"; fi
+    # Android SDK Build-tools
+    - if [ ! -d "/usr/local/android-sdk-linux/build-tools/24.0.3" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"; fi
+    # Android Support Repository
+    - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/24.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-24
+    - /usr/local/android-sdk-linux/build-tools/24.0.3
+    - /usr/local/android-sdk-linux/extras/android/m2repository
+
+###################
+test:
+    override:
+        - (./gradlew assembleFlavorDefault):
+            timeout: 360