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

Commit c29fc13f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'openvpn-device' of http://github.com/takuo/android_packages_apps_Settings into eclair

parents 07dd09f4 c8cffc42
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@
        <item>"携帯電話を回転させると360度の範囲(逆回転も含む)で画面を回転させる"</item>
    </string-array>

    <string-array name="incorrect_delay_entries">
        <item>"遅延なし"</item>
        <item>"0.5 秒"</item>
        <item>"1 秒</item>
        <item>"1.5 秒"</item>
        <item>"2 秒"</item>
    </string-array>

    <string-array name="lockpattern_pin_check_timeout_entries">
        <item>0.5 秒</item>
        <item>1 秒</item>
+8 −0
Original line number Diff line number Diff line
@@ -626,6 +626,13 @@
    <string name="lockpattern_settings_enable_pin_based_locking">"PINロックを使用"</string>
    <string name="lockpattern_settings_set_pin_check_timeout">"PINチェックタイムアウト"</string>
    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"指の軌跡を線で表示"</string>
    <string name="lockpattern_settings_enable_visible_dots_title">"ドットを表示"</string>
    <string name="lockpattern_settings_show_error_path">"失敗時に誤った軌跡を表示"</string>
    <string name="lockpattern_settings_show_custom_msg">"カスタムメッセージ表示"</string>
    <string name="lockpattern_settings_show_sliders">"スライダーを表示"</string>
    <string name="lockpattern_settings_custom_msg">"カスタムメッセージ"</string>
    <string name="lockpattern_settings_custom_msg_dialog">"カスタムメッセージを入力してください"</string>
    <string name="lockpattern_settings_incorrect_delay_title">"誤った場合の遅延"</string>
    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"入力時バイブレーション"</string>
    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ロック解除パターン設定"</string>
    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"パターンの変更"</string>
@@ -1015,6 +1022,7 @@
    <!-- 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>
+7 −0
Original line number Diff line number Diff line
@@ -374,6 +374,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
@@ -2113,6 +2113,7 @@ found in the list of installed applications.</string>
    <string name="vpn_pptp_encryption">PPTP encryption</string>
    <string name="vpn_openvpn_port">Server port</string>
    <string name="vpn_openvpn_protocol">Protocol to use</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"
Loading