diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-05-09 09:17:56 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-05-09 09:17:56 +0200 |
| commit | 912dd84dddc48790063d76beee76d8d73c1eaf4e (patch) | |
| tree | afd1d263489d952a2ac0bf9e2690779010ca558e /app/src/main/res | |
| parent | d4caf8f35fc9dd43d370439e8f6b6727909b15b9 (diff) | |
| parent | de649fdd31f2d673de8eca9684ff5c66fbd53ef3 (diff) | |
Merge branch 'feature/signup-support-#5586' into develop
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/client_dashboard.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml index 676c07c7..663231cd 100644 --- a/app/src/main/res/menu/client_dashboard.xml +++ b/app/src/main/res/menu/client_dashboard.xml @@ -6,18 +6,20 @@ <item android:id="@+id/switch_provider" android:orderInCategory="501" - android:title="@string/switch_provider_menu_option"/> + android:title="@string/switch_provider_menu_option"/> + <item + android:id="@+id/signup_button" + android:title="@string/signup_button" + android:visible="false"/> <item android:id="@+id/login_button" android:showAsAction="ifRoom" android:title="@string/login_button" - android:visible="false"> - </item> + android:visible="false"/> <item android:id="@+id/logout_button" android:showAsAction="ifRoom" android:title="@string/logout_button" - android:visible="false"> - </item> + android:visible="false"/> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 492c48c7..ac692a69 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,6 +116,7 @@ <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="signup_button">Sign Up</string> <string name="setup_error_title">Configuration Error</string> <string name="setup_error_configure_button">Configure</string> <string name="setup_error_close_button">Exit</string> @@ -126,6 +127,7 @@ <string name="configuring_provider">Configuring provider</string> <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string> <string name="authenticating_message">Logging in</string> + <string name="signingup_message">Signing up</string> <string name="logout_message">Logging out from this session.</string> <string name="log_out_failed_message">Didn\'t logged out.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> |