Fix even stupider bugv0.5.34

--HG--
extra : amend_source : d8c0fc1d7c1f5ad498fb9ecd37b58929b1aa7f7b

20 files changed, 145 insertions, 20 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8da35615..f92ec38a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="de.blinkt.openvpn"
-    android:versionCode="60"
-    android:versionName="0.5.33" >
+    android:versionCode="61"
+    android:versionName="0.5.34" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 9cb9ead4..fd93b7da 100755
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -17,11 +17,18 @@
     <item>Sense especificar</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Sense registre</item>
+    <item>0 - No logging</item>
     <item>1 - Registre per defecte</item>
     <item>2 - Registre extens</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Registre de depuració</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 0c515724..2d66c5e5 100755
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -17,11 +17,18 @@
     <item>Nespecifikováno</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Bez logu</item>
+    <item>0 - No logging</item>
     <item>1 - Defaultní logování</item>
     <item>2 - Podrobnější logování</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Debug logování</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index fd401872..87b0132f 100755
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -17,11 +17,18 @@
     <item>No especificado</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - No registrar</item>
+    <item>0 - No logging</item>
     <item>1 - Registro predeterminado</item>
     <item>2 - Registro más detallado</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Registro de depuración</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e5740c4a..3b2a18f3 100755
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -17,11 +17,18 @@
     <item>Määratlemata</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Logi puudub</item>
+    <item>0 - No logging</item>
     <item>1 - Tavaline logi</item>
     <item>2 - Detailsem logi</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Silumislogi</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index d716b4d5..b9e35f60 100755
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -17,11 +17,18 @@
     <item>Non spécifié</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Aucun</item>
+    <item>0 - No logging</item>
     <item>1 - Par défaut</item>
     <item>2 - Avancé</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Tout (Debug)</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-id/arrays.xml b/res/values-id/arrays.xml
index 3a3dd2bd..e4b3552e 100755
--- a/res/values-id/arrays.xml
+++ b/res/values-id/arrays.xml
@@ -17,11 +17,18 @@
     <item>Tidak\Belum ditentukan</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Tidak ada catatan</item>
+    <item>0 - No logging</item>
     <item>2 -  Catatan standar</item>
     <item>2 - Catatan lengkap</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Catatan pencarian masalah</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 54ff474c..f6821820 100755
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -17,11 +17,18 @@
     <item>Non specificato</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>Log disattivato</item>
+    <item>0 - No logging</item>
     <item>Default log</item>
     <item>Log più dettagliato</item>
     <item>3</item>
     <item>4</item>
     <item>Log per debug</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index c2428a74..744ff435 100755
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -17,11 +17,18 @@
     <item>未指定</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - ログなし</item>
+    <item>0 - ログ記録なし</item>
     <item>1 - 標準的なログ</item>
     <item>2 - 詳細なログ</item>
     <item>3</item>
     <item>4</item>
     <item>5 - デバッグログ</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 47d1a478..831f369b 100755
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,6 +21,7 @@
   <string name="about">バージョン情報</string>
   <string name="about_summary">OpenVPN for Androidについて</string>
   <string name="vpn_list_summary">設定されたすべてのVPN</string>
+  <string name="vpn_list_title">プロファイル</string>
   <string name="vpn_type">種別</string>
   <string name="pkcs12pwquery">PKCS12のパスワード</string>
   <string name="file_select">選択</string>
@@ -176,6 +177,7 @@ SDカード上のデータは本質的に無防備です。すべてのアプリ
   <string name="file_icon">ファイルのアイコン</string>
   <string name="tls_authentication">TLS認証</string>
   <string name="generated_config">生成された構成</string>
+  <string name="generalsettings">設定</string>
   <string name="owner_fix_summary">システムに/dev/tunの所有者を設定します。いくつかのCM9のイメージでVPNService APIを動作させるために必要です。root権限が必要です。</string>
   <string name="owner_fix">/dev/tun の所有権を修正</string>
   <string name="generated_config_summary">生成された OpenVPN の構成ファイルを表示します</string>
@@ -272,6 +274,7 @@ TCP keepaliveと長いタイムアウト時間は動作しますが、TCP over T
   <string name="connectretrywait">接続間隔(秒)</string>
   <string name="minidump_generated">OpenVPN は予期せず終了しました。メイン メニューでミニダンプの送信オプションを検討してください。</string>
   <string name="send_minidump">ミニダンプを開発者に送信</string>
+  <string name="send_minidump_summary">最後にクラッシュした時のデバッグ情報を作者に送信します。</string>
   <string name="notifcation_title">OpenVPN - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
@@ -282,6 +285,7 @@ TCP keepaliveと長いタイムアウト時間は動作しますが、TCP over T
   <string name="state_assign_ip">IPアドレスを割り当て中</string>
   <string name="state_add_routes">経路を追加中</string>
   <string name="state_connected">接続しました</string>
+  <string name="state_disconnected">切断</string>
   <string name="state_reconnecting">再接続中</string>
   <string name="state_exiting">終了中</string>
   <string name="state_noprocess">停止中</string>
@@ -291,8 +295,18 @@ TCP keepaliveと長いタイムアウト時間は動作しますが、TCP over T
   <string name="state_nonetwork">使用可能なネットワークを待機中</string>
   <string name="statusline_bytecount">↓%2$s/s %1$s - ↑%4$s/s %3$s</string>
   <string name="notifcation_title_notconnect">未接続</string>
