diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-03 16:54:00 -0700 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-03 16:54:00 -0700 |
| commit | 04fedee9f6be1e3e46a8c91c9a39343513cc6fe1 (patch) | |
| tree | cb221b9304905e25695c59be60f0eeb62fe25a36 /res | |
| parent | 697e7da6e1379ac23cd8dbb47a1246547abafda6 (diff) | |
| parent | 37bb23c5549ffe690f65b1c04cf432bd3153bf04 (diff) | |
Merge branch 'bug/login_dialog_should_require_username' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/log_in_dialog.xml | 4 | ||||
| -rwxr-xr-x | res/values/strings.xml | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml index 4c9fdbad..3a9eebb8 100644 --- a/res/layout/log_in_dialog.xml +++ b/res/layout/log_in_dialog.xml @@ -22,7 +22,7 @@ android:layout_marginRight="4dp" android:layout_marginTop="16dp" android:ems="10" - android:hint="@string/username_ask" + android:hint="@string/username_hint" android:inputType="textUri" > <requestFocus /> @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" - android:hint="@string/password_ask" + android:hint="@string/password_hint" android:inputType="textPassword" /> </LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 532d2379..a6afb71d 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -274,11 +274,12 @@ <string name="name">Name</string> <string name="description">Description</string> <string name="use_anonymously_button">Use anonymously</string> - <string name="username_ask">Introduce your username</string> - <string name="password_ask">Enter your password</string> + <string name="username_hint">username</string> + <string name="username_ask">Please enter your username</string> + <string name="password_hint">password</string> <string name="user_message">User message</string> <string name="error_bad_user_password_user_message">Not valid username and/or password.</string> - <string name="error_not_valid_password_user_message">Your password is not well-formed: it should have at least 8 characters.</string> + <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string> <string name="error_client_http_user_message">Try again: Client HTTP error</string> <string name="error_io_exception_user_message">Try again: I/O error</string> <string name="error_json_exception_user_message">Try again: Bad response from the server</string> |