summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-15 20:48:11 +0100
committerParménides GV <parmegv@sdf.org>2014-12-15 20:48:11 +0100
commit953e87f2d9a175e242bdf5c0e030a6a9944aa3e5 (patch)
treec694b6bc5f893d4ad5b92712c85042ca4b45bbfa /app/src/main/res
parentf9b875c58f2a370b0c4727ed54cab46424bda603 (diff)
parent9f146deb3448815fccc1637c00588e0dfb23293e (diff)
Merge branch 'develop' into release-0.8.1
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/about.xml11
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 12 insertions, 1 deletions
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index ccb1ea26..2669caa3 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -35,6 +35,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="all"
+ android:text="@string/copyright_blinktgui" />
+
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="10sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autoLink="all"
android:text="@string/repository_url_text" />
<TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3666b39c..68e71886 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,7 +60,7 @@
<string name="signingup_message">Signing up</string>
<string name="logout_message">Logging out from this session.</string>
<string name="logged_out_message">Logged out.</string>
- <string name="log_out_failed_message">Didn\'t logged out.</string>
+ <string name="log_out_failed_message">Didn\'t log out.</string>
<string name="succesful_authentication_message">Authentication succeeded.</string>
<string name="authentication_failed_message">Authentication failed.</string>
<string name="registration_failed_message">Registration failed..</string>