diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-12-19 17:55:56 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-12-19 17:55:56 +0100 |
| commit | 0669d0bb7c3c50d5ed042564fb3218bdb8237b19 (patch) | |
| tree | 60650cd8fe64af43d8d6650ec727aa49367c63d0 /res/values | |
| parent | 623cd76d9e1b26d81406fb886dea18a93dee8431 (diff) | |
| parent | 3b8bcb1383ec4e9deecd7a6d97180e60a3bf021a (diff) | |
Merge branch 'bug/translation_Bitmask_instead_of_Leap_Android' into develop
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2598d452..01eab8fe 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,8 +2,6 @@ <!-- Generated by crowdin.net --> <resources> - <string name="app">Bitmask</string> - <string name="app_name">Bitmask</string> <string name="address">Server Address:</string> <string name="port">Server Port:</string> <string name="location">Location</string> @@ -21,7 +19,7 @@ <string name="no_certificate">You must select a certificate</string> <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_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 LEAP</string> + <string name="about">About Bitmask</string> <string name="switch_provider_menu_option">Switch provider</string> <string name="about_summary">About Bitmask for Android</string> <string name="vpn_list_summary">List of all configured VPNs</string> diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index fe620aa8..8c15a213 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - + <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="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n |