Resources merge correctly.

22 files changed, 62 insertions, 21 deletions

diff --git a/app/src/main/res/values-ca/strings-icsopenvpn.xml b/app/src/main/res/values-ca/strings-icsopenvpn.xml
index 554b4816..67db8022 100755
--- a/app/src/main/res/values-ca/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ca/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN per Android</string>
+
   <string name="address">Adreá del servidor:</string>
   <string name="port">Port del servidor:</string>
   <string name="location">Lloc</string>
diff --git a/app/src/main/res/values-cs/strings-icsopenvpn.xml b/app/src/main/res/values-cs/strings-icsopenvpn.xml
index 2377062e..179f81f1 100755
--- a/app/src/main/res/values-cs/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-cs/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN pro Android</string>
+
   <string name="address">Adresa serveru:</string>
   <string name="port">Port serveru:</string>
   <string name="location">Lokace</string>
diff --git a/app/src/main/res/values-de/strings-icsopenvpn.xml b/app/src/main/res/values-de/strings-icsopenvpn.xml
index ef9fb9d6..9bf58685 100755
--- a/app/src/main/res/values-de/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-de/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN für Android</string>
+
   <string name="address">Server:</string>
   <string name="port">Server Port:</string>
   <string name="location">Ort</string>
diff --git a/app/src/main/res/values-es/strings-icsopenvpn.xml b/app/src/main/res/values-es/strings-icsopenvpn.xml
index 5ad33bbd..e9b6ed81 100755
--- a/app/src/main/res/values-es/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-es/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN para Android</string>
+
   <string name="address">Dirección del servidor:</string>
   <string name="port">Puerto del servidor:</string>
   <string name="location">Ubicación</string>
diff --git a/app/src/main/res/values-et/strings-icsopenvpn.xml b/app/src/main/res/values-et/strings-icsopenvpn.xml
index 61f8556c..f8e219f3 100755
--- a/app/src/main/res/values-et/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-et/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN Androidile</string>
+
   <string name="address">Serveri aadress:</string>
   <string name="port">Serveri port:</string>
   <string name="location">Asukoht</string>
diff --git a/app/src/main/res/values-fr/strings-icsopenvpn.xml b/app/src/main/res/values-fr/strings-icsopenvpn.xml
index 140ac977..e84f8cb8 100755
--- a/app/src/main/res/values-fr/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-fr/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">"OpenVPN pour Android"</string>
+
   <string name="address">"Adresse du serveur:"</string>
   <string name="port">"Port du serveur:"</string>
   <string name="location">"Emplacement"</string>
diff --git a/app/src/main/res/values-id/strings-icsopenvpn.xml b/app/src/main/res/values-id/strings-icsopenvpn.xml
index 0a7d32b0..ccb60754 100755
--- a/app/src/main/res/values-id/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-id/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN untuk Android</string>
+
   <string name="address">Alamat Server:</string>
   <string name="port">Port server:</string>
   <string name="location">Lokasi</string>
diff --git a/app/src/main/res/values-it/strings-icsopenvpn.xml b/app/src/main/res/values-it/strings-icsopenvpn.xml
index b35fa480..aaa18afa 100755
--- a/app/src/main/res/values-it/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-it/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN per Android</string>
+
   <string name="address">Indirizzo server:</string>
   <string name="port">Porta del server:</string>
   <string name="location">Posizione</string>
diff --git a/app/src/main/res/values-ja/strings-icsopenvpn.xml b/app/src/main/res/values-ja/strings-icsopenvpn.xml
index 162d56f0..2ce290a3 100755
--- a/app/src/main/res/values-ja/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ja/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN for Android</string>
+
   <string name="address">サーバアドレス</string>
   <string name="port">ポート番号</string>
   <string name="location">場所</string>
diff --git a/app/src/main/res/values-ko/strings-icsopenvpn.xml b/app/src/main/res/values-ko/strings-icsopenvpn.xml
index 61504764..cd8bc176 100755
--- a/app/src/main/res/values-ko/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ko/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">안드로이드용 OpenVPN</string>
+
   <string name="address">서버 주소:</string>
   <string name="port">서버 포트:</string>
   <string name="location">위치</string>
diff --git a/app/src/main/res/values-nl/strings-icsopenvpn.xml b/app/src/main/res/values-nl/strings-icsopenvpn.xml
index a7ae78fd..f553449b 100755
--- a/app/src/main/res/values-nl/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-nl/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN voor Android</string>
+
   <string name="address">Server Adres:</string>
   <string name="port">Server Poort:</string>
   <string name="location">Locatie</string>
