22 files changed, 313 insertions, 135 deletions

diff --git a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
index 820569261..7c9f4dee1 100644
--- a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
+++ b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
@@ -12,6 +12,8 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
+local m, s, o
+
 m = Map("minidlna", translate("miniDLNA"),
 	translate("MiniDLNA is server software with the aim of being fully compliant with DLNA/UPnP-AV clients."))
 
@@ -21,7 +23,10 @@ s = m:section(TypedSection, "minidlna", "miniDLNA Settings")
 s.addremove = false
 s.anonymous = true
 
-o = s:option(Flag, "enabled", translate("Enable:"))
+s:tab("general", translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+o = s:taboption("general", Flag, "enabled", translate("Enable:"))
 o.rmempty = false
 
 function o.cfgvalue(self, section)
@@ -40,75 +45,125 @@ function o.write(self, section, value)
 	return Flag.write(self, section, value)
 end
 
-port = s:option(Value, "port", translate("Port:"),
+o = s:taboption("general", Value, "port", translate("Port:"),
 	translate("Port for HTTP (descriptions, SOAP, media transfer) traffic."))
-port.datatype = "port"
-port.default = 8200
+o.datatype = "port"
+o.default = 8200
+
+
+o = s:taboption("general", Value, "interface", translate("Interfaces:"),
+	translate("Network interfaces to serve."))
+
+o.template = "cbi/network_ifacelist"
+o.widget   = "checkbox"
+o.nocreate = true
+
+function o.cfgvalue(self, section)
+	local rv = { }
+	local val = Value.cfgvalue(self, section)
+	if val then
+		local ifc
+		for ifc in val:gmatch("[^,%s]+") do
+			rv[#rv+1] = ifc
+		end
+	end
+	return rv
+end
+
+function o.write(self, section, value)
+	local rv = { }
+	local ifc
+	for ifc in luci.util.imatch(value) do
+		rv[#rv+1] = ifc
+	end
+	Value.write(self, section, table.concat(rv, ","))
+end
 
-s:option(Value, "interface", translate("Interfaces:"),
-	translate("Network interfaces to serve, comma delimited list."))
 
-o = s:option(Value, "friendly_name", translate("Friendly name:"),
+o = s:taboption("general", Value, "friendly_name", translate("Friendly name:"),
 	translate("Set this if you want to customize the name that shows up on your clients."))
-o.optional = true
+o.rmempty = true
 o.placeholder = "OpenWrt DLNA Server"
 
-o = s:option(Value, "db_dir", translate("Database directory:"),
+o = s:taboption("advanced", Value, "db_dir", translate("Database directory:"),
 	translate("Set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache."))
-o.optional = true
+o.rmempty = true
 o.placeholder = "/var/cache/minidlna"
 
-o = s:option(Value, "log_dir", translate("Log directory:"),
+o = s:taboption("advanced", Value, "log_dir", translate("Log directory:"),
 	translate("Set this if you would like to specify the directory where you want MiniDLNA to store its log file."))
-o.optional = true
+o.rmempty = true
 o.placeholder = "/var/log"
 
-s:option(Flag, "inotify", translate("Enable inotify:"),
+s:taboption("advanced", Flag, "inotify", translate("Enable inotify:"),
 	translate("Set this to enable inotify monitoring to automatically discover new files."))
 
-s:option(Flag, "enable_tivo", translate("Enable TIVO:"),
+s:taboption("advanced", Flag, "enable_tivo", translate("Enable TIVO:"),
 	translate("Set this to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO."))
-o.optional = true
+o.rmempty = true
 
-o = s:option(Flag, "strict_dlna", translate("Strict to DLNA standard:"),
+o = s:taboption("advanced", Flag, "strict_dlna", translate("Strict to DLNA standard:"),
 	translate("Set this to strictly adhere to DLNA standards. This will allow server-side downscaling of very large JPEG images, which may hurt JPEG serving performance on (at least) Sony DLNA products."))
-o.optional = true
+o.rmempty = true
 
-o = s:option(Value, "presentation_url", translate("Presentation URL:"))
-o.optional = true
+o = s:taboption("advanced", Value, "presentation_url", translate("Presentation URL:"))
+o.rmempty = true
 o.placeholder = "http://192.168.1.1/"
 
-o = s:option(Value, "notify_interval", translate("Notify interval:"),
+o = s:taboption("advanced", Value, "notify_interval", translate("Notify interval:"),
 	translate("Notify interval in seconds."))
 o.datatype = "uinteger"
 o.placeholder = 900
 
-o = s:option(Value, "serial", translate("Announced serial number:"),
+o = s:taboption("advanced", Value, "serial", translate("Announced serial number:"),
 	translate("Serial number the miniDLNA daemon will report to clients in its XML description."))
 o.placeholder = "12345678"
 
-s:option(Value, "model_number", translate("Announced model number:"),
+s:taboption("advanced", Value, "model_number", translate("Announced model number:"),
 	translate("Model number the miniDLNA daemon will report to clients in its XML description."))
 o.placholder = "1"
 
-o = s:option(Value, "minissdpsocket", translate("miniSSDP socket:"),
+o = s:taboption("advanced", Value, "minissdpsocket", translate("miniSSDP socket:"),
 	translate("Specify the path to the MiniSSDPd socket."))
-o.optional = true
+o.rmempty = true
 o.placeholder = "/var/run/minissdpd.sock"
 
-o = s:option(ListValue, "root_container", translate("Root container:"))
+o = s:taboption("general", ListValue, "root_container", translate("Root container:"))
 o:value(".", translate("Standard container"))
 o:value("B", translate("Browse directory"))
 o:value("M", translate("Music"))
 o:value("V", translate("Video"))
 o:value("P", translate("Pictures"))
 
-o = s:option(Value, "album_art_names", translate("Album art names:"),
-	translate("This is a list of file names to check for when searching for album art. Note: names must be delimited with a forward slash '/'"))
-o.optional = true
-o.placeholder = "Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg"
 
-s:option(DynamicList, "media_dir", translate("Media directories:"),
+s:taboption("general", DynamicList, "media_dir", translate("Media directories:"),
 	translate("Set this to the directory you want scanned. If you want to restrict the directory to a specific content type, you can prepend the type ('A' for audio, 'V' for video, 'P' for images), followed by a comma, to the directory (eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."))
 
+
+o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names:"),
+	translate("This is a list of file names to check for when searching for album art."))
+o.rmempty = true
+o.placeholder = "Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg"
+
+function o.cfgvalue(self, section)
+	local rv = { }
+	local val = Value.cfgvalue(self, section)
+	if type(val) == "table" then val = table.concat(val, "/") end
+	local file
+	for file in val:gmatch("[^/%s]+") do
+		rv[#rv+1] = file
+	end
+	return rv
+end
+
+function o.write(self, section, value)
+	local rv = { }
+	local file
+	for file in luci.util.imatch(value) do
+		rv[#rv+1] = file
+	end
+	Value.write(self, section, table.concat(rv, "/"))
+end
+
+
 return m
diff --git a/po/ca/minidlna.po b/po/ca/minidlna.po
index ed329db1e..8df98a821 100644
--- a/po/ca/minidlna.po
+++ b/po/ca/minidlna.po
@@ -7,6 +7,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -37,6 +40,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -59,7 +65,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -141,9 +147,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/de/minidlna.po b/po/de/minidlna.po
index 5390707cb..57b695c8c 100644
--- a/po/de/minidlna.po
+++ b/po/de/minidlna.po
@@ -4,13 +4,16 @@ msgstr ""
 "PO-Revision-Date: 2012-04-08 16:31+0200\n"
 "Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
 "Language-Team: none\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr "Dateinamen für Cover-Bilder:"
 
@@ -41,6 +44,9 @@ msgstr "Aktivieren:"
 msgid "Friendly name:"
 msgstr "Spitzname:"
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr "Schnittstellen:"
 
@@ -61,14 +67,14 @@ msgid ""
 "Model number the miniDLNA daemon will report to clients in its XML "
 "description."
 msgstr ""
-"Spezifiziert die Modellnummer welche der miniDLNA-Dienst als Teil seiner "
-"XML-Beschreibung an Clients versendet."
+"Spezifiziert die Modellnummer welche der miniDLNA-Dienst als Teil seiner XML-"
+"Beschreibung an Clients versendet."
 
 msgid "Music"
 msgstr "Musik"
 
-msgid "Network interfaces to serve, comma delimited list."
-msgstr "Lister dee bedienten Netzwerkschnittstellen als Komma-getrennte Liste."
+msgid "Network interfaces to serve."
+msgstr ""
 
 msgid "Notify interval in seconds."
 msgstr "Ankündigungsinterval in Sekunden."
@@ -95,8 +101,8 @@ msgid ""
 "Serial number the miniDLNA daemon will report to clients in its XML "
 "description."
 msgstr ""
-"Spezifiziert die Seriennummer welche der miniDLNA-Dienst als Teil seiner "
-"XML-Beschreibung an Clients versendet."
+"Spezifiziert die Seriennummer welche der miniDLNA-Dienst als Teil seiner XML-"
+"Beschreibung an Clients versendet."
 
 msgid ""
 "Set this if you want to customize the name that shows up on your clients."
@@ -169,13 +175,8 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr "Der miniDLNA-Dienst ist inaktiv."
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
-"Dies ist eine Liste von zu prüfenden Dateinamen wenn nach Album-Covern "
-"gesucht wird. Hinweis: Namen müssen mit einem Schrägstrich ('/') getrennt "
-"werden."
 
 msgid "Video"
 msgstr "Video"
@@ -188,3 +189,15 @@ msgstr "miniDLNA-Status"
 
 msgid "miniSSDP socket:"
 msgstr "miniSSDP-Socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr ""
+#~ "Lister dee bedienten Netzwerkschnittstellen als Komma-getrennte Liste."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "Dies ist eine Liste von zu prüfenden Dateinamen wenn nach Album-Covern "
+#~ "gesucht wird. Hinweis: Namen müssen mit einem Schrägstrich ('/') getrennt "
+#~ "werden."
diff --git a/po/el/minidlna.po b/po/el/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/el/minidlna.po
+++ b/po/el/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/en/minidlna.po b/po/en/minidlna.po
index a0eb1ee78..5934d42e9 100644
--- a/po/en/minidlna.po
+++ b/po/en/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr "Album art names:"
 
@@ -38,6 +41,9 @@ msgstr "Enable:"
 msgid "Friendly name:"
 msgstr "Friendly name:"
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr "Interfaces:"
 
@@ -64,8 +70,8 @@ msgstr ""
 msgid "Music"
 msgstr "Music"
 
-msgid "Network interfaces to serve, comma delimited list."
-msgstr "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
+msgstr ""
 
 msgid "Notify interval in seconds."
 msgstr "Notify interval in seconds."
@@ -163,12 +169,8 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
 
 msgid "Video"
 msgstr "Video"
@@ -181,3 +183,13 @@ msgstr ""
 
 msgid "miniSSDP socket:"
 msgstr "miniSSDP socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr "Network interfaces to serve, comma delimited list."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
diff --git a/po/es/minidlna.po b/po/es/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/es/minidlna.po
+++ b/po/es/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/fr/minidlna.po b/po/fr/minidlna.po
index 27120ca73..d638b0cba 100644
--- a/po/fr/minidlna.po
+++ b/po/fr/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/he/minidlna.po b/po/he/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/he/minidlna.po
+++ b/po/he/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/hu/minidlna.po b/po/hu/minidlna.po
index 9bcabf84c..a21c86ee1 100644
--- a/po/hu/minidlna.po
+++ b/po/hu/minidlna.po
@@ -4,13 +4,16 @@ msgstr ""
 "PO-Revision-Date: 2012-04-08 18:54+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr "Borító album nevek:"
 
@@ -41,6 +44,9 @@ msgstr "Engedélyezés:"
 msgid "Friendly name:"
 msgstr "Egyéni név:"
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr "Interfészek:"
 
@@ -66,8 +72,8 @@ msgstr ""
 msgid "Music"
 msgstr "Zene"
 
-msgid "Network interfaces to serve, comma delimited list."
-msgstr "Kiszolgált hálózati interfészek vesszővel elválasztott listája."
+msgid "Network interfaces to serve."
+msgstr ""
 
 msgid "Notify interval in seconds."
 msgstr "Értesítés intervalluma másodpercben."
@@ -166,13 +172,8 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr "A miniDLNA szolgáltatás nem aktív."
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
-"Ez egy lista azokról a fájlnevekről, amelyeket ellenőrizni kell a "
-"lemezborító keresésekor. Megjegyzés: a neveket per jellel ('/') kell "
-"elválasztani egymástól."
 
 msgid "Video"
 msgstr "Videó"
@@ -185,3 +186,14 @@ msgstr "miniDLNA állapot"
 
 msgid "miniSSDP socket:"
 msgstr "miniSSDP socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr "Kiszolgált hálózati interfészek vesszővel elválasztott listája."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "Ez egy lista azokról a fájlnevekről, amelyeket ellenőrizni kell a "
+#~ "lemezborító keresésekor. Megjegyzés: a neveket per jellel ('/') kell "
+#~ "elválasztani egymástól."
diff --git a/po/it/minidlna.po b/po/it/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/it/minidlna.po
+++ b/po/it/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/ja/minidlna.po b/po/ja/minidlna.po
index b2f8be993..6b7cc055e 100644
--- a/po/ja/minidlna.po
+++ b/po/ja/minidlna.po
@@ -4,13 +4,16 @@ msgstr ""
 "PO-Revision-Date: 2012-04-09 09:55+0200\n"
 "Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
 "Language-Team: none\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr "アルバムアートワーク・ファイル名:"
 
@@ -41,6 +44,9 @@ msgstr "サービスを有効にする:"
 msgid "Friendly name:"
 msgstr "Friendly名:"
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr "インターフェース:"
 
@@ -53,7 +59,9 @@ msgstr "メディアディレクトリ:"
 msgid ""
 "MiniDLNA is server software with the aim of being fully compliant with DLNA/"
 "UPnP-AV clients."
-msgstr "MiniDLNAは、DLNA/UPnP-AVクライアントの完全互換を目的としたサーバー・ソフトウェアです。"
+msgstr ""
+"MiniDLNAは、DLNA/UPnP-AVクライアントの完全互換を目的としたサーバー・ソフト"
+"ウェアです。"
 
 msgid ""
 "Model number the miniDLNA daemon will report to clients in its XML "
@@ -63,8 +71,8 @@ msgstr "miniDLNAがクライアントに通知するXML中のモデル番号を�
 msgid "Music"
 msgstr "ミュージック"
 
-msgid "Network interfaces to serve, comma delimited list."
-msgstr "サービスが使用するネットワーク・インターフェースを設定します。カンマ記号 \",\" で区切ってください。"
+msgid "Network interfaces to serve."
+msgstr ""
 
 msgid "Notify interval in seconds."
 msgstr "通知間隔を秒単位で設定します。"
@@ -145,10 +153,8 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr "miniDLNA サービスは稼働していません。"
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
-msgstr "アルバムアート検索時にチェックするファイル名のリストを設定します。注意: ファイル名はスラッシュ記号 '/' で区切ってください。"
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
 
 msgid "Video"
 msgstr "ビデオ"
@@ -161,3 +167,15 @@ msgstr "miniDLNA ステータス"
 
 msgid "miniSSDP socket:"
 msgstr "miniSSDP ソケット:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr ""
+#~ "サービスが使用するネットワーク・インターフェースを設定します。カンマ記号 "
+#~ "\",\" で区切ってください。"
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "アルバムアート検索時にチェックするファイル名のリストを設定します。注意: "
+#~ "ファイル名はスラッシュ記号 '/' で区切ってください。"
diff --git a/po/ms/minidlna.po b/po/ms/minidlna.po
index ed329db1e..8df98a821 100644
--- a/po/ms/minidlna.po
+++ b/po/ms/minidlna.po
@@ -7,6 +7,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -37,6 +40,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -59,7 +65,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -141,9 +147,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/no/minidlna.po b/po/no/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/no/minidlna.po
+++ b/po/no/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/pl/minidlna.po b/po/pl/minidlna.po
index ba24ad4f9..b3b4ea360 100644
--- a/po/pl/minidlna.po
+++ b/po/pl/minidlna.po
@@ -9,6 +9,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -39,6 +42,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -61,7 +67,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -143,9 +149,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/pt/minidlna.po b/po/pt/minidlna.po
index 1177995cd..48c618839 100644
--- a/po/pt/minidlna.po
+++ b/po/pt/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/pt_BR/minidlna.po b/po/pt_BR/minidlna.po
index 27120ca73..d638b0cba 100644
--- a/po/pt_BR/minidlna.po
+++ b/po/pt_BR/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/ro/minidlna.po b/po/ro/minidlna.po
index 11841381f..ac227dda3 100644
--- a/po/ro/minidlna.po
+++ b/po/ro/minidlna.po
@@ -9,6 +9,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -39,6 +42,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -61,7 +67,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -143,9 +149,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/ru/minidlna.po b/po/ru/minidlna.po
index 8305885ca..71026dcca 100644
--- a/po/ru/minidlna.po
+++ b/po/ru/minidlna.po
@@ -9,6 +9,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -39,6 +42,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -61,7 +67,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -143,9 +149,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/templates/minidlna.pot b/po/templates/minidlna.pot
index 693451745..2b35d1e71 100644
--- a/po/templates/minidlna.pot
+++ b/po/templates/minidlna.pot
@@ -1,6 +1,9 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -31,6 +34,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -53,7 +59,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -135,9 +141,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/uk/minidlna.po b/po/uk/minidlna.po
index 8305885ca..71026dcca 100644
--- a/po/uk/minidlna.po
+++ b/po/uk/minidlna.po
@@ -9,6 +9,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -39,6 +42,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -61,7 +67,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -143,9 +149,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/vi/minidlna.po b/po/vi/minidlna.po
index eb72d0286..070d64c4e 100644
--- a/po/vi/minidlna.po
+++ b/po/vi/minidlna.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -38,6 +41,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -60,7 +66,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -142,9 +148,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"
diff --git a/po/zh_CN/minidlna.po b/po/zh_CN/minidlna.po
index ed329db1e..8df98a821 100644
--- a/po/zh_CN/minidlna.po
+++ b/po/zh_CN/minidlna.po
@@ -7,6 +7,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Advanced Settings"
+msgstr ""
+
 msgid "Album art names:"
 msgstr ""
 
@@ -37,6 +40,9 @@ msgstr ""
 msgid "Friendly name:"
 msgstr ""
 
+msgid "General Settings"
+msgstr ""
+
 msgid "Interfaces:"
 msgstr ""
 
@@ -59,7 +65,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Network interfaces to serve, comma delimited list."
+msgid "Network interfaces to serve."
 msgstr ""
 
 msgid "Notify interval in seconds."
@@ -141,9 +147,7 @@ msgstr ""
 msgid "The miniDLNA service is not running."
 msgstr ""
 
-msgid ""
-"This is a list of file names to check for when searching for album art. "
-"Note: names must be delimited with a forward slash '/'"
+msgid "This is a list of file names to check for when searching for album art."
 msgstr ""
 
 msgid "Video"