diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 13:35:04 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 14:27:03 -0600 |
| commit | 1ba2d488737bdb84847bbbc7cf9038610b1f094b (patch) | |
| tree | 0b30e1136dfbe3a367627cf1cc011f1f6d1fe0b3 /res | |
| parent | 210b562bd474e7d8c22becf62ea52399f0a6d9f9 (diff) | |
| parent | 84d3b5f6967c0bac2a740627386ff92b6e283b16 (diff) | |
Merge branch 'feature/back-button-in-configuration-wizard' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/log_in_dialog.xml | 7 | ||||
| -rwxr-xr-x | res/values/strings.xml | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml index 6f28118d..4c9fdbad 100644 --- a/res/layout/log_in_dialog.xml +++ b/res/layout/log_in_dialog.xml @@ -6,6 +6,13 @@ android:orientation="vertical" tools:context=".LogInDialog" > + <TextView + android:id="@+id/user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <EditText android:id="@+id/username_entered" android:layout_width="match_parent" diff --git a/res/values/strings.xml b/res/values/strings.xml index 83f614f9..c7ef6c2b 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -276,6 +276,13 @@ <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="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_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> + <string name="error_no_such_algorithm_exception_user_message">Update the app</string> <string name="login_button">Log In</string> <string name="logout_button">Log Out</string> <string name="danger_checkbox">Trust completely</string> @@ -295,7 +302,6 @@ <string name="server_is_down_message">Server is down.</string> <string name="malformed_url">It doesn\'t seem to be a LEAP provider.</string> <string name="certificate_error">This is not a trusted LEAP provider.</string> - <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string> <string name="authenticating_title">Authenticating</string> <string name="authenticating_message">Authenticating with entered login and password.</string> <string name="logout_title">Log out</string> |