aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-03 22:58:17 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-03 22:58:17 +0200
commitc617cf6ef8ad0b00523a40f886ea64afe47b1712 (patch)
tree7529c7829f2101fed8575afa35df189abf6618bc /src/main/res
parent9b91d0bf75751b064bb601c8d3f65d40bc49fea4 (diff)
added Config.java varibale to lock account creation to specfic domain
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_edit_account.xml1
-rw-r--r--src/main/res/values/strings.xml3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index bbcef140..240d7d6e 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -42,6 +42,7 @@
android:orientation="vertical"
android:layout_toRightOf="@+id/avater">
<TextView
+ android:id="@+id/account_jid_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_jabber_id"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 722eec2d..41e1ccff 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -499,4 +499,7 @@
<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
<string name="send_private_message">Send private message</string>
<string name="user_has_left_conference">%s has left the conference!</string>
+ <string name="username">Username</string>
+ <string name="username_hint">Username</string>
+ <string name="invalid_username">This is not a valid username</string>
</resources>