Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20c3dbb authored by takuo's avatar takuo Committed by Takuo Kitame
Browse files

Added interface to select openvpn device tun or tap.

parent 989e55e0
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -1102,4 +1102,20 @@
    <string name="sound_category_feedback_title" msgid="4399742321363475393">"フィードバック"</string>

    <string name="cm_settings_title">CyanogenMod設定</string>
    <!-- OpenVPN settings -->
    <string name="vpn_openvpn_port">"サーバポート番号"</string>
    <string name="vpn_openvpn_protocol">"使用するプロトコル"</string>
    <string name="vpn_openvpn_device">"使用するデバイス"</string>
    <string name="vpn_openvpn_userauth">"ユーザ認証"</string>
    <string name="vpn_openvpn_userauth_summary">"追加のユーザ認証が必要な場合設>定する"</string>
    <string name="vpn_openvpn_advanced_titlebar">"追加のOpenVPN設定"</string>
    <string name="vpn_openvpn_comp_lzo">"LZO圧縮"</string>
    <string name="vpn_openvpn_comp_lzo_summary">"LZO圧縮を有効にする"</string>
    <string name="vpn_openvpn_redirect_gateway_title">"リダイレクトゲートウェイ"</string>
    <string name="vpn_openvpn_redirect_gateway_summary">"すべてのトラフィックをOpenVPN経由にする"</string>
    <string name="vpn_openvpn_set_addr">"リモートによるアドレス設定"</string>
    <string name="vpn_openvpn_set_addr_summary">"トンネルアドレスを手動で設定す>るにはチェックを外す"</string>
    <string name="vpn_openvpn_set_local_addr">"ローカルIPアドレス"</string>
    <string name="vpn_openvpn_set_remote_addr">"リモートIPアドレス"</string>

</resources>
+7 −0
Original line number Diff line number Diff line
@@ -349,6 +349,13 @@
        <item>tcp</item>
    </string-array>

    <!-- openvpn advanced menu device entries -->
    <!-- Do not translate. -->
    <string-array name="vpn_openvpn_device_entries">
        <item>tun</item>
        <item>tap</item>
    </string-array>

    <!-- Locales in this list are displayed with the corresponding
         name from special_locale_names instead of using the name
         from Locale.getDisplayName(). -->
+1 −0
Original line number Diff line number Diff line
@@ -2388,6 +2388,7 @@ found in the list of installed applications.</string>
    <string name="vpn_pptp_encryption">PPTP encryption</string>
    <string name="vpn_openvpn_port">Port for Server</string>
    <string name="vpn_openvpn_protocol">Protocol to use for Port</string>
    <string name="vpn_openvpn_device">Device to use</string>
    <string name="vpn_openvpn_userauth">User Authentication</string>
    <string name="vpn_openvpn_userauth_summary">Set if additional username/password authentication needs to be used</string>
    <string name="vpn_openvpn_advanced_titlebar">Advanced Openvpn Settings</string>
+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@
       android:entryValues="@array/vpn_openvpn_protocol_entries"
       />

    <ListPreference
       android:key="set_device"
       android:title="@string/vpn_openvpn_device"
       android:dialogTitle="@string/vpn_openvpn_device"
       android:entries="@array/vpn_openvpn_device_entries"
       android:entryValues="@array/vpn_openvpn_device_entries"
       />

    <CheckBoxPreference
       android:key="set_comp_lzo"
       android:title="@string/vpn_openvpn_comp_lzo"