Merge branch 'froyo' of github.com:takuo/android_packages_apps_Settings into froyo

    <string name="vpn_a_l2tp_secret">an L2TP secret</string>

    <string name="vpn_pptp_encryption_title">encryption</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_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">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>

    <string name="vpn_openvpn_comp_lzo">LZO Compression</string>

    <string name="vpn_openvpn_comp_lzo">LZO compression</string>

    <string name="vpn_openvpn_comp_lzo_summary">Force LZO compression to be set to on</string>

    <string name="vpn_openvpn_redirect_gateway_title">Redirect gateway</string>

    <string name="vpn_openvpn_redirect_gateway_summary">Force all traffic to berouted thru the VPN tunnel</string>

    <string name="vpn_openvpn_set_addr">Remote Sets Addresses</string>

    <string name="vpn_openvpn_set_addr_summary">Uncheck to set tunnel addresses manually</string>

    <string name="vpn_openvpn_set_local_addr">Local IP Address</string>

       android:summary="@string/vpn_openvpn_comp_lzo_summary"

       />

    <CheckBoxPreference

       android:key="set_redirect_gateway"

       android:title="@string/vpn_openvpn_redirect_gateway_title"

       android:summary="@string/vpn_openvpn_redirect_gateway_summary"

       />

    <CheckBoxPreference

       android:key="set_addr"

       android:title="@string/vpn_openvpn_set_addr"