From 5a1dfaab6f76e2f94bd462e50a2a4f71e24745b8 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@riseup.net>
Date: Sat, 6 Aug 2016 23:17:49 +0200
Subject: [PATCH 1/4] Updated Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 679d53ef..faffad21 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Why a WebApp is better than using the mobile site on a browser?
 Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
 
 ### Device Requirements
-The minimum version supported is Ice Cream Sandwich, Android v4.0.3 / API 15
+The minimum version supported is Ice Cream Sandwich, Android v4.2.0 / API 17
 
 ### App Permissions
 It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.

From 769459a8c17800f56e3b624f3b1fefcbbc60a72b Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@riseup.net>
Date: Sat, 6 Aug 2016 23:18:19 +0200
Subject: [PATCH 2/4] Updated Readme again

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index faffad21..0cb92f0e 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Why a WebApp is better than using the mobile site on a browser?
 Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
 
 ### Device Requirements
-The minimum version supported is Ice Cream Sandwich, Android v4.2.0 / API 17
+The minimum version supported is Jelly Bean, Android v4.2.0 / API 17
 
 ### App Permissions
 It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.

From 770e744c18069aff7dd04f2e9cfcb3340421eadd Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Sun, 7 Aug 2016 00:32:30 +0200
Subject: [PATCH 3/4] Update podlist; TR refs

---
 app/src/main/AndroidManifest.xml            | 7 +++++++
 app/src/main/res/menu/main__menu_bottom.xml | 2 +-
 app/src/main/res/menu/main__menu_top.xml    | 2 +-
 app/src/main/res/values-de/strings.xml      | 2 +-
 app/src/main/res/values-fr/strings.xml      | 2 +-
 app/src/main/res/values/strings.xml         | 7 +++----
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 68c0e928..a1578ea5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -105,6 +105,7 @@
                 <data android:host="diaspora.mazi.tk" android:scheme="https" />
                 <data android:host="diaspora.moosje.nl" android:scheme="https" />
                 <data android:host="diaspora.net.gr" android:scheme="https" />
+                <data android:host="diasporanet.tk" android:scheme="https" />
                 <data android:host="diaspora.permutationsofchaos.com" android:scheme="https" />
                 <data android:host="diaspora.pimpmypony.eu" android:scheme="https" />
                 <data android:host="diaspora.pingupod.de" android:scheme="https" />
@@ -125,11 +126,14 @@
                 <data android:host="diaspora.unixcorn.org" android:scheme="https" />
                 <data android:host="diasporausa.com" android:scheme="https" />
                 <data android:host="diasp.org" android:scheme="https" />
+                <data android:host="distributed.chat" android:scheme="https" />
+                <data android:host="espora.com.es" android:scheme="https" />
                 <data android:host="espora.social" android:scheme="https" />
                 <data android:host="failure.net" android:scheme="https" />
                 <data android:host="flokk.no" android:scheme="https" />
                 <data android:host="framasphere.org" android:scheme="https" />
                 <data android:host="freehuman.fr" android:scheme="https" />
+                <data android:host="friendica.tk" android:scheme="https" />
                 <data android:host="home.enslaver.net" android:scheme="https" />
                 <data android:host="idoru.pl" android:scheme="https" />
                 <data android:host="iliketoast.net" android:scheme="https" />
@@ -145,6 +149,7 @@
                 <data android:host="LibertyPod.org" android:scheme="https" />
                 <data android:host="librenet.co.za" android:scheme="https" />
                 <data android:host="librenet.gr" android:scheme="https" />
+                <data android:host="londor.be" android:scheme="https" />
                 <data android:host="misamigos.online" android:scheme="https" />
                 <data android:host="mondiaspora.net" android:scheme="https" />
                 <data android:host="nerdpol.ch" android:scheme="https" />
@@ -190,6 +195,7 @@
                 <data android:host="pod.undreaming.org" android:scheme="https" />
                 <data android:host="pubpod.alqualonde.org" android:scheme="https" />
                 <data android:host="realms.the-wizard.co.za" android:scheme="https" />
+                <data android:host="revreso.de" android:scheme="https" />
                 <data android:host="ruhrspora.de" android:scheme="https" />
                 <data android:host="russiandiaspora.org" android:scheme="https" />
                 <data android:host="sechat.org" android:scheme="https" />
@@ -200,6 +206,7 @@
                 <data android:host="social.elaon.de" android:scheme="https" />
                 <data android:host="socializer.cc" android:scheme="https" />
                 <data android:host="social.mbuto.me" android:scheme="https" />
+                <data android:host="social.sum7.de" android:scheme="https" />
                 <data android:host="spora.zone" android:scheme="https" />
                 <data android:host="subvillage.de" android:scheme="https" />
                 <data android:host="sysad.org" android:scheme="https" />
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index f4e8fd53..b67d35b3 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -15,7 +15,7 @@
         android:id="@+id/action_compose"
         android:icon="@drawable/fab_compose"
         app:showAsAction="always"
-        android:title="@string/action_compose" />
+        android:title="@string/action_compose_new_post" />
 
     <item
         android:icon="@drawable/ic_share_white_24dp"
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index f1b0d37b..8ec30d36 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -12,7 +12,7 @@
     <item
         android:id="@+id/action_conversations"
         android:icon="@drawable/ic_message_text_outline_white_24dp"
-        android:title="@string/messages"
+        android:title="@string/conversations"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4fe343b4..7a5a11ad 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,7 +40,7 @@
   <string name="share__toast_link_address_copied">Linkadresse kopiert &#8230;</string>
   <string name="action_go_to_top">Nach oben scrollen</string>
   <string name="action_search_by_tags_or_persons">Suche nach Tags oder Personen …</string>
-  <string name="action_compose">Neuer Beitrag</string>
+  <string name="action_compose_new_post">Neuer Beitrag</string>
   <string name="action_exit_app">App beenden</string>
   <string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
   <string name="action_share_dotdotdot">Teilen&#8230;</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e8c193e4..b4363351 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -36,7 +36,7 @@
   <string name="share__toast_link_address_copied">Lien copié&#8230;</string>
   <string name="action_go_to_top">Retour en haut</string>
   <string name="action_search_by_tags_or_persons">Recherche par tags ou par personnes</string>
-  <string name="action_compose">Nouveau message</string>
+  <string name="action_compose_new_post">Nouveau message</string>
   <string name="action_exit_app">Quitter l\'application</string>
   <string name="action_share_dotdotdot">Partager&#8230;</string>
   <string name="new_post">Nouveau message</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2031d782..b7a73d5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,14 +65,13 @@
     <string name="share__toast_link_address_copied">Link address copied …</string>
 
 
+    <string name="new_post">New post</string>
     <string name="action_go_to_top">Go to top</string>
     <string name="action_search_by_tags_or_persons">Search by tags or persons</string>
-    <string name="action_compose">New message</string>
+    <string name="action_compose_new_post">@string/new_post</string>
     <string name="action_exit_app">Exit app</string>
     <string name="action_toggle_desktop_page">Toggle mobile/desktop view</string>
     <string name="action_share_dotdotdot">Share…</string>
-    <string name="new_post">New message</string>
-    <string name="messages">Conversations</string>
 
 
     <string name="search_alert_title" translatable="false">@string/search</string>
@@ -83,7 +82,7 @@
     <string name="context_menu_share_link">Share link address</string>
     <string name="context_menu_save_image">Save image</string>
     <string name="context_menu_share_image">Share image</string>
-    <string name="context_menu_open_external_browser">Open in external browser …</string>
+    <string name="context_menu_open_external_browser">Open in external browser…</string>
     <string name="context_menu_copy_link">Copy link address to clipboard</string>
 
 

From fa1222ffbb6c564068698f8ac38476fd6e17fcf5 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Sun, 7 Aug 2016 00:51:39 +0200
Subject: [PATCH 4/4] Remove unused translations

---
 app/src/main/res/values-de/strings.xml | 1 -
 app/src/main/res/values-fr/strings.xml | 1 -
 app/src/main/res/values/strings.xml    | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7a5a11ad..8bba3ee4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -45,7 +45,6 @@
   <string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
   <string name="action_share_dotdotdot">Teilen&#8230;</string>
   <string name="new_post">Neuer Beitrag</string>
-  <string name="messages">Unterhaltungen</string>
   <string name="search_alert_tag">nach Tags</string>
   <string name="search_alert_people">nach Personen</string>
   <string name="search_alert_bypeople_validate_needsomedata">Füge einen Namen ein.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b4363351..8519384f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -40,7 +40,6 @@
   <string name="action_exit_app">Quitter l\'application</string>
   <string name="action_share_dotdotdot">Partager&#8230;</string>
   <string name="new_post">Nouveau message</string>
-  <string name="messages">Discussions</string>
   <string name="search_alert_tag">par tags</string>
   <string name="search_alert_people">par personne</string>
   <string name="search_alert_bypeople_validate_needsomedata">Veuillez ajouter un nom</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7a73d5e..9bb88634 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,7 +68,7 @@
     <string name="new_post">New post</string>
     <string name="action_go_to_top">Go to top</string>
     <string name="action_search_by_tags_or_persons">Search by tags or persons</string>
-    <string name="action_compose_new_post">@string/new_post</string>
+    <string name="action_compose_new_post" translatable="false">@string/new_post</string>
     <string name="action_exit_app">Exit app</string>
     <string name="action_toggle_desktop_page">Toggle mobile/desktop view</string>
     <string name="action_share_dotdotdot">Share…</string>