diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
| commit | 8bc035e5785b8a14c26cdb6ab409242b66554992 (patch) | |
| tree | 3abe8236fe9789b0aebcf50b4cf3c7ebfe0605e1 /res/values | |
| parent | a651099981ddc9ed5c17a25b2bb618b161cec048 (diff) | |
| parent | 3f5d756fa1a37dba00c400ca2a6197af5af1071e (diff) | |
Merge branch 'develop' of ssh://leap.se:22/bitmask_android into develop
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2598d452..8a5bb49f 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> @@ -239,7 +237,7 @@ <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string> <string name="send_minidump">Send Minidump to developer</string> <string name="send_minidump_summary">Send debugging information about last crash to developer</string> - <string name="notifcation_title">OpenVPN - %s</string> + <string name="notifcation_title">Bitmask - %s</string> <string name="session_ipv4string">%1$s - %2$s</string> <string name="session_ipv6string">%1$s - %3$s, %2$s</string> <string name="state_connecting">Connecting</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 |