applications/luci-samba: Add textbox to edit the template for config generation (#122)

16 files changed, 684 insertions, 380 deletions

diff --git a/applications/luci-samba/luasrc/model/cbi/samba.lua b/applications/luci-samba/luasrc/model/cbi/samba.lua
index b73c29e07..91526374a 100644
--- a/applications/luci-samba/luasrc/model/cbi/samba.lua
+++ b/applications/luci-samba/luasrc/model/cbi/samba.lua
@@ -18,13 +18,33 @@ m = Map("samba", translate("Network Shares"))
 s = m:section(TypedSection, "samba", "Samba")
 s.anonymous = true
 
-s:option(Value, "name", translate("Hostname"))
-s:option(Value, "description", translate("Description"))
-s:option(Value, "workgroup", translate("Workgroup"))
-s:option(Flag, "homes", translate("Share home-directories"),
+s:tab("general",  translate("General Settings"))
+s:tab("template", translate("Edit Template"))
+
+s:taboption("general", Value, "name", translate("Hostname"))
+s:taboption("general", Value, "description", translate("Description"))
+s:taboption("general", Value, "workgroup", translate("Workgroup"))
+s:taboption("general", Value, "homes", translate("Share home-directories"),
         translate("Allow system users to reach their home directories via " ..
                 "network shares"))
 
+tmpl = s:taboption("template", Value, "_tmpl",
+	translate("Edit the template that is used for generating the samba configuration."), 
+	translate("This is the content of the file '/etc/samba/smb.conf.template' from which your samba configuration will be generated. " ..
+		"Values enclosed by pipe symbols ('|') should not be changed. They get their values from the 'General Settings' tab."))
+
+tmpl.template = "cbi/tvalue"
+tmpl.rows = 20
+
+function tmpl.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/samba/smb.conf.template")
+end
+
+function tmpl.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile("//etc/samba/smb.conf.template", value)
+end
+
 
 s = m:section(TypedSection, "sambashare", translate("Shared Directories"))
 s.anonymous = true
diff --git a/po/ca/samba.po b/po/ca/samba.po
index 75ef0e2e9..657586b98 100644
--- a/po/ca/samba.po
+++ b/po/ca/samba.po
@@ -8,25 +8,15 @@ msgstr ""
 "PO-Revision-Date: 2009-05-27 01:51+0200\n"
 "Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Network Shares"
-msgstr "Comparticions de xarxa"
-
-msgid "Hostname"
-msgstr "Nom de màquina"
-
-msgid "Description"
-msgstr "Descripció"
-
-msgid "Workgroup"
-msgstr "Grup de treball"
-
-msgid "Share home-directories"
-msgstr "Comparteix directoris d'inici"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Permet convidats"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -34,38 +24,68 @@ msgstr ""
 "Els usuaris del sistema poden arribar als directoris d'inici via compartició "
 "de xarxa."
 
-msgid "Shared Directories"
-msgstr "Directoris compartits"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Usuaris permesos"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Només lectura"
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Permet convidats"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Crea màscara"
 
-msgid "Mask for new files"
-msgstr "Màscara per fitxers nous"
+msgid "Description"
+msgstr "Descripció"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Màscara de directori"
 
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom de màquina"
+
 msgid "Mask for new directories"
 msgstr "Màscara per directoris nous"
 
+msgid "Mask for new files"
+msgstr "Màscara per fitxers nous"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Comparticions de xarxa"
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Només lectura"
+
+msgid "Share home-directories"
+msgstr "Comparteix directoris d'inici"
+
+msgid "Shared Directories"
+msgstr "Directoris compartits"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grup de treball"
+
 #~ msgid "Shared Directory"
 #~ msgstr "Directori compartit"
 
diff --git a/po/de/samba.po b/po/de/samba.po
index 309c0a62d..55dd69335 100644
--- a/po/de/samba.po
+++ b/po/de/samba.po
@@ -1,31 +1,20 @@
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-26 17:57+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-13 17:09+0100\n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
-msgstr "Netzwerkfreigaben"
-
-msgid "Hostname"
-msgstr "Hostname"
-
-msgid "Description"
-msgstr "Beschreibung"
-
-msgid "Workgroup"
-msgstr "Arbeitsgruppe"
-
-msgid "Share home-directories"
-msgstr "Heimatverzeichnisse freigeben"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Gäste erlauben"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -33,43 +22,71 @@ msgstr ""
 "Systembenutzer können ihre Heimatverzeichnis über Netzwerkfreigaben "
 "erreichen."
 
-msgid "Shared Directories"
-msgstr "Dateifreigaben"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Erlaubte Benutzer"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Nur Lesen"
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Gäste erlauben"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Anlegemaske"
 
-msgid "Mask for new files"
-msgstr "Maske für neue Dateien"
+msgid "Description"
+msgstr "Beschreibung"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Verzeichnismaske"
 
+msgid "Edit Template"
+msgstr "Template bearbeiten"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Hier kann das Template bearbeitet werden, das zur Erstellung der Samba-"
+"Konfigurationsdateien verwendet wird."
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
 msgid "Mask for new directories"
 msgstr "Maske für neue Verzeichnisse"
 
-#~ msgid "Shared Directory"
-#~ msgstr "Freigabepfad"
+msgid "Mask for new files"
+msgstr "Maske für neue Dateien"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Netzwerkfreigaben"
+
+msgid "Path"
+msgstr ""
 
-#~ msgid "Physical Path"
-#~ msgstr "Physischer Pfad"
+#, fuzzy
+msgid "Read-only"
+msgstr "Nur Lesen"
+
+msgid "Share home-directories"
+msgstr "Heimatverzeichnisse freigeben"
 
-#~ msgid "optional"
-#~ msgstr "optional"
+msgid "Shared Directories"
+msgstr "Dateifreigaben"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Dieses Fenster zeigt den Inhalt der Datei '/etc/samba/smb.conf.template', "
+"die als Template zum Erstellen der Samba-Konfiguration verwendet wird. Werte "
+"die von Pipe Symbolen eingeschlossen sind sollten nicht verändert werden, da "
+"diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
+"'Allgemeine Einstellungen' ersetzt werden."
+
+msgid "Workgroup"
+msgstr "Arbeitsgruppe"
diff --git a/po/el/samba.po b/po/el/samba.po
index c60bacb09..ce55e4a72 100644
--- a/po/el/samba.po
+++ b/po/el/samba.po
@@ -7,52 +7,72 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
+msgid "Allow guests"
 msgstr ""
 
-msgid "Hostname"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "Workgroup"
+msgid "Directory mask"
 msgstr ""
 
-msgid "Share home-directories"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
 
-msgid "Shared Directories"
+msgid "General Settings"
 msgstr ""
 
-msgid "Path"
+msgid "Hostname"
 msgstr ""
 
-msgid "Allowed users"
+msgid "Mask for new directories"
 msgstr ""
 
-msgid "Read-only"
+msgid "Mask for new files"
 msgstr ""
 
-msgid "Allow guests"
+msgid "Name"
 msgstr ""
 
-msgid "Create mask"
+msgid "Network Shares"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Path"
 msgstr ""
 
-msgid "Directory mask"
+msgid "Read-only"
 msgstr ""
 
-msgid "Mask for new directories"
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
 msgstr ""
diff --git a/po/en/samba.po b/po/en/samba.po
index cc9a34afb..a7c75b6a8 100644
--- a/po/en/samba.po
+++ b/po/en/samba.po
@@ -7,51 +7,71 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "Network Shares"
-msgstr "Network Shares"
+msgid "Allow guests"
+msgstr "Allow guests"
 
-msgid "Hostname"
-msgstr "Hostname"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Allow system users to reach their home directories via network shares"
+
+msgid "Allowed users"
+msgstr "Allowed users"
+
+msgid "Create mask"
+msgstr "Create mask"
 
 msgid "Description"
 msgstr "Description"
 
-msgid "Workgroup"
-msgstr "Workgroup"
+msgid "Directory mask"
+msgstr "Directory mask"
 
-msgid "Share home-directories"
-msgstr "Share home-directories"
+msgid "Edit Template"
+msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
-msgstr "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
 
-msgid "Shared Directories"
-msgstr "Shared Directories"
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Mask for new directories"
+msgstr "Mask for new directories"
+
+msgid "Mask for new files"
+msgstr "Mask for new files"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Network Shares"
 
 msgid "Path"
 msgstr "Path"
 
-msgid "Allowed users"
-msgstr "Allowed users"
-
 msgid "Read-only"
 msgstr "Read-only"
 
-msgid "Allow guests"
-msgstr "Allow guests"
-
-msgid "Create mask"
-msgstr "Create mask"
+msgid "Share home-directories"
+msgstr "Share home-directories"
 
-msgid "Mask for new files"
-msgstr "Mask for new files"
+msgid "Shared Directories"
+msgstr "Shared Directories"
 
-msgid "Directory mask"
-msgstr "Directory mask"
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
 
-msgid "Mask for new directories"
-msgstr "Mask for new directories"
+msgid "Workgroup"
+msgstr "Workgroup"
diff --git a/po/es/samba.po b/po/es/samba.po
index 39c8f480f..67941ea97 100644
--- a/po/es/samba.po
+++ b/po/es/samba.po
@@ -6,25 +6,15 @@ msgstr ""
 "PO-Revision-Date: 2009-07-12 07:48+0200\n"
 "Last-Translator: Guillermo Javier Nardoni <guillermo@geryon.com.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Network Shares"
-msgstr "Recursos compartidos de red "
-
-msgid "Hostname"
-msgstr "Nombre del Host (Hostname)"
-
-msgid "Description"
-msgstr "Descripción"
-
-msgid "Workgroup"
-msgstr "Grupo de Trabajo"
-
-msgid "Share home-directories"
-msgstr "Compartir directorios-home"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Permitir Invitados"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -32,38 +22,68 @@ msgstr ""
 "Los usuarios del sistema pueden llegar a sus directorios de inicio a través "
 "de recursos compartidos de red."
 
-msgid "Shared Directories"
-msgstr "Directorios compartidos"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Usuarios Perimitidos"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Solo lectura"
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Permitir Invitados"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Crear Máscara "
 
-msgid "Mask for new files"
-msgstr "Máscara para archivos nuevos"
+msgid "Description"
+msgstr "Descripción"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Máscara de Directorio"
 
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nombre del Host (Hostname)"
+
 msgid "Mask for new directories"
 msgstr "Máscara para directorios nuevos"
 
+msgid "Mask for new files"
+msgstr "Máscara para archivos nuevos"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Recursos compartidos de red "
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Solo lectura"
+
+msgid "Share home-directories"
+msgstr "Compartir directorios-home"
+
+msgid "Shared Directories"
+msgstr "Directorios compartidos"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de Trabajo"
+
 #~ msgid "Shared Directory"
 #~ msgstr "Directorio compatido"
 
diff --git a/po/fr/samba.po b/po/fr/samba.po
index 0dd806a27..a6a5ee7e2 100644
--- a/po/fr/samba.po
+++ b/po/fr/samba.po
@@ -7,54 +7,74 @@ msgstr ""
 "PO-Revision-Date: 2010-03-22 16:05+0100\n"
 "Last-Translator: Benoît Knecht <benoit.knecht@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
-msgstr "Partages réseau"
+msgid "Allow guests"
+msgstr "Invités autorisés"
 
-msgid "Hostname"
-msgstr "Nom d'hôte"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Autoriser les utilisateurs système à atteindre leurs dossiers personnels via "
+"les partages réseau."
+
+msgid "Allowed users"
+msgstr "Utilisateurs autorisés"
+
+msgid "Create mask"
+msgstr "Maque de création"
 
 msgid "Description"
 msgstr "Description"
 
-msgid "Workgroup"
-msgstr "Groupe de travail"
+msgid "Directory mask"
+msgstr "Masque des dossiers"
 
-msgid "Share home-directories"
-msgstr "Partager les dossiers personnels"
+msgid "Edit Template"
+msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
-"Autoriser les utilisateurs système à atteindre leurs dossiers personnels via "
-"les partages réseau."
 
-msgid "Shared Directories"
-msgstr "Dossiers partagés"
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Mask for new directories"
+msgstr "Masque pour les nouveaux dossiers"
+
+msgid "Mask for new files"
+msgstr "Masque pour les nouveaux fichiers"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Partages réseau"
 
 msgid "Path"
 msgstr "Chemin"
 
-msgid "Allowed users"
-msgstr "Utilisateurs autorisés"
-
 msgid "Read-only"
 msgstr "Lecture seule"
 
-msgid "Allow guests"
-msgstr "Invités autorisés"
-
-msgid "Create mask"
-msgstr "Maque de création"
+msgid "Share home-directories"
+msgstr "Partager les dossiers personnels"
 
-msgid "Mask for new files"
-msgstr "Masque pour les nouveaux fichiers"
+msgid "Shared Directories"
+msgstr "Dossiers partagés"
 
-msgid "Directory mask"
-msgstr "Masque des dossiers"
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
 
-msgid "Mask for new directories"
-msgstr "Masque pour les nouveaux dossiers"
+msgid "Workgroup"
+msgstr "Groupe de travail"
diff --git a/po/it/samba.po b/po/it/samba.po
index 8c6b483d8..1e5e338dd 100644
--- a/po/it/samba.po
+++ b/po/it/samba.po
@@ -7,52 +7,72 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
+msgid "Allow guests"
 msgstr ""
 
-msgid "Hostname"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "Workgroup"
+msgid "Directory mask"
 msgstr ""
 
-msgid "Share home-directories"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
 
-msgid "Shared Directories"
+msgid "General Settings"
 msgstr ""
 
-msgid "Path"
+msgid "Hostname"
 msgstr ""
 
-msgid "Allowed users"
+msgid "Mask for new directories"
 msgstr ""
 
-msgid "Read-only"
+msgid "Mask for new files"
 msgstr ""
 
-msgid "Allow guests"
+msgid "Name"
 msgstr ""
 
-msgid "Create mask"
+msgid "Network Shares"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Path"
 msgstr ""
 
-msgid "Directory mask"
+msgid "Read-only"
 msgstr ""
 
-msgid "Mask for new directories"
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
 msgstr ""
diff --git a/po/ja/samba.po b/po/ja/samba.po
index 8c6b483d8..1e5e338dd 100644
--- a/po/ja/samba.po
+++ b/po/ja/samba.po
@@ -7,52 +7,72 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
+msgid "Allow guests"
 msgstr ""
 
-msgid "Hostname"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "Workgroup"
+msgid "Directory mask"
 msgstr ""
 
-msgid "Share home-directories"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
 
-msgid "Shared Directories"
+msgid "General Settings"
 msgstr ""
 
-msgid "Path"
+msgid "Hostname"
 msgstr ""
 
-msgid "Allowed users"
+msgid "Mask for new directories"
 msgstr ""
 
-msgid "Read-only"
+msgid "Mask for new files"
 msgstr ""
 
-msgid "Allow guests"
+msgid "Name"
 msgstr ""
 
-msgid "Create mask"
+msgid "Network Shares"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Path"
 msgstr ""
 
-msgid "Directory mask"
+msgid "Read-only"
 msgstr ""
 
-msgid "Mask for new directories"
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
 msgstr ""
diff --git a/po/no/samba.po b/po/no/samba.po
index 3d9ee523b..492ee6909 100644
--- a/po/no/samba.po
+++ b/po/no/samba.po
@@ -7,51 +7,71 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "Network Shares"
-msgstr "Nettverks Mapper"
+msgid "Allow guests"
+msgstr "Tillat gjester"
 
-msgid "Hostname"
-msgstr "Vertsnavn"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper."
+
+msgid "Allowed users"
+msgstr "Tillatte brukere"
+
+msgid "Create mask"
+msgstr "Opprett Maske"
 
 msgid "Description"
 msgstr "Beskrivelse"
 
-msgid "Workgroup"
-msgstr "Arbeidsgruppe"
+msgid "Directory mask"
+msgstr "Katalog maske"
 
-msgid "Share home-directories"
-msgstr "Del Hjemmekataloger"
+msgid "Edit Template"
+msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
-msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper."
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
 
-msgid "Shared Directories"
-msgstr "Delte Kataloger"
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Mask for new directories"
+msgstr "Maske for nye kataloger"
+
+msgid "Mask for new files"
+msgstr "Maske for nye filer"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Nettverks Mapper"
 
 msgid "Path"
 msgstr "Fysisk bane"
 
-msgid "Allowed users"
-msgstr "Tillatte brukere"
-
 msgid "Read-only"
 msgstr "Skrivebeskyttet"
 
-msgid "Allow guests"
-msgstr "Tillat gjester"
-
-msgid "Create mask"
-msgstr "Opprett Maske"
+msgid "Share home-directories"
+msgstr "Del Hjemmekataloger"
 
-msgid "Mask for new files"
-msgstr "Maske for nye filer"
+msgid "Shared Directories"
+msgstr "Delte Kataloger"
 
-msgid "Directory mask"
-msgstr "Katalog maske"
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
 
-msgid "Mask for new directories"
-msgstr "Maske for nye kataloger"
+msgid "Workgroup"
+msgstr "Arbeidsgruppe"
diff --git a/po/pt/samba.po b/po/pt/samba.po
index a8557ab46..8fa45e589 100644
--- a/po/pt/samba.po
+++ b/po/pt/samba.po
@@ -7,25 +7,15 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
-msgstr "Compartilhamentos de Rede"
-
-msgid "Hostname"
-msgstr "Hostname"
-
-msgid "Description"
-msgstr "Descrição"
-
-msgid "Workgroup"
-msgstr "Grupo de Trabalho"
-
-msgid "Share home-directories"
-msgstr "Compartilhar diretórios home"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Permitir Convidados"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -33,38 +23,68 @@ msgstr ""
 "Usuários do sistema poderão acessar seu diretório home através dos "
 "compartilhamentos de rede."
 
-msgid "Shared Directories"
-msgstr "Diretórios Compartilhados"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Usuários Permitidos"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Somente Leitura"
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Permitir Convidados"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Criar Máscara"
 
-msgid "Mask for new files"
-msgstr "Máscara para novos arquivos"
+msgid "Description"
+msgstr "Descrição"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Máscara do Diretório"
 
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
 msgid "Mask for new directories"
 msgstr "Máscara para novos diretórios"
 
+msgid "Mask for new files"
+msgstr "Máscara para novos arquivos"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Compartilhamentos de Rede"
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Somente Leitura"
+
+msgid "Share home-directories"
+msgstr "Compartilhar diretórios home"
+
+msgid "Shared Directories"
+msgstr "Diretórios Compartilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de Trabalho"
+
 #~ msgid "Shared Directory"
 #~ msgstr "Diretório Compartilhado"
 
diff --git a/po/pt_BR/samba.po b/po/pt_BR/samba.po
index 29428eb20..678911b9f 100644
--- a/po/pt_BR/samba.po
+++ b/po/pt_BR/samba.po
@@ -7,25 +7,15 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
-msgstr "Compartilhamentos de Rede"
-
-msgid "Hostname"
-msgstr "Hostname"
-
-msgid "Description"
-msgstr "Descrição"
-
-msgid "Workgroup"
-msgstr "Grupo de Trabalho"
-
-msgid "Share home-directories"
-msgstr "Compartilhar diretórios home"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Permitir Convidados"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -33,38 +23,68 @@ msgstr ""
 "Usuários do sistema poderão acessar seu diretório home através dos "
 "compartilhamentos de rede."
 
-msgid "Shared Directories"
-msgstr "Diretórios Compartilhados"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Usuários Permitidos"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Somente Leitura"
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Permitir Convidados"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Criar Máscara"
 
-msgid "Mask for new files"
-msgstr "Máscara para novos arquivos"
+msgid "Description"
+msgstr "Descrição"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Máscara do Diretório"
 
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
 msgid "Mask for new directories"
 msgstr "Máscara para novos diretórios"
 
+msgid "Mask for new files"
+msgstr "Máscara para novos arquivos"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Compartilhamentos de Rede"
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Somente Leitura"
+
+msgid "Share home-directories"
+msgstr "Compartilhar diretórios home"
+
+msgid "Shared Directories"
+msgstr "Diretórios Compartilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de Trabalho"
+
 #~ msgid "Shared Directory"
 #~ msgstr "Diretório Compartilhado"
 
diff --git a/po/ru/samba.po b/po/ru/samba.po
index 8c6b483d8..1e5e338dd 100644
--- a/po/ru/samba.po
+++ b/po/ru/samba.po
@@ -7,52 +7,72 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Network Shares"
+msgid "Allow guests"
 msgstr ""
 
-msgid "Hostname"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "Workgroup"
+msgid "Directory mask"
 msgstr ""
 
-msgid "Share home-directories"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
 
-msgid "Shared Directories"
+msgid "General Settings"
 msgstr ""
 
-msgid "Path"
+msgid "Hostname"
 msgstr ""
 
-msgid "Allowed users"
+msgid "Mask for new directories"
 msgstr ""
 
-msgid "Read-only"
+msgid "Mask for new files"
 msgstr ""
 
-msgid "Allow guests"
+msgid "Name"
 msgstr ""
 
-msgid "Create mask"
+msgid "Network Shares"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Path"
 msgstr ""
 
-msgid "Directory mask"
+msgid "Read-only"
 msgstr ""
 
-msgid "Mask for new directories"
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
 msgstr ""
diff --git a/po/templates/samba.pot b/po/templates/samba.pot
index 52e475f4e..d91400b0c 100644
--- a/po/templates/samba.pot
+++ b/po/templates/samba.pot
@@ -1,59 +1,66 @@
-# Generated from applications/luci-samba/luasrc/model/cbi/samba.lua
-#
-#, fuzzy
 msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Allow guests"
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 15:23+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 
-msgid "Network Shares"
+msgid "Allow system users to reach their home directories via network shares"
 msgstr ""
 
-msgid "Hostname"
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "Workgroup"
+msgid "Directory mask"
 msgstr ""
 
-msgid "Share home-directories"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
 
-msgid "Shared Directories"
+msgid "General Settings"
 msgstr ""
 
-msgid "Path"
+msgid "Hostname"
 msgstr ""
 
-msgid "Allowed users"
+msgid "Mask for new directories"
 msgstr ""
 
-msgid "Read-only"
+msgid "Mask for new files"
 msgstr ""
 
-msgid "Allow guests"
+msgid "Name"
 msgstr ""
 
-msgid "Create mask"
+msgid "Network Shares"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Path"
 msgstr ""
 
-msgid "Directory mask"
+msgid "Read-only"
 msgstr ""
 
-msgid "Mask for new directories"
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
 msgstr ""
diff --git a/po/vi/samba.po b/po/vi/samba.po
index 6abea6d47..4e5638da2 100644
--- a/po/vi/samba.po
+++ b/po/vi/samba.po
@@ -8,25 +8,15 @@ msgstr ""
 "PO-Revision-Date: 2009-08-13 03:54+0200\n"
 "Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Network Shares"
-msgstr "Mạng chia sẻ"
-
-msgid "Hostname"
-msgstr "tên máy chủ"
-
-msgid "Description"
-msgstr "Mô tả"
-
-msgid "Workgroup"
-msgstr "Nhóm làm việc "
-
-msgid "Share home-directories"
-msgstr "Chia sẻ danh bạ chính"
+#, fuzzy
+msgid "Allow guests"
+msgstr "Cho phép khách"
 
 #, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
@@ -34,38 +24,68 @@ msgstr ""
 "Những người sử dụng hệ thống có thể tiếp cận những thư mục tại nhà thông qua "
 "mạng lưới chia sẻ trực tuyến."
 
-msgid "Shared Directories"
-msgstr "Thư mục chia sẻ"
-
-msgid "Path"
-msgstr ""
-
 #, fuzzy
 msgid "Allowed users"
 msgstr "Người sử dụng được cho phép"
 
 #, fuzzy
-msgid "Read-only"
-msgstr "Chỉ đọc "
-
-#, fuzzy
-msgid "Allow guests"
-msgstr "Cho phép khách"
-
-#, fuzzy
 msgid "Create mask"
 msgstr "Tạo Mask"
 
-msgid "Mask for new files"
-msgstr "Mask cho tập tin mới"
+msgid "Description"
+msgstr "Mô tả"
 
 #, fuzzy
 msgid "Directory mask"
 msgstr "Thư mục Mask"
 
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "tên máy chủ"
+
 msgid "Mask for new directories"
 msgstr "Mask cho thư mục mới"
 
+msgid "Mask for new files"
+msgstr "Mask cho tập tin mới"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Mạng chia sẻ"
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Chỉ đọc "
+
+msgid "Share home-directories"
+msgstr "Chia sẻ danh bạ chính"
+
+msgid "Shared Directories"
+msgstr "Thư mục chia sẻ"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Nhóm làm việc "
+
 #~ msgid "Shared Directory"
 #~ msgstr "Đã chia sẻ thư mục"
 
diff --git a/po/zh_CN/samba.po b/po/zh_CN/samba.po
index df7442ef1..7c5d48c0b 100644
--- a/po/zh_CN/samba.po
+++ b/po/zh_CN/samba.po
@@ -6,59 +6,79 @@ msgstr ""
 "PO-Revision-Date: 2009-06-25 16:35+0200\n"
 "Last-Translator: ruwen <zhaoruwen@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Network Shares"
-msgstr "网络共享"
+#, fuzzy
+msgid "Allow guests"
+msgstr "允许用户"
 
-msgid "Hostname"
-msgstr "主机名"
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+#, fuzzy
+msgid "Allowed users"
+msgstr "允许用户"
+
+msgid "Create mask"
+msgstr ""
 
 msgid "Description"
 msgstr "描述"
 
-msgid "Workgroup"
-msgstr "工作组"
-
-msgid "Share home-directories"
-msgstr "共享主目录"
+#, fuzzy
+msgid "Directory mask"
+msgstr "共享目录"
 
-msgid "Allow system users to reach their home directories via network shares"
+msgid "Edit Template"
 msgstr ""
 
-msgid "Shared Directories"
-msgstr "共享目录"
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
 
-msgid "Path"
+msgid "General Settings"
 msgstr ""
 
-#, fuzzy
-msgid "Allowed users"
-msgstr "允许用户"
+msgid "Hostname"
+msgstr "主机名"
 
-#, fuzzy
-msgid "Read-only"
-msgstr "只读"
+msgid "Mask for new directories"
+msgstr ""
 
-#, fuzzy
-msgid "Allow guests"
-msgstr "允许用户"
+msgid "Mask for new files"
+msgstr ""
 
-msgid "Create mask"
+msgid "Name"
 msgstr ""
 
-msgid "Mask for new files"
+msgid "Network Shares"
+msgstr "网络共享"
+
+msgid "Path"
 msgstr ""
 
 #, fuzzy
-msgid "Directory mask"
+msgid "Read-only"
+msgstr "只读"
+
+msgid "Share home-directories"
+msgstr "共享主目录"
+
+msgid "Shared Directories"
 msgstr "共享目录"
 
-msgid "Mask for new directories"
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
 msgstr ""
 
+msgid "Workgroup"
+msgstr "工作组"
+
 #~ msgid "Physical Path"
 #~ msgstr "物理路径"