aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_edit_account.xml11
-rw-r--r--src/main/res/values/strings.xml3
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index a12766f9..cb626780 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -79,6 +79,15 @@
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
+ <CheckBox
+ android:id="@+id/account_change_password"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/change_password"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
<TextView
android:id="@+id/account_confirm_password_desc"
android:layout_width="wrap_content"
@@ -336,8 +345,6 @@
android:visibility="visible"
android:contentDescription="@string/copy_otr_clipboard_description"/>
</RelativeLayout>
-
-
</LinearLayout>
</LinearLayout>
</ScrollView>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 29b81354..22e39a89 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -46,6 +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="share_with">Share with</string>
<string name="start_conversation">Start Conversation</string>
<string name="invite_contact">Invite Contact</string>
@@ -249,7 +250,7 @@
<string name="private_message_to">to %s</string>
<string name="send_private_message_to">Send private message to %s</string>
<string name="connect">Connect</string>
- <string name="account_already_exists">This account does already exist</string>
+ <string name="account_already_exists">This account already exists</string>
<string name="next">Next</string>
<string name="server_info_session_established">Current session established</string>
<string name="additional_information">Additional Information</string>