diff --git a/app/src/main/res/values-no/strings-icsopenvpn.xml b/app/src/main/res/values-no/strings-icsopenvpn.xml
index 23af8c31..7a7dd124 100755
--- a/app/src/main/res/values-no/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-no/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN for Android</string>
+
   <string name="address">Server adresse:</string>
   <string name="port">Server port:</string>
   <string name="location">Plassering</string>
diff --git a/app/src/main/res/values-pl/strings-icsopenvpn.xml b/app/src/main/res/values-pl/strings-icsopenvpn.xml
index 5c96d94c..d628da6c 100755
--- a/app/src/main/res/values-pl/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-pl/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN dla Androida</string>
+
   <string name="address">Adres serwera:</string>
   <string name="port">Port serwera:</string>
   <string name="location">Lokalizacja</string>
diff --git a/app/src/main/res/values-ro/strings-icsopenvpn.xml b/app/src/main/res/values-ro/strings-icsopenvpn.xml
index 7e00ba96..8ae2770e 100755
--- a/app/src/main/res/values-ro/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ro/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN pentru Android</string>
+
   <string name="address">Adresa server:</string>
   <string name="port">Port server:</string>
   <string name="location">Locaţie</string>
diff --git a/app/src/main/res/values-ru/strings-icsopenvpn.xml b/app/src/main/res/values-ru/strings-icsopenvpn.xml
index 9cc95a5a..292ddf46 100755
--- a/app/src/main/res/values-ru/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ru/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN для Android</string>
+
   <string name="address">Адрес сервера:</string>
   <string name="port">Порт сервера:</string>
   <string name="location">Расположение</string>
diff --git a/app/src/main/res/values-sv/strings-icsopenvpn.xml b/app/src/main/res/values-sv/strings-icsopenvpn.xml
index 12a94cc9..1e4f3635 100755
--- a/app/src/main/res/values-sv/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-sv/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN för Android</string>
+
   <string name="address">Serveradress:</string>
   <string name="port">Serverport:</string>
   <string name="location">Plats</string>
diff --git a/app/src/main/res/values-tr/strings-icsopenvpn.xml b/app/src/main/res/values-tr/strings-icsopenvpn.xml
index 85f1740f..903c358a 100755
--- a/app/src/main/res/values-tr/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-tr/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">Android için OpenVPN</string>
+
   <string name="address">Sunucu adresi:</string>
   <string name="port">Sunucu Portu:</string>
   <string name="location">Konum</string>
diff --git a/app/src/main/res/values-uk/strings-icsopenvpn.xml b/app/src/main/res/values-uk/strings-icsopenvpn.xml
index 3418ece1..173ae0d4 100755
--- a/app/src/main/res/values-uk/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-uk/strings-icsopenvpn.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.net-->
 <!-- Generated by crowdin.net -->
 <resources>
-  <string name="app">OpenVPN для Android</string>
+
   <string name="address">Адреса сервера:</string>
   <string name="port">Порт сервера:</string>
   <string name="location">Розташування</string>
diff --git a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml b/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
index a2fb95ce..0ffb5d6b 100755
--- a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">OpenVPN for Android</string>
+
   <string name="address">服务器地址：</string>
   <string name="port">服务器端口：</string>
   <string name="location">地点</string>
diff --git a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
index 75f72ecb..e467dd5b 100755
--- a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">OpenVPN for Android</string>
+
   <string name="address">伺服器地址:</string>
   <string name="port">伺服器端口:</string>
   <string name="location">位置</string>
diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml
index a5424c39..6ab41787 100755
--- a/app/src/main/res/values/strings-icsopenvpn.xml
+++ b/app/src/main/res/values/strings-icsopenvpn.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?> <!-- Generated by crowdin.net -->
 <resources>
 
+
+    <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
     <string name="cant_read_folder">Unable to read directory</string>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 6435bfbf..4c652f20 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -16,4 +16,43 @@
     <string name="lzo" translatable="false">LZO</string>
     <string name="openssl" translatable="false">OpenSSL</string>
     <string name="unknown_state" translatable="false">Unknown state</string>
-</resources>
+
+    <string name="copyright_blinktgui" translatable="false">Copyright 2012–2014 Arne Schwabe &lt;arne@rfc2549.org></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="file_dialog" translatable="false">File Dialog</string>
+
+
+
+    <string name="permission_description">Allows another app to control OpenVPN</string>
+    <string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string>
+    <string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>
+    <string name="state_user_vpn_permission" translatable="false">Waiting for user permission to use VPN API</string>
+    <string name="state_user_vpn_password" translatable="false">Waiting for user VPN password</string>
+    <string name="state_user_vpn_password_cancelled" translatable="false">VPN password input dialog cancelled</string>
+    <string name="state_user_vpn_permission_cancelled" translatable="false">VPN API permission dialog cancelled</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</resources>
\ No newline at end of file