diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-02-10 02:22:32 -0800 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-02-10 02:22:32 -0800 |
| commit | b7f0768ccb651f8cac9b8fa3ceb274535fd5c54a (patch) | |
| tree | 66fd28c2eb0317d2ca7db77b16cfd8a94b555b08 /language | |
| parent | 6f2276c2fb08562df42ba2166053da009811d410 (diff) | |
| parent | ca0ce7c4e4b05eba4569c55093fa0c2b16a74841 (diff) | |
Merge pull request #2199 from ulion/http_proxy_type
add gui setting for set proxy types curl supported, so we can support socks4/4a/5/5 with remote dns
Diffstat (limited to 'language')
| -rw-r--r-- | language/English/strings.po | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/language/English/strings.po b/language/English/strings.po index c145250ea9..e072aa75a3 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -3253,7 +3253,42 @@ msgctxt "#1051" msgid "Enter web address" msgstr "" -#empty strings from id 1052 to 1199 +#empty strings from id 1052 to 1179 + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1180" +msgid "Proxy type" +msgstr "" + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1181" +msgid "HTTP" +msgstr "" + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1182" +msgid "SOCKS4" +msgstr "" + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1183" +msgid "SOCKS4A" +msgstr "" + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1184" +msgid "SOCKS5" +msgstr "" + +#: xbmc/settings/GUISettings.cpp +msgctxt "#1185" +msgid "SOCKS5 with remote dns resolving" +msgstr "" + +#empty strings from id 1186 to 1189 +#strings 1186 to 1189 reserved for more proxy types + +#empty strings from id 1190 to 1199 #: xbmc/settings/GUISettings.cpp msgctxt "#1200" |