diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 12:14:33 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 14:26:29 -0600 |
| commit | 210b562bd474e7d8c22becf62ea52399f0a6d9f9 (patch) | |
| tree | b2fd109027918e1f9f7280cabb45e1a190bcc460 /res | |
| parent | aaef532599ebfac1f3e8f244a0cd2118ced30327 (diff) | |
| parent | 478b8b50cabc6955314d147bdadadc6127f56e5f (diff) | |
Merge branch 'feature/switch-provider-from-dashboard' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/client_dashboard.xml | 1 | ||||
| -rwxr-xr-x | res/values/strings.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index a8eaf79..55ad91b 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -7,6 +7,7 @@ android:title="@string/menu_settings"/> <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" /> <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" /> + <item android:id="@+id/switch_provider" android:title="@string/switch_provider_menu_option" android:orderInCategory="501"/> <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="false"></item> <item android:id="@+id/logout_button" android:title="@string/logout_button" android:visible="false"></item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6f06ab6..83f614f 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,7 @@ <string name="copyright_guicode">Source code and issue tracker available at https://github.com/leapcode/leap_android/</string> <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string> <string name="about">About</string> + <string name="switch_provider_menu_option">Switch provider</string> <string name="about_summary">About LEAP for Android</string> <string name="vpn_list_summary">List of all configured VPNs</string> <string name="vpn_list_title">VPN Profiles</string> @@ -295,6 +296,10 @@ <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> + <string name="logout_message">Logging out from this session.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> <string name="authentication_failed_message">Authentication failed.</string> <string name="successful_log_out_message">Logged out.</string> |