aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-12-25 22:28:19 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-12-25 22:28:19 +0100
commit193d2645e6995a2631a16c88c78e3b0b5581cbc6 (patch)
tree56f5246142619afce96de5ff2a13d8237502088d /src/main/res
parent0c22a8d1c6a984ccd0080d74a07d500879ee8242 (diff)
code cleanup for change password stuff
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_edit_account.xml2
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index cb6267803..d29872530 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:text="@string/change_password"
+ android:text="@string/change_password_on_server"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6634c96a4..f75a698b9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
<string name="contact_blocked">Contact blocked</string>
<string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
<string name="register_account">Register new account on server</string>
- <string name="change_password">Change password</string>
+ <string name="change_password_on_server">Change password on server</string>
<string name="share_with">Share with</string>
<string name="start_conversation">Start Conversation</string>
<string name="invite_contact">Invite Contact</string>