+  <string name="start_vpn_title">VPN %sに接続中</string>
+  <string name="start_vpn_ticker">VPN %sに接続中</string>
   <string name="jelly_keystore_alphanumeric_bug">Android 4.1の一部のバージョンで、キーストアの証明書の名前にアルファベット以外の特殊な文字(スペース、アンダーバー、ダッシュ等)を含む場合に問題が発生します。証明書の名前から特殊な文字を外して再度インポートを試みてください。</string>
   <string name="encryption_cipher">暗号化方式</string>
   <string name="packet_auth">パケット認証</string>
   <string name="auth_dialog_title">パケット認証方式を入力してください。</string>
+  <string name="toggle_timestamps">時刻表示の切り替え</string>
+  <string name="mobile_info_extended">%1$ S (%2 $s) %3 $s、Android API %4$ d、$s バージョン %5 %6 $s において実行中</string>
+  <string name="built_by">%s によりビルド</string>
+  <string name="debug_build">デバッグ ビルド</string>
+  <string name="official_build">正式ビルド</string>
+  <string name="make_selection_inline">プロファイルにコピー</string>
+  <string name="crashdump">クラッシュ ダンプ</string>
+  <string name="add">追加</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 6d77a4dc..bc6e2b1c 100755
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -17,11 +17,18 @@
     <item>미지정</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - 로깅 안함</item>
+    <item>0 - No logging</item>
     <item>1 - 기본 로깅</item>
     <item>2 - 더 자세한 로깅</item>
     <item>3</item>
     <item>4</item>
     <item>5 - 디버그 로깅</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 9be2a9d4..30398e70 100755
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -17,11 +17,18 @@
     <item>Niet-gespecificeerd</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Geen logboek</item>
+    <item>0 - No logging</item>
     <item>1 - Standaard logboek</item>
     <item>2 - Uitgebreid logboek</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Debug logboek</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-no/arrays.xml b/res/values-no/arrays.xml
index a5a6b76d..3c26a34a 100755
--- a/res/values-no/arrays.xml
+++ b/res/values-no/arrays.xml
@@ -17,11 +17,18 @@
     <item>Uspesifisert</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Ingen Logging</item>
+    <item>0 - No logging</item>
     <item>1 - Standard logging</item>
     <item>2 - Mer detaljert logging</item>
     <item>3</item>
     <item>4</item>
     <item>5 - feilsøke logging</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 85c20591..d4413dba 100755
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -17,11 +17,18 @@
     <item>Nespecificat</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Fara jurnal</item>
+    <item>0 - No logging</item>
     <item>1 - Jurnal implicit</item>
     <item>2 - Jurnal mai detaliat</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Jurnal debug</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index dd2161e0..cadf0020 100755
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -17,11 +17,18 @@
     <item>Не указан</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 -Не вести лог</item>
+    <item>0 - No logging</item>
     <item>1 - Уровень лога по-умолчанию</item>
     <item>2 - подробный лог</item>
     <item>3</item>
     <item>4</item>
     <item>5 - лог для отладки</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index ee2a457b..a567d22e 100755
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -17,11 +17,18 @@
     <item>Невказано</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - Немає журналювання</item>
+    <item>0 - No logging</item>
     <item>1 - Журналювання за замовчуванням</item>
     <item>2 - Більш детальне журналювання</item>
     <item>3</item>
     <item>4</item>
     <item>5 - Журнал налагодження</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index ff60c1b2..170a7362 100755
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -17,11 +17,18 @@
     <item>未指定</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - 无日志</item>
+    <item>0 - No logging</item>
     <item>1 - 默认</item>
     <item>2 - 详细</item>
     <item>3</item>
     <item>4</item>
     <item>5 - 调试</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a2e9f209..76243d0f 100755
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -17,11 +17,18 @@
     <item>不指定</item>
   </string-array>
   <string-array name="verb_entries">
-    <item>0 - 不作記錄</item>
+    <item>0 - No logging</item>
     <item>1 - 預設記錄</item>
     <item>2 - 詳細記錄</item>
     <item>3</item>
     <item>4</item>
     <item>5 - 除錯</item>
   </string-array>
+  <string-array name="crm_entries" translatable="false">
+    <item>No reconnection retries</item>
+    <item>One reconnection retry</item>
+    <item>Five reconnection retries</item>
+    <item>Fifty reconnection retries</item>
+    <item>Unlimited reconnection retries</item>
+  </string-array>
 </resources>
diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java
index e1a89b87..4adf8db2 100644
--- a/src/de/blinkt/openvpn/FileSelect.java
+++ b/src/de/blinkt/openvpn/FileSelect.java
@@ -121,7 +121,7 @@ public class FileSelect extends Activity {
 		Exception fe = null;
 		try {
 
-			String data =VpnProfile.INLINE_TAG;
+			String data = "";
 			
 			byte[] filedata = readBytesFromFile(ifile) ;
 			if(mBase64Encode)
diff --git a/src/de/blinkt/openvpn/FileSelectionFragment.java b/src/de/blinkt/openvpn/FileSelectionFragment.java
index f750d91a..82010b83 100644
--- a/src/de/blinkt/openvpn/FileSelectionFragment.java
+++ b/src/de/blinkt/openvpn/FileSelectionFragment.java
@@ -62,7 +62,6 @@ public class FileSelectionFragment extends ListFragment {
 		myPath = (TextView) v.findViewById(R.id.path);
 
 		mInlineImport = (CheckBox) v.findViewById(R.id.doinline);
-		mInlineImport.setEnabled(false);
 
 		if(mHideImport== true) {
 			mInlineImport.setVisibility(View.GONE);