diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-26 00:18:21 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-26 00:18:21 +0200 |
| commit | dedf06938ac7eaec4d331d2add57c4c416b8ffed (patch) | |
| tree | d1891ce9903c275da0baefcb07bb9bcf856c2777 /app/src/main/res/values | |
| parent | c66aa1bf6aea82e78d684d549113ed44639fb400 (diff) | |
| parent | 3107a64b086746bca7b3afc6508c0bb7311f0bf5 (diff) | |
Merge branch 'develop' into release-0.5.3
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62d54981..c928f001 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,8 @@ <resources> <string name="retry">Retry</string> - <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string> + <string name="repository_url_text">Source code available at https://github.com/leapcode/bitmask_android/</string> + <string name="leap_tracker">Tracker available at https://leap.se/code</string> <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string> <string name="switch_provider_menu_option">Switch provider</string> <string name="info">info</string> @@ -16,9 +17,7 @@ <string name="provider_label_none">No provider configured</string> <string name="eip_settings_button_description">Access EIP connection settings</string> <string name="status_unknown">Status unknown.</string> - <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string> <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string> - <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string> <string name="authed_secured_status">Connection secure using your own certificate.</string> <string name="eip_service_label">Encrypted Internet</string> <string name="title_activity_configuration_wizard">Select a service provider</string> @@ -58,6 +57,7 @@ <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="logged_out_message">Logged out.</string> <string name="log_out_failed_message">Didn\'t logged out.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> <string name="authentication_failed_message">Authentication failed.</string> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index cc39df3d..f956b6bd 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -3,7 +3,7 @@ <string name="app" translatable="false">Bitmask</string> <string name="app_name" translatable="false">Bitmask</string> - <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project <info@leap.se></string> + <string name="copyright_leapgui" translatable="false">Copyright 2012-2014\nLEAP Encryption Access Project <info@leap.se></string> <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string> @@ -892,4 +892,5 @@ + </resources>
\ No newline at end of file |