From 301d4f6798f54b2b302638a0d67699cc7351adfb Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Fri, 23 Oct 2015 20:16:57 +0200
Subject: Add a setting options to always show the virtual keyboard (special
 keys)

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5dfeef..925f55f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -643,5 +643,7 @@
 	<string name="discard_host_button">Discard</string>
 	<!-- Text for button which does not discard changes and keeps editing. -->
 	<string name="discard_host_cancel_button">Keep editing</string>
+    <string name="pref_alwaysvisible_title">Keyboard always visible</string>
+    <string name="pref_alwaysvisible_summary">Always show the special keys</string>
 
 </resources>
-- 
cgit v1.2.3


From b1cda7f1e67c8d7f91c01b679d34f46f0d591955 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Fri, 23 Oct 2015 20:47:19 +0200
Subject: Code style (xml) spaces -> tab

---
 app/src/main/res/values/strings.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 925f55f..3fdb16f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,8 +18,7 @@
  */
 -->
 
-<resources xmlns:tools="http://schemas.android.com/tools"
-	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools">
 	<!-- Summary of what ConnectBot is; used as a short description in the Android running apps list -->
 	<string name="app_desc">"Simple, powerful, open-source SSH client."</string>
 
@@ -643,7 +642,7 @@
 	<string name="discard_host_button">Discard</string>
 	<!-- Text for button which does not discard changes and keeps editing. -->
 	<string name="discard_host_cancel_button">Keep editing</string>
-    <string name="pref_alwaysvisible_title">Keyboard always visible</string>
-    <string name="pref_alwaysvisible_summary">Always show the special keys</string>
 
+	<string name="pref_alwaysvisible_title">Keyboard always visible</string>
+	<string name="pref_alwaysvisible_summary">Always show the special keys</string>
 </resources>
-- 
cgit v1.2.3


From a67cc634407382c638267abbeab53b2e85fa8e79 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Fri, 23 Oct 2015 21:13:15 +0200
Subject: Remove summary and change title

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

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fdb16f..0afd1f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -643,6 +643,5 @@
 	<!-- Text for button which does not discard changes and keeps editing. -->
 	<string name="discard_host_cancel_button">Keep editing</string>
 
-	<string name="pref_alwaysvisible_title">Keyboard always visible</string>
-	<string name="pref_alwaysvisible_summary">Always show the special keys</string>
+	<string name="pref_alwaysvisible_title">Special keys always visible</string>
 </resources>
-- 
cgit v1.2.3


From e6310a2c2a215e562d09c09483ef0fe66d832924 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Sat, 24 Oct 2015 08:58:07 +0200
Subject: Resource context & french translation

---
 app/src/main/res/values/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0afd1f1..ae8302a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,6 +222,9 @@
 	<!-- Summary for the titlebar hide preference -->
 	<string name="pref_titlebarhide_summary">"Tap console to show title bar and access menu"</string>
 
+	<!-- Name for the special keys always visible preference -->
+	<string name="pref_alwaysvisible_title">Special keys always visible</string>
+
 	<!-- Name for the page up/down gesture preference -->
 	<string name="pref_pg_updn_gesture_title">"Page up/down gesture"</string>
 	<!-- Summary for the full screen preference -->
@@ -642,6 +645,4 @@
 	<string name="discard_host_button">Discard</string>
 	<!-- Text for button which does not discard changes and keeps editing. -->
 	<string name="discard_host_cancel_button">Keep editing</string>
-
-	<string name="pref_alwaysvisible_title">Special keys always visible</string>
 </resources>
-- 
cgit v1.2.3


From 8f792489ea758103d90d5db3c602511ef11af7f5 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Sat, 24 Oct 2015 09:03:28 +0200
Subject: Restore (unused) ns in string.xlm

---
 app/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae8302a..72de965 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,8 @@
  */
 -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools"
+		   xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 	<!-- Summary of what ConnectBot is; used as a short description in the Android running apps list -->
 	<string name="app_desc">"Simple, powerful, open-source SSH client."</string>
 
-- 
cgit v1.2.3


From 054e934eae5889367ce6acda8355187b6534f701 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Sat, 24 Oct 2015 09:06:21 +0200
Subject: Extra tabs removed

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72de965..5d87367 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
 -->
 
 <resources xmlns:tools="http://schemas.android.com/tools"
-		   xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 	<!-- Summary of what ConnectBot is; used as a short description in the Android running apps list -->
 	<string name="app_desc">"Simple, powerful, open-source SSH client."</string>
 
-- 
cgit v1.2.3


From 9246476694b74fce0a97cfd7945c7bba5ae18d86 Mon Sep 17 00:00:00 2001
From: Alex <alescdb@users.noreply.github.com>
Date: Mon, 26 Oct 2015 19:52:10 +0100
Subject: Better context for translators

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d1f78b..e3aa67d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,7 +219,7 @@
 	<!-- Summary for the titlebar hide preference -->
 	<string name="pref_titlebarhide_summary">"Tap console to show title bar and access menu"</string>
 
-	<!-- Name for the special keys always visible preference -->
+	<!-- Preference title for special keys always visible preference -->
 	<string name="pref_alwaysvisible_title">Special keys always visible</string>
 
 	<!-- Name for the page up/down gesture preference -->
-- 
cgit v1.2.3


From 04f13572b3cedf328c76bcdcfc61e90e2df4366b Mon Sep 17 00:00:00 2001
From: Alex <alescdb@users.noreply.github.com>
Date: Mon, 26 Oct 2015 19:54:02 +0100
Subject: Better context for translators

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3aa67d..45ef38c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,7 +219,7 @@
 	<!-- Summary for the titlebar hide preference -->
 	<string name="pref_titlebarhide_summary">"Tap console to show title bar and access menu"</string>
 
-	<!-- Preference title for special keys always visible preference -->
+	<!-- Title for special keys always visible preference -->
 	<string name="pref_alwaysvisible_title">Special keys always visible</string>
 
 	<!-- Name for the page up/down gesture preference -->
-- 
cgit v1.2.3