Move untranslatable string to own file

4 files changed, 40 insertions, 49 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8584da1f..b88e975e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -11,25 +11,11 @@
         <item>User/PW + PKCS12 </item>
         <item>User/PW + Android</item>
     </string-array>
-
     <string-array name="tls_directions_entries">
         <item>0</item>
         <item>1</item>
         <item>Unspecified</item>
     </string-array>
-    <string-array translatable="false" name="tls_directions_values">
-        <item>0</item>
-        <item>1</item>
-        <item></item>
-    </string-array>
-    <string-array translatable="false" name="verb_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
     <string-array name="verb_entries">
         <item>0 - No Logging</item>
         <item>1 - Default logging</item>
@@ -39,4 +25,4 @@
         <item>5 - Debug logging</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c753a4a4..7ffdca90 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2011 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
 <resources>
-
     <string name="app">OpenVPN for Android</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
-    <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
-    <string name="defaultport" translatable="false">1194</string>
     <string name="location">Location</string>
     <string name="cant_read_folder">folder can\'t be read!</string>
     <string name="select">Select</string>
@@ -34,22 +15,8 @@
     <string name="client_pkcs12_title">PKCS12 File</string>
     <string name="ca_title">CA Certificate</string>
     <string name="no_certificate">Nothing selected</string>
-    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
-
-	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.\n</string>
-    <string name="copyright_blinktgui" translatable="false">Copyright 2012\nArne Schwabe &lt;arne@rfc2549.org></string>
     <string name="copyright_guicode">Source code and issue tracker available under http://code.google.com/p/ics-openvpn/ </string>
     <string name="copyright_others">The program uses the following components. See the source for full details on the licenses</string>
-    <string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
-    <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
-    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
-        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
-        This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
-        Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
-    <string name="openvpn" translatable="false">OpenVPN</string>
-    <string name="file_dialog" translatable="false">File Dialog</string>
-    <string name="lzo" translatable="false">LZO</string>
-    <string name="openssl" translatable="false">OpenSSL</string>
     <string name="about">About</string>
     <string name="about_summary">About OpenVPN 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
new file mode 100644
index 00000000..cb5bea14
--- /dev/null
+++ b/res/values/untranslatable.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="copyright_blinktgui" translatable="false">Copyright 2012\nArne Schwabe &lt;arne@rfc2549.org></string>
+    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
+
+	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.\n</string>
+    <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
+    <string name="defaultport" translatable="false">1194</string>
+    <string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
+    <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
+    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
+        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
+        This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
+        Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
+    <string name="openvpn" translatable="false">OpenVPN</string>
+    <string name="file_dialog" translatable="false">File Dialog</string>
+    <string name="lzo" translatable="false">LZO</string>
+    <string name="openssl" translatable="false">OpenSSL</string>
+
+    <string-array name="tls_directions_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item></item>
+    </string-array>
+    <string-array name="verb_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
+</resources>
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java
index 74f569e9..7b5324bd 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/src/de/blinkt/openvpn/LaunchVPN.java
@@ -250,8 +250,11 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
 			}
 			fout.close();
 
-			if(!mvpnout.setExecutable(true))
+			if(!mvpnout.setExecutable(true)) {
+				OpenVPN.logMessage(0, "","Failed to set minivpn executable");
 				return false;
+			}
+				
 			
 			return true;
 		} catch (IOException e) {