Merge Official Source

luasrc/model/cbi/dockerman/configuration.lua

@@ -44,12 +44,6 @@ if nixio.fs.access("/usr/bin/dockerd") then
 	o.rmempty = false
 	o:depends("remote_endpoint", 0)
 
-	o = s:option(Flag, "ip6tables",
-		translate("Enable IPv6"),
-		translate("Enable IPv6 network for bridge."))
-	o.rmempty = false
-	o:depends("remote_endpoint", 0)
-
 	o = s:option(Value, "data_root",
 		translate("Docker Root Dir"))
 	o.placeholder = "/opt/docker/"

po/zh_Hans/dockerman.po

@@ -971,12 +971,6 @@ msgstr "实验性功能"
 msgid "Enable Docker experimental features."
 msgstr "启用 Docker 实验性功能（experimental）"
 
-msgid "Enable IPv6"
-msgstr "启用 IPv6"
-
-msgid "Enable IPv6 network for bridge."
-msgstr "为桥接网络启用 IPv6"
-
 msgid "HTTP Proxy"
 msgstr "HTTP 代理"