From e807003d425b3e4ae5168a5d70302a1cdad8b2bc Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Sun, 6 Nov 2016 05:32:43 +0100
Subject: [PATCH 1/2] Release 0.2.0 (Updated translation files)

---
 app/build.gradle                              |  4 ++--
 app/src/main/AndroidManifest.xml              |  7 ++++--
 .../activity/SettingsActivity.java            |  2 ++
 .../ui/PodSelectionDialog.java                | 11 ++++++++++
 app/src/main/res/layout/main__nav_header.xml  |  5 +++--
 .../main/res/layout/podselection__dialog.xml  |  7 ++++--
 app/src/main/res/menu/main__menu_bottom.xml   |  3 ++-
 app/src/main/res/menu/main__menu_top.xml      |  3 ++-
 ...main__menu_top__notifications_dropdown.xml |  3 ++-
 app/src/main/res/menu/stream__menu_bottom.xml |  4 +++-
 app/src/main/res/menu/stream__menu_top.xml    |  2 --
 app/src/main/res/values-nl/strings-about.xml  | 19 ++++++++++++++++
 .../res/values-nl/strings-preferences.xml     | 22 +++++++++++++++++++
 app/src/main/res/values-nl/strings.xml        | 20 ++++++++++++++++-
 app/src/main/res/values/color.xml             |  4 +++-
 app/src/main/res/values/strings.xml           |  2 ++
 16 files changed, 102 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 540eda92..cbc0519d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ android {
 // Additional repositories
 repositories {
     maven {
-        url "http://dl.bintray.com/dasar/maven"   //Color picker
+        url "https://jitpack.io"
     }
 }
 
@@ -52,7 +52,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.0.1'
     compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
     compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
-    compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
+    compile 'com.github.DASAR:ShiftColorPicker:v0.5'
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe8e3163..67edd76a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.dfa.diaspora_android">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.github.dfa.diaspora_android"
+    tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,7 +17,8 @@
 
         <provider
             android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
-            android:authorities="com.github.dfa.diaspora_android.mainactivity" />
+            android:authorities="com.github.dfa.diaspora_android.mainactivity"
+            android:exported="false"/>
 
         <service
             android:name="com.github.dfa.diaspora_android.service.FetchPodsService"
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 b1c599d2..07887dfa 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
@@ -1,5 +1,6 @@
 package com.github.dfa.diaspora_android.activity;
 
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
@@ -284,6 +285,7 @@ public class SettingsActivity extends ThemedActivity {
          *
          * @param type 1 -> Primary Color, 2 -> Accent Color
          */
+        @SuppressLint("InflateParams")
         public void showColorPickerDialog(final int type) {
             final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
             final Context context = getActivity();
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 663ae5f4..3286d7ea 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
@@ -1,6 +1,7 @@
 package com.github.dfa.diaspora_android.ui;
 
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,6 +10,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioGroup;
@@ -93,6 +95,12 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
     @BindView(R.id.podselection__dialog__text_protocol)
     TextView textProtocol;
 
+    @BindView(R.id.podselection__dialog__btn_ok)
+    Button btnOk;
+
+    @BindView(R.id.podselection__dialog__btn_cancel)
+    Button btnCancel;
+
     private PodSelectionDialogResultListener resultListener;
     private View root;
     private DiasporaPod pod = new DiasporaPod();
@@ -100,6 +108,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
 
     @NonNull
     @Override
+    @SuppressLint("InflateParams")
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -135,6 +144,8 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
         textProfile.setTextColor(ThemeHelper.getAccentColor());
         textProtocol.setTextColor(ThemeHelper.getAccentColor());
         textTorPreset.setTextColor(ThemeHelper.getAccentColor());
+        btnOk.setTextColor(ThemeHelper.getAccentColor());
+        btnCancel.setTextColor(ThemeHelper.getAccentColor());
 
         ThemeHelper.updateEditTextColor(editPodAddress);
         ThemeHelper.updateEditTextColor(editPodName);
diff --git a/app/src/main/res/layout/main__nav_header.xml b/app/src/main/res/layout/main__nav_header.xml
index d3294497..39003d1e 100644
--- a/app/src/main/res/layout/main__nav_header.xml
+++ b/app/src/main/res/layout/main__nav_header.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_drawer"
     android:layout_width="wrap_content"
     android:layout_height="110dp"
-    android:background="@color/colorPrimary"
     android:gravity="bottom"
     android:orientation="vertical"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
@@ -36,7 +36,8 @@
             android:layout_marginEnd="@dimen/activity_horizontal_margin_half"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_launcher" />
+            android:src="@drawable/ic_launcher"
+            tools:ignore="ContentDescription" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/podselection__dialog.xml b/app/src/main/res/layout/podselection__dialog.xml
index d51a31e9..78c55580 100644
--- a/app/src/main/res/layout/podselection__dialog.xml
+++ b/app/src/main/res/layout/podselection__dialog.xml
@@ -11,6 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="?android:attr/buttonBarStyle"
         android:orientation="vertical">
 
         <TextView
@@ -88,14 +89,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="http" />
+                android:text="@string/http" />
 
             <RadioButton
                 android:id="@+id/podselection__dialog__radio_https"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="https" />
+                android:text="@string/https" />
         </RadioGroup>
 
         <TextView
@@ -127,6 +128,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/cancel" />
 
             <Button
@@ -134,6 +136,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/ok" />
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index 40660f38..a6b310f1 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
 
     <item
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index d778143b..81575627 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"
diff --git a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml b/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
index 1dd4ad4f..9c0f7ffa 100644
--- a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
+++ b/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"
diff --git a/app/src/main/res/menu/stream__menu_bottom.xml b/app/src/main/res/menu/stream__menu_bottom.xml
index 84572cdd..641a0e08 100644
--- a/app/src/main/res/menu/stream__menu_bottom.xml
+++ b/app/src/main/res/menu/stream__menu_bottom.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:icon="@drawable/ic_share_white_48px"
diff --git a/app/src/main/res/menu/stream__menu_top.xml b/app/src/main/res/menu/stream__menu_top.xml
index fe316b97..f2d8ee30 100644
--- a/app/src/main/res/menu/stream__menu_top.xml
+++ b/app/src/main/res/menu/stream__menu_top.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
     <item
         android:id="@+id/action_reload"
         android:icon="@drawable/ic_refresh_white_48px"
         android:orderInCategory="1000"
         android:title="@string/reload"
         app:showAsAction="always" />
-
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings-about.xml b/app/src/main/res/values-nl/strings-about.xml
index 54191dc5..bdb318aa 100644
--- a/app/src/main/res/values-nl/strings-about.xml
+++ b/app/src/main/res/values-nl/strings-about.xml
@@ -2,6 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- License & help (large amount of text) -->
+  <string name="about_activity__title_about_app">Info</string>
+  <string name="about_activity__title_about_license">Licentie</string>
+  <string name="about_activity__title_debug_info">Foutopsporing</string>
+  <string name="fragment_debug__section_app">Applicatie</string>
+  <string name="fragment_debug__section_device">Toestel</string>
+  <string name="fragment_debug__section_pod">diaspora* Pod</string>
+  <string name="fragment_debug__section_log">Debug Logboek</string>
+  <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
+  <string name="fragment_debug__app_version">Versie: %1$s</string>
+  <string name="fragment_debug__package_name">Pakket-naam: %1$s</string>
+  <string name="fragment_debug__android_version">Android-versie: %1$s</string>
+  <string name="fragment_debug__device_name">Toestelnaam: %1$s</string>
+  <string name="fragment_debug__app_codename">Versienaam: %1$s</string>
+  <string name="fragment_debug__pod_profile_name">Pod Profielnaam: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Pod-domein: %1$s</string>
+  <string name="fragment_debug__toast_log_copied">Tekst naar klembord gekopieerd</string>
+  <string name="fragment_license__3rd_party_libs_title">Gebruikte bibliotheken van derden</string>
   <!-- About (large amount of text) -->
+  <string name="fragment_about__about_content">
+DiasporaForAndroid is uw behulpzame app voor het bladeren door het sociale netwerk van Diaspora. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Network aan uw sociale ervaring. &lt; Br &gt;&lt; br &gt; Diaspora maakt gebruik van Markdown voor het opmaken van berichten. U vindt meer informatie bij &lt; br &gt; https://diasporafoundation.org/formatting &lt; br &gt;&lt; br &gt; DiasporaForAndroid is vrije software als in het is in vrijheid ontwikkeld en volgt de ideeën van het Diaspora-project &lt; Br &gt; kunt u de broncode op Github: &lt; br &gt; https://github.com/Diaspora-for-Android/diaspora-android &lt; br &gt;&lt; br &gt; wanneer u tegen eventuele problemen aanloopt of als u suggesties hebt, u onze bug tracker op de bovenstaande link kunt.         Als alternatief kunt u uw vraag met de hashtag #DFAQ op Diaspora plaatsen. &lt; Br &gt;&lt; br &gt; deze app niet beschikbaar in uw taal? Check ons project op Crowdin.com en help mee met vertalen! &lt; br &gt; https://crowdin.com/project/diaspora-for-android &lt; br &gt;&lt; br &gt;  voel je ook vrij om je vrienden vertellen over #DiasporaForAndroid!</string>
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml
index f5b9495e..04368407 100644
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@@ -13,20 +13,42 @@
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
+  <string name="pref_desc__sub_nav_slider">Bepalen zichtbaarheid van vermeldingen in de navigatie-lade</string>
   <string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
   <!-- Themes -->
+  <string name="pref_title__themes">Thema en kleuren</string>
+  <string name="pref_desc__themes">Bepalen welke kleuren worden gebruikt in de app</string>
+  <string name="pref_title__primary_color">Primaire kleur</string>
+  <string name="pref_desc__primary_color">Kleur van de werkbalken</string>
+  <string name="pref_title__accent_color">Accentkleur</string>
+  <string name="pref_desc__accent_color">Kleur van de voortgangsbalk</string>
   <!-- Notifications dropdown -->
+  <string name="pref_title__extended_notifications">Uitgebreide meldingen</string>
+  <string name="pref_desc__extended_notifications">Uitbreiden van de bel van de meldingen met een dropdown menu dat kennisgeving Categorieën toont</string>
   <!-- Font size -->
   <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>
+  <string name="font_size_large">Groot</string>
+  <string name="font_size_huge">Grootst</string>
   <!-- Load images -->
   <string name="pref_title__load_images">Afbeeldingen laden</string>
   <string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
   <!-- Proxy -->
+  <string name="pref_title__http_proxy_load_tor_preset">Tor Voorinstelling laden</string>
+  <string name="pref_desc__http_proxy_load_tor_preset">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>
+  <string name="pref_title__sub_proxy">Proxy</string>
   <string name="pref_title__proxy_enabled">Proxy inschakelen</string>
+  <string name="pref_desc__http_proxy_enabled">Proxy Diaspora-verkeer om firewalls te omzeilen. \nVereist mogelijk app herstart. Dit kan op sommige telefoons niet werken.</string>
+  <string name="pref_title__http_proxy_host">Host</string>
+  <string name="pref_title__http_proxy_port">Poort</string>
+  <string name="toast__proxy_disabled__restart_required">App moet opnieuw opstarten om het gebruik van de proxy uit te schakelen</string>
+  <string name="toast__proxy_orbot_preset_loaded">Orbot proxy-voorinstelling geladen</string>
   <!-- Chrome custom tabs -->
+  <string name="pref_desc__chrome_custom_tabs_enabled">Open externe links met Chrome aangepaste tabbladen. Chromium of Google Chrome moet worden geïnstalleerd voor deze functie. \nLET OP: Chrome aangepaste tabbladen maakt geen gebruik van geconfigureerde proxyservers!</string>
   <!-- Diaspora Settings -->
   <string name="pref_title__personal_settings">Persoonlijke instellingen</string>
+  <string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora*</string>
   <string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
   <string name="pref_title__manage_tags">Beheren van Hashtags</string>
   <string name="pref_desc__manage_tags">Toevoegen en verwijderen van de hashtags die u volgt</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b27eec67..bfd88b62 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -4,7 +4,7 @@
   <!-- App - AppName specific -->
   <string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
   <!-- Application -->
-  <string name="reload">Opnieuw Laden</string>
+  <string name="reload">Opnieuw laden</string>
   <string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
   <!-- Common Words -->
   <string name="settings">Instellingen</string>
@@ -19,11 +19,20 @@
   <string name="mentions">Vermeldingen</string>
   <string name="public_">Openbaar</string>
   <string name="search">Zoeken</string>
+  <string name="contacts">Contacten</string>
   <!-- Notifications dropdown menu -->
+  <string name="notifications__all">Alle meldingen</string>
+  <string name="notifications__also_commented">Heeft ook gereageerd</string>
+  <string name="notifications__comment_on_post">Reactie op bericht</string>
+  <string name="notifications__liked">Leuk gevonden</string>
+  <string name="notifications__mentioned">Vermeldingen</string>
+  <string name="notifications__reshared">Opnieuw gedeeld</string>
+  <string name="notifications__started_sharing">Begonnen te delen</string>
   <!-- Pod Activity -->
   <string name="title_activity_pods">Selecteer Pod</string>
   <string name="filter_hint">Voer pod domein</string>
   <string name="confirm_url">Bevestigen pod url</string>
+  <string name="search_for_pod">Zoek Pod&#8230;</string>
   <string name="podlist_source_note">Opmerking: De podlijst is gevuld met beveiligde pods vermeld op https://podupti.me. U kunt in het bewerk veld elke pod invullen die niet in de lijst staat.</string>
   <string name="valid_pod">Voer een geldige domeinnaam in</string>
   <string name="podlist_error">Fout: Kan niet de podlijst ophalen!</string>
@@ -32,6 +41,8 @@
   <string name="confirm_pod">Wilt u echt \nhttps://%1$s\n als uw Diaspora pod gebruiken?</string>
   <string name="confirm_exit">Wilt u afsluiten?</string>
   <!-- Drawer, Menu, Toolbar, ContextMenu -->
+  <string name="nav_menu_more">Meer</string>
+  <string name="nav_help_license">Over | Help</string>
   <string name="nav_followed_tags">Gevolgde Tags</string>
   <string name="nav_public_activities">Publieke activiteiten</string>
   <string name="share__share_link_as_text">Link delen als tekst</string>
@@ -59,6 +70,13 @@
   <string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
   <string name="all_tags">Alle tags</string>
   <!-- Permissions -->
+  <string name="permissions_screenshot">U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - Diaspora. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\".</string>
+  <string name="permissions_image">U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - Diaspora. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\".</string>
   <string name="permission_denied">Toestemming geweigerd.</string>
   <string name="permission_granted_try_again">Toestemming verleend. Probeer het opnieuw.</string>
+  <string name="podselection__custom_pod">Aangepaste Pod</string>
+  <string name="pod_name">Naam van de Pod</string>
+  <string name="http_protocol">Protocol</string>
+  <string name="pod_address">Pod-adres</string>
+  <string name="missing_value">Ontbrekende waarde</string>
 </resources>
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 14025f63..c08cf7b3 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
     <color name="colorPrimary">@color/md_blue_650</color>
     <color name="colorPrimaryDark">@color/md_blue_750</color>
     <color name="colorAccent">@color/md_deep_orange_650</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6e1d37f..25119cba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,6 +119,8 @@
     <string name="podselection__custom_pod">Custom Pod</string>
     <string name="pod_name">Pod name</string>
     <string name="http_protocol">Protocol</string>
+    <string name="http" translatable="false">http</string>
+    <string name="https" translatable="false">https</string>
     <string name="pod_address">Pod address</string>
     <string name="missing_value">Missing value</string>
 </resources>

From f1dc2eb73367909142f74f3c873e8ed6cd9ec614 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Sun, 6 Nov 2016 05:37:53 +0100
Subject: [PATCH 2/2] Announcing 0.2.0-next

---
 CHANGELOG.md     | 3 +++
 app/build.gradle | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34751a5a..cda9d050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v0.2.0-next
+
+
 # v0.2.0
 - Added: Customizable Theme Colors!
 - Improved account setup with easy tor hidden service configuration
diff --git a/app/build.gradle b/app/build.gradle
index cbc0519d..e4b4585f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.github.dfa.diaspora_android"
         minSdkVersion 17
         targetSdkVersion 24
-        versionCode 9
-        versionName "0.2.0"
+        versionCode 10
+        versionName "0.2.0-next"
         setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")
 
         vectorDrawables.useSupportLibrary